Merge from BR_new_bop2

This commit is contained in:
jfa 2013-06-19 06:34:27 +00:00
parent 071166030d
commit c769c7087d
2 changed files with 2 additions and 3 deletions

View File

@ -96,5 +96,4 @@ libSMESHimpl_la_LDFLAGS = \
../SMESHUtils/libSMESHUtils.la \
$(BOOST_LIB_THREAD) \
$(BOOST_LIB_SYSTEM) \
$(GEOM_LDFLAGS) -lNMTTools \
$(CAS_LDPATH) -lTKShHealing -lTKPrim -lTKG2d -lTKCDF
$(CAS_LDPATH) -lTKShHealing -lTKPrim -lTKG2d -lTKCDF

View File

@ -68,7 +68,7 @@ libSMESHClient_la_LDFLAGS = \
../Controls/libSMESHControls.la \
$(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil -lSALOMEBasics \
-lSalomeIDLKernel -lSALOMELocalTrace \
$(GEOM_LDFLAGS) -lNMTDS -lSalomeIDLGEOM \
$(GEOM_LDFLAGS) -lSalomeIDLGEOM \
$(MED_LDFLAGS) -lMEDWrapper_V2_2 -lSalomeIDLMED -lMEDWrapper \
$(CAS_KERNEL)