diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-11 14:43:19 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-15 15:26:32 +0200 |
| commit | 3b65852f37f1c8daf8c5c0af1d810c68cc71d8e3 (patch) | |
| tree | e724da7f17cffec4a5e68897c8e34857dd8bf354 /extensions | |
| parent | 54ba172dc13ababef911550a88083452832b4744 (diff) | |
gbuild: add support for building against MSVC debug runtime
Mainly this means using /MDd instead of /MD and /MTd instead of /MT in
the CFLAGS, and also re-mapping of .lib files to ones with "d".
Change-Id: Ifc56b53a66d5eb522c1695a34d68b08cad1d8338
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/Library_oleautobridge.mk | 8 | ||||
| -rw-r--r-- | extensions/Library_so_activex.mk | 8 | ||||
| -rw-r--r-- | extensions/Library_so_activex_x64.mk | 8 |
3 files changed, 3 insertions, 21 deletions
diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk index 32467f334b5a..fd1ccb9b5125 100644 --- a/extensions/Library_oleautobridge.mk +++ b/extensions/Library_oleautobridge.mk @@ -59,15 +59,9 @@ $(eval $(call gb_Library_use_system_win32_libs,oleautobridge,\ )) ifeq ($(COM),MSC) -ifneq ($(USE_DEBUG_RUNTIME),) $(eval $(call gb_Library_add_libs,oleautobridge,\ - $(ATL_LIB)/atlsd.lib \ + $(ATL_LIB)/$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib) \ )) -else -$(eval $(call gb_Library_add_libs,oleautobridge,\ - $(ATL_LIB)/atls.lib \ -)) -endif endif $(eval $(call gb_Library_add_exception_objects,oleautobridge,\ diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk index 603a79c81c68..80571d8764bf 100644 --- a/extensions/Library_so_activex.mk +++ b/extensions/Library_so_activex.mk @@ -65,14 +65,8 @@ $(eval $(call gb_Library_use_system_win32_libs,so_activex,\ uuid \ )) -ifneq ($(USE_DEBUG_RUNTIME),) $(eval $(call gb_Library_add_libs,so_activex,\ - $(ATL_LIB)/atlsd.lib \ + $(ATL_LIB)/$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib) \ )) -else -$(eval $(call gb_Library_add_libs,so_activex,\ - $(ATL_LIB)/atls.lib \ -)) -endif # vim:set noet sw=4 ts=4: diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk index c4f9546c0ecb..96ee19de3a90 100644 --- a/extensions/Library_so_activex_x64.mk +++ b/extensions/Library_so_activex_x64.mk @@ -68,14 +68,8 @@ $(eval $(call gb_Library_use_system_win32_libs,so_activex_x64,\ uuid \ )) -ifneq ($(USE_DEBUG_RUNTIME),) $(eval $(call gb_Library_add_libs,so_activex_x64,\ - $(ATL_LIB)/amd64/atlsd.lib \ + $(ATL_LIB)/amd64/$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib) \ )) -else -$(eval $(call gb_Library_add_libs,so_activex_x64,\ - $(ATL_LIB)/amd64/atls.lib \ -)) -endif # vim:set noet sw=4 ts=4: |