diff options
Diffstat (limited to 'solenv/inc/libs.mk')
-rw-r--r-- | solenv/inc/libs.mk | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index cbde1659ae5d..b835f526997f 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -266,8 +266,15 @@ JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID) .ELSE # "$(GUI)$(COM)"=="WNTGCC" JVMACCESSLIB = -ljvmaccess$(COMID) .ENDIF # "$(GUI)$(COM)"=="WNTGCC" -CPPUNITLIB = -lcppunit$(DLLPOSTFIX) -TESTSHL2LIB = -ltestshl2$(DLLPOSTFIX) +.IF "$(OS)" == "WNT" +CPPUNITLIB = -lcygcppunit-1-12-1 +.ELSE +.IF "$(SYSTEM_CPPUNIT)"=="YES" +CPPUNITLIB = $(CPPUNIT_LIBS) +.ELSE +CPPUNITLIB = -lcppunit +.ENDIF +.ENDIF .IF "$(SYSTEM_LIBXSLT)"=="YES" XSLTLIB=$(LIBXSLT_LIBS) .ELSE @@ -341,6 +348,7 @@ LPSOLVELIB=-llpsolve55 SOFFICELIB=-lsofficeapp UNOPKGAPPLIB=-lunopkgapp CONFIGMGRLIB=-lconfigmgr +TESTLIB=-ltest .ELSE # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" @@ -475,8 +483,7 @@ FREETYPELIB=freetype.lib PKGCHKLIB=ipkgchk.lib HELPLINKERLIB=ihelplinker.lib JVMACCESSLIB = ijvmaccess.lib -CPPUNITLIB = cppunit.lib -TESTSHL2LIB = testshl2.lib +CPPUNITLIB = icppunit_dll.lib XSLTLIB = libxslt.lib $(LIBXML2LIB) .IF "$(GUI)"=="OS2" REDLANDLIB = raptor.a rasqal.a rdf.a $(LIBXML2LIB) $(OPENSSLLIB) pthread.lib @@ -523,5 +530,6 @@ LPSOLVELIB=lpsolve55.lib SOFFICELIB=isofficeapp.lib UNOPKGAPPLIB=iunopkgapp.lib CONFIGMGRLIB=iconfigmgr.lib +TESTLIB=itest.lib .ENDIF # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" |