diff options
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | curl/ExternalPackage_curl.mk | 9 | ||||
| -rw-r--r-- | curl/ExternalProject_curl.mk | 17 |
3 files changed, 18 insertions, 12 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d58b27bb092f..ab76d7d8fcb2 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1621,6 +1621,10 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) define gb_LinkTarget__use_curl +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,curl/include) \ + $$(INCLUDE) \ +) $(call gb_LinkTarget_use_libraries,$(1),\ curl \ ) diff --git a/curl/ExternalPackage_curl.mk b/curl/ExternalPackage_curl.mk index c5852f872400..e8e7e659bfdb 100644 --- a/curl/ExternalPackage_curl.mk +++ b/curl/ExternalPackage_curl.mk @@ -25,15 +25,16 @@ else $(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.2.0)) endif -else ifeq ($(GUI),WNT) +else ifeq ($(OS)$(COM),WNTGCC) -ifeq ($(COM),GCC) $(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.a,.libs/libcurl.a)) $(eval $(call gb_ExternalPackage_add_file,curl,bin/libcurl.dll,.libs/libcurl.dll)) -else ifeq ($(COM),WNT) + +else ifeq ($(COM),MSC) + $(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.lib,lib/libcurl.lib)) $(eval $(call gb_ExternalPackage_add_file,curl,bin/libcurl.dll,lib/libcurl.dll)) -endif endif + # vim: set noet sw=4 ts=4: diff --git a/curl/ExternalProject_curl.mk b/curl/ExternalProject_curl.mk index beee03450a58..100509454c24 100644 --- a/curl/ExternalProject_curl.mk +++ b/curl/ExternalProject_curl.mk @@ -16,6 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,curl,\ )) ifeq ($(GUI),UNX) + $(call gb_ExternalProject_get_state_target,curl,build): cd $(EXTERNAL_WORKDIR) \ && ./configure --with-nss --without-ssl --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \ @@ -25,10 +26,11 @@ $(call gb_ExternalProject_get_state_target,curl,build): $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \ $(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include" LDFLAGS="-L$(SYSBASE)/usr/lib") \ && cd lib \ - && $(GNUMAKE) -j$(EXTMAXPROCESS) \ + && $(MAKE) \ && touch $@ -else ifeq ($(GUI),WNT) -ifeq ($(COM),GCC) + +else ifeq ($(OS)$(COM),WNTGCC) + $(call gb_ExternalProject_get_state_target,curl,build): cd $(EXTERNAL_WORKDIR) \ && ./configure --with-nss --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher \ @@ -39,17 +41,16 @@ $(call gb_ExternalProject_get_state_target,curl,build): LDFLAGS="$(patsubst ;, -L,$(ILIB))" \ CPPFLAGS="$(INCLUDE)" OBJDUMP="objdump" \ && cd lib \ - && $(GNUMAKE) -j$(EXTMAXPROCESS) \ + && $(MAKE) \ && touch $@ else ifeq ($(COM),MSC) + $(call gb_ExternalProject_get_state_target,curl,build): cd $(EXTERNAL_WORKDIR)/lib \ - && unset MAKEFLAGS \ - && export LIB="$(ILIB)" \ - && nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS="/EHa /Zc:wchar_t- /D_CRT_SECURE_NO_DEPRECATE $(SOLARINC)" $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \ + && MAKEFLAGS= && LIB="$(ILIB)" && nmake -f Makefile.vc9 cfg=release-dll \ + EXCFLAGS="/EHa /Zc:wchar_t- /D_CRT_SECURE_NO_DEPRECATE $(SOLARINC)" $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \ && touch $@ -endif endif |