summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-04-11 14:43:19 +0200
committerMichael Stahl <mstahl@redhat.com>2013-04-15 15:26:32 +0200
commit3b65852f37f1c8daf8c5c0af1d810c68cc71d8e3 (patch)
treee724da7f17cffec4a5e68897c8e34857dd8bf354 /setup_native
parent54ba172dc13ababef911550a88083452832b4744 (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 'setup_native')
-rw-r--r--setup_native/Library_instooofiltmsi.mk2
-rw-r--r--setup_native/Library_qslnkmsi.mk2
-rw-r--r--setup_native/Library_reg4allmsdoc.mk2
-rw-r--r--setup_native/Library_regactivex.mk2
-rw-r--r--setup_native/Library_regpatchactivex.mk2
-rw-r--r--setup_native/Library_sdqsmsi.mk2
-rw-r--r--setup_native/Library_sellangmsi.mk2
-rw-r--r--setup_native/Library_shlxtmsi.mk2
-rw-r--r--setup_native/Library_sn_tools.mk2
-rw-r--r--setup_native/StaticLibrary_quickstarter.mk2
-rw-r--r--setup_native/StaticLibrary_seterror.mk2
11 files changed, 11 insertions, 11 deletions
diff --git a/setup_native/Library_instooofiltmsi.mk b/setup_native/Library_instooofiltmsi.mk
index 677e59003b17..a4c9fa8cc8cf 100644
--- a/setup_native/Library_instooofiltmsi.mk
+++ b/setup_native/Library_instooofiltmsi.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,instooofiltmsi,\
))
$(eval $(call gb_Library_add_cxxflags,instooofiltmsi,\
- /MT \
+ $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
))
$(eval $(call gb_Library_add_ldflags,instooofiltmsi,\
diff --git a/setup_native/Library_qslnkmsi.mk b/setup_native/Library_qslnkmsi.mk
index 7f7bbb32d8bd..2e5e2fe6f6f5 100644
--- a/setup_native/Library_qslnkmsi.mk
+++ b/setup_native/Library_qslnkmsi.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,qslnkmsi,\
))
$(eval $(call gb_Library_add_cxxflags,qslnkmsi,\
- /MT \
+ $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
))
$(eval $(call gb_Library_add_ldflags,qslnkmsi,\
diff --git a/setup_native/Library_reg4allmsdoc.mk b/setup_native/Library_reg4allmsdoc.mk
index 69f39030a0b1..671317639110 100644
--- a/setup_native/Library_reg4allmsdoc.mk
+++ b/setup_native/Library_reg4allmsdoc.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_Library_add_defs,reg4allmsdoc,\
))
$(eval $(call gb_Library_add_cxxflags,reg4allmsdoc,\
- /MT \
+ $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
))
$(eval $(call gb_Library_add_ldflags,reg4allmsdoc,\
diff --git a/setup_native/Library_regactivex.mk b/setup_native/Library_regactivex.mk
index 4f561a5084c4..c823d7ce2cc2 100644
--- a/setup_native/Library_regactivex.mk
+++ b/setup_native/Library_regactivex.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,regactivex,\
))
$(eval $(call gb_Library_add_cxxflags,regactivex,\
- /MT \
+ $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
))
$(eval $(call gb_Library_add_ldflags,regactivex,\
diff --git a/setup_native/Library_regpatchactivex.mk b/setup_native/Library_regpatchactivex.mk
index bd2669d5fade..30bf07d8b843 100644
--- a/setup_native/Library_regpatchactivex.mk
+++ b/setup_native/Library_regpatchactivex.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,regpatchactivex,\
))
$(eval $(call gb_Library_add_cxxflags,regpatchactivex,\
- /MT \
+ $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
))
$(eval $(call gb_Library_add_ldflags,regpatchactivex,\
diff --git a/setup_native/Library_sdqsmsi.mk b/setup_native/Library_sdqsmsi.mk
index 73758358fde8..732159e7094d 100644
--- a/setup_native/Library_sdqsmsi.mk
+++ b/setup_native/Library_sdqsmsi.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,sdqsmsi,\
))
$(eval $(call gb_Library_add_cxxflags,sdqsmsi,\
- /MT \
+ $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
))
$(eval $(call gb_Library_add_ldflags,sdqsmsi,\
diff --git a/setup_native/Library_sellangmsi.mk b/setup_native/Library_sellangmsi.mk
index 8411acd8d2ad..2979f1e6d31d 100644
--- a/setup_native/Library_sellangmsi.mk
+++ b/setup_native/Library_sellangmsi.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_Library_add_defs,sellangmsi,\
))
$(eval $(call gb_Library_add_cxxflags,sellangmsi,\
- /MT \
+ $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
))
$(eval $(call gb_Library_add_ldflags,sellangmsi,\
diff --git a/setup_native/Library_shlxtmsi.mk b/setup_native/Library_shlxtmsi.mk
index 28fcdceb3e27..84fbe72f3741 100644
--- a/setup_native/Library_shlxtmsi.mk
+++ b/setup_native/Library_shlxtmsi.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_Library_add_defs,shlxtmsi,\
))
$(eval $(call gb_Library_add_cxxflags,shlxtmsi,\
- /MT \
+ $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
))
$(eval $(call gb_Library_add_ldflags,shlxtmsi,\
diff --git a/setup_native/Library_sn_tools.mk b/setup_native/Library_sn_tools.mk
index da93c89b9d63..c857d0daf710 100644
--- a/setup_native/Library_sn_tools.mk
+++ b/setup_native/Library_sn_tools.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,sn_tools,\
))
$(eval $(call gb_Library_add_cxxflags,sn_tools,\
- /MT \
+ $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
))
$(eval $(call gb_Library_add_ldflags,sn_tools,\
diff --git a/setup_native/StaticLibrary_quickstarter.mk b/setup_native/StaticLibrary_quickstarter.mk
index 399f6afe5b0a..0517a7511016 100644
--- a/setup_native/StaticLibrary_quickstarter.mk
+++ b/setup_native/StaticLibrary_quickstarter.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_StaticLibrary_add_defs,quickstarter,\
))
$(eval $(call gb_StaticLibrary_add_cxxflags,quickstarter,\
- /MT \
+ $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,quickstarter,\
diff --git a/setup_native/StaticLibrary_seterror.mk b/setup_native/StaticLibrary_seterror.mk
index bb6ccf922287..92297690419b 100644
--- a/setup_native/StaticLibrary_seterror.mk
+++ b/setup_native/StaticLibrary_seterror.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_StaticLibrary_add_defs,seterror,\
))
$(eval $(call gb_StaticLibrary_add_cxxflags,seterror,\
- /MT \
+ $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,seterror,\