diff options
| author | sb <sb@openoffice.org> | 2010-01-05 13:49:30 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-01-05 13:49:30 +0100 |
| commit | 7f66a705b0c8700ded12804d4d56aaf5ca65be6c (patch) | |
| tree | c9ae608d3010226b6c2b5a45fcd57b9d448ef580 /solenv/inc/libs.mk | |
| parent | 2be04fff7b9d51a3f1cf61ddb9cd76286b48b375 (diff) | |
| parent | 05250e05b00f363c2c65e6099714070beea89ca0 (diff) | |
sb118: merged in DEV300_m68
Diffstat (limited to 'solenv/inc/libs.mk')
| -rw-r--r-- | solenv/inc/libs.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 4d40600ba368..5ad14d4d87c7 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -270,8 +270,11 @@ 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 +CPPUNITLIB = -lcppunit +.ENDIF .IF "$(SYSTEM_LIBXSLT)"=="YES" XSLTLIB=$(LIBXSLT_LIBS) .ELSE @@ -478,8 +481,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 |