diff options
| -rw-r--r-- | external/gpgmepp/ExternalProject_gpgmepp.mk | 3 | ||||
| -rw-r--r-- | external/libassuan/ExternalProject_libassuan.mk | 3 | ||||
| -rw-r--r-- | external/libgpg-error/ExternalProject_libgpg-error.mk | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk b/external/gpgmepp/ExternalProject_gpgmepp.mk index afd6ab6344f9..7aaa42a12b40 100644 --- a/external/gpgmepp/ExternalProject_gpgmepp.mk +++ b/external/gpgmepp/ExternalProject_gpgmepp.mk @@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_use_externals,gpgmepp,\ )) ifeq ($(COM),MSC) -$(call gb_ExternalProject_get_state_target,gpgmepp,build): +$(call gb_ExternalProject_get_state_target,gpgmepp,build): $(call gb_Executable_get_target,cpp) $(call gb_ExternalProject_run,build,\ autoreconf \ && ./configure \ @@ -39,6 +39,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build): $(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \ --host=$(if $(filter INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) \ MAKE=$(MAKE) \ + RC='windres --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC) -I$(ATL_INCLUDE)'\' \ && $(MAKE) \ ) else diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk index 21d034455dca..fdadb2851042 100644 --- a/external/libassuan/ExternalProject_libassuan.mk +++ b/external/libassuan/ExternalProject_libassuan.mk @@ -20,7 +20,7 @@ $(eval $(call gb_ExternalProject_use_externals,libassuan,\ )) ifeq ($(COM),MSC) -$(call gb_ExternalProject_get_state_target,libassuan,build): +$(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executable_get_target,cpp) $(call gb_ExternalProject_run,build,\ autoreconf \ && ./configure \ @@ -32,6 +32,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \ --host=$(if $(filter INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) \ MAKE=$(MAKE) \ + RC='windres --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC) -I$(ATL_INCLUDE)'\' \ && $(MAKE) \ ) diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk b/external/libgpg-error/ExternalProject_libgpg-error.mk index ef22e3926b69..ecb96f00b496 100644 --- a/external/libgpg-error/ExternalProject_libgpg-error.mk +++ b/external/libgpg-error/ExternalProject_libgpg-error.mk @@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,libgpg-error,\ $(eval $(call gb_ExternalProject_use_autoconf,libgpg-error,build)) ifeq ($(COM),MSC) -$(call gb_ExternalProject_get_state_target,libgpg-error,build): +$(call gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_Executable_get_target,cpp) $(call gb_ExternalProject_run,build,\ MAKE=$(MAKE) ./configure \ --enable-static \ @@ -29,6 +29,7 @@ $(call gb_ExternalProject_get_state_target,libgpg-error,build): 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \ --host=$(if $(filter INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) \ + RC='windres --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC) -I$(ATL_INCLUDE)'\' \ && $(MAKE) \ ) |