[Libreoffice-commits] .: 2 commits - solenv/gbuild

[Tor Lillqvist]

 solenv/gbuild/platform/winmingw.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2a6df9c54c17485ed8c71f956032dc8ddfae9884
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Aug 15 18:04:45 2011 +0300

    We need $(T_LDFLAGS) here, too

diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index aae877a..ad66871 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -383,6 +383,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 	$(gb_CXX) $(strip \
 		$(gb_Executable_TARGETTYPEFLAGS) \
 		$(if $(filter YES,$(gb_Executable_TARGETGUI)), -mwindows, -mconsole) \
+		$(T_LDFLAGS) \
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
 		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \
commit 173ca8cc75e682dde3338fdf829c8812834df3f0
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Aug 15 17:18:39 2011 +0300

    As we don't run ld to link, don't use the ld format of options

diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 215b4ca..aae877a 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -382,7 +382,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 	mkdir -p $(dir $(1)) && \
 	$(gb_CXX) $(strip \
 		$(gb_Executable_TARGETTYPEFLAGS) \
-		$(if $(filter YES,$(gb_Executable_TARGETGUI)), --subsystem windows, --subsystem console) \
+		$(if $(filter YES,$(gb_Executable_TARGETGUI)), -mwindows, -mconsole) \
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
 		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \