summaryrefslogtreecommitdiff
path: root/cppunit
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-12-08 20:21:47 +0200
committerTor Lillqvist <tml@iki.fi>2012-12-08 20:21:47 +0200
commit3de4b440a27aa0f9f6bb42af08bb143526be6358 (patch)
tree811e55501e7653008f3edd901c2a7412d4c4f98a /cppunit
parentf3fc7bd5c893f57c2f27e634af353c4eefc7f9e4 (diff)
No .libs directory when DISABLE_DYNLOADING
Change-Id: I4e72093ade16bde4715cd60bf98779c462dd09e5
Diffstat (limited to 'cppunit')
-rw-r--r--cppunit/ExternalPackage_cppunit.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/cppunit/ExternalPackage_cppunit.mk b/cppunit/ExternalPackage_cppunit.mk
index bfcfdc0b9e62..3a24f52468e3 100644
--- a/cppunit/ExternalPackage_cppunit.mk
+++ b/cppunit/ExternalPackage_cppunit.mk
@@ -21,7 +21,11 @@ $(eval $(call gb_ExternalPackage_add_file,cppunit,lib/cppunit.dll.a,src/cppunit/
$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester.exe,src/DllPlugInTester/.libs/DllPlugInTester.exe))
endif
else
+ifneq ($(DISABLE_DYNLOADING),TRUE)
$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester,src/DllPlugInTester/.libs/DllPlugInTester))
+else
+$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester,src/DllPlugInTester/DllPlugInTester))
+endif
ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.0.dylib,src/cppunit/.libs/libcppunit-1.13.0.dylib))
$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.dylib,src/cppunit/.libs/libcppunit.dylib))