[Libreoffice-commits] .: 7 commits - desktop/Executable_loader2.mk solenv/gbuild

[Tor Lillqvist]

 desktop/Executable_loader2.mk     |   25 +++++++++++++++----------
 solenv/gbuild/platform/windows.mk |    3 ++-
 2 files changed, 17 insertions(+), 11 deletions(-)

New commits:
commit 4c8424fdb62976cbcfb39fe6be2b2506c149cce6
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Sep 22 13:19:54 2011 +0300

    Small refactoring to avoid duplication of source file list

diff --git a/desktop/Executable_loader2.mk b/desktop/Executable_loader2.mk
index 49052a9..a7ebedc 100644
--- a/desktop/Executable_loader2.mk
+++ b/desktop/Executable_loader2.mk
@@ -54,14 +54,10 @@ $(eval $(call gb_Executable_add_linked_libs,loader2,\
 endif
 endif
 
-$(eval $(call gb_Executable_add_exception_objects,loader2,\
-    desktop/win32/source/setup/setup_main \
-    desktop/win32/source/setup/setup_w \
-))
-
 $(foreach file, \
     desktop/win32/source/setup/setup_main \
     desktop/win32/source/setup/setup_w, \
+$(eval $(call gb_Executable_add_exception_objects,loader2,$(file)))\
 $(eval $(call gb_CxxObject_get_target,$(file)) : DEFS := $(filter-out -D_DLL,$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS)))\
 $(eval $(call gb_CxxObject_get_target,$(file)) : T_CXXFLAGS := -MT $(filter-out -MD,$(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_LinkTarget_CXXFLAGS)))\
 )
commit 60607317f36547048de75094e9aeedceeeea7272
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Sep 22 13:09:08 2011 +0300

    This should use a static C/C++ runtime

diff --git a/desktop/Executable_loader2.mk b/desktop/Executable_loader2.mk
index 02d10f7..49052a9 100644
--- a/desktop/Executable_loader2.mk
+++ b/desktop/Executable_loader2.mk
@@ -59,4 +59,11 @@ $(eval $(call gb_Executable_add_exception_objects,loader2,\
     desktop/win32/source/setup/setup_w \
 ))
 
+$(foreach file, \
+    desktop/win32/source/setup/setup_main \
+    desktop/win32/source/setup/setup_w, \
+$(eval $(call gb_CxxObject_get_target,$(file)) : DEFS := $(filter-out -D_DLL,$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS)))\
+$(eval $(call gb_CxxObject_get_target,$(file)) : T_CXXFLAGS := -MT $(filter-out -MD,$(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_LinkTarget_CXXFLAGS)))\
+)
+
 # vim: set ts=4 sw=4 et:
commit 69f628575148049427d303344aea184ddec43487
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Sep 22 13:07:51 2011 +0300

    Use libcmtd in a dbgutil MSVC build

diff --git a/desktop/Executable_loader2.mk b/desktop/Executable_loader2.mk
index ae0a019..02d10f7 100644
--- a/desktop/Executable_loader2.mk
+++ b/desktop/Executable_loader2.mk
@@ -42,11 +42,17 @@ $(eval $(call gb_Executable_add_linked_libs,loader2,\
     user32 \
 ))
 
-ifneq ($(COM),GCC)
+ifeq ($(COM),MSC)
+ifeq ($(gb_PRODUCT),)
+$(eval $(call gb_Executable_add_linked_libs,loader2,\
+    libcmtd \
+))
+else
 $(eval $(call gb_Executable_add_linked_libs,loader2,\
     libcmt \
 ))
 endif
+endif
 
 $(eval $(call gb_Executable_add_exception_objects,loader2,\
     desktop/win32/source/setup/setup_main \
commit 8427fab7eb99d2884501b50afce6e617e3fe7721
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Sep 22 13:06:20 2011 +0300

    This is a GUI executable

diff --git a/desktop/Executable_loader2.mk b/desktop/Executable_loader2.mk
index 5066b93..ae0a019 100644
--- a/desktop/Executable_loader2.mk
+++ b/desktop/Executable_loader2.mk
@@ -25,6 +25,8 @@
 
 $(eval $(call gb_Executable_Executable,loader2))
 
+$(eval $(call gb_Executable_set_targettype_gui,loader2,YES))
+
 $(eval $(call gb_Executable_add_precompiled_header,loader2,desktop/inc/pch/precompiled_desktop.hxx))
 
 $(eval $(call gb_Executable_set_include,loader2,\
commit c2da4b8e08554ece96e0400a00f7061391114d0b
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Sep 22 13:05:22 2011 +0300

    No need to do -D_DEBUG here, done in windows.mk

diff --git a/desktop/Executable_loader2.mk b/desktop/Executable_loader2.mk
index f399d38..5066b93 100644
--- a/desktop/Executable_loader2.mk
+++ b/desktop/Executable_loader2.mk
@@ -32,12 +32,6 @@ $(eval $(call gb_Executable_set_include,loader2,\
     -I$(SRCDIR)/desktop/inc/pch \
 ))
 
-ifneq ($(USE_DEBUG_RUNTIME),)
-$(eval $(call gb_Executable_add_defs,loader2,\
-    -D_DEBUG
-))
-endif
-
 $(eval $(call gb_Executable_add_linked_libs,loader2,\
     advapi32 \
     gdi32 \
commit 869bf65f97a484b0c83cf03848dfc467c9cdde72
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Sep 22 13:03:03 2011 +0300

    Don't link with msvcrtd if LINKED_LIBS has libcmtd

diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index df9cc80..8d74118 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -391,7 +391,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \
 		$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_filename,$(lib))) \
 		$(LIBS) \
-		$(if $(filter-out StaticLibrary,$(TARGETTYPE)),$(if $(gb_PRODUCT),,oldnames.lib msvcrtd.lib msvcprtd.lib kernel32.lib user32.lib)) \
+		$(if $(filter-out StaticLibrary,$(TARGETTYPE)),$(if $(gb_PRODUCT),,oldnames.lib $(if $(filter libcmtd,$(LINKED_LIBS)),,msvcrtd.lib) msvcprtd.lib kernel32.lib user32.lib)) \
 		$(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); RC=$$?; rm $${RESPONSEFILE} \
 	$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) ; exit $$RC)
 endef
commit 2d22a4be6accb260fef882a16018a75e1f58bdb9
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Sep 22 13:01:32 2011 +0300

    Add libcmtd

diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 72dcde1..df9cc80 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -436,6 +436,7 @@ gb_Library_PLAINLIBS_NONE += \
 	kernel32 \
 	jawt \
 	libcmt \
+	libcmtd \
 	mpr \
 	msi \
 	msimg32 \