Kaydet (Commit) 58cb1a2f authored tarafından Luboš Luňák's avatar Luboš Luňák

fix pretty broken cppunit gbuild conversion on windows

The original dmake makefile.mk even said the files were missing ... ?
üst 987d991e
...@@ -14,7 +14,7 @@ ifeq ($(OS),WNT) ...@@ -14,7 +14,7 @@ ifeq ($(OS),WNT)
ifeq ($(COM),MSC) ifeq ($(COM),MSC)
$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/cppunit_dll.dll,src/cppunit/ReleaseDll/cppunit_dll.dll)) $(eval $(call gb_ExternalPackage_add_file,cppunit,bin/cppunit_dll.dll,src/cppunit/ReleaseDll/cppunit_dll.dll))
$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/icppunit_dll.lib,src/cppunit/ReleaseDll/cppunit_dll.lib)) $(eval $(call gb_ExternalPackage_add_file,cppunit,lib/icppunit_dll.lib,src/cppunit/ReleaseDll/cppunit_dll.lib))
$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester_dll.exe,src/DllPlugInTester/ReleaseDll/DllPlugInTester_dll.exe)) $(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester.exe,src/DllPlugInTester/ReleaseDll/DllPlugInTester.exe))
else else
$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/libcppunit-1-13-0.dll,src/cppunit/.libs/libcppunit-1-13-0.dll)) $(eval $(call gb_ExternalPackage_add_file,cppunit,bin/libcppunit-1-13-0.dll,src/cppunit/.libs/libcppunit-1-13-0.dll))
$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/cppunit.dll.a,src/cppunit/.libs/cppunit.dll.a)) $(eval $(call gb_ExternalPackage_add_file,cppunit,lib/cppunit.dll.a,src/cppunit/.libs/cppunit.dll.a))
......
...@@ -29,5 +29,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ ...@@ -29,5 +29,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
cppunit/disable-dynloading.patch \ cppunit/disable-dynloading.patch \
)) ))
endif endif
$(eval $(call gb_UnpackedTarball_add_file,cppunit,src/cppunit/cppunit_dll.vcproj,cppunit/src/cppunit_dll.vcproj))
$(eval $(call gb_UnpackedTarball_add_file,cppunit,src/cppunit/cppunit_dll.vcxproj,cppunit/src/cppunit_dll.vcxproj))
$(eval $(call gb_UnpackedTarball_add_file,cppunit,src/DllPlugInTester/DllPlugInTester.vcproj,cppunit/src/DllPlugInTester.vcproj))
$(eval $(call gb_UnpackedTarball_add_file,cppunit,src/DllPlugInTester/DllPlugInTester.vcxproj,cppunit/src/DllPlugInTester.vcxproj))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment