You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/15 00:46:20 UTC
svn commit: r1409570 - in /incubator/ooo/branches/gbuild/main/solenv/gbuild:
Executable.mk platform/windows.mk platform/winmingw.mk
templates/Executable.mk
Author: arist
Date: Wed Nov 14 23:46:19 2012
New Revision: 1409570
URL: http://svn.apache.org/viewvc?rev=1409570&view=rev
Log:
gnumake4_085_82d8df3b0ccd.patch
# HG changeset patch
# User Ocke Janssen [oj] <Oc...@oracle.com>
# Date 1302588709 -7200
# Node ID 82d8df3b0ccd74bc312893c077c3141ac4c0e4a4
# Parent 10c30bc3bc81d0fdf2332d1dc159b0eb574a94a0
gnumake4: new defile for subsystem:windows and subsystem:console
Modified:
incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/templates/Executable.mk
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk?rev=1409570&r1=1409569&r2=1409570&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk Wed Nov 14 23:46:19 2012
@@ -43,6 +43,7 @@ $(call gb_Executable__Executable_impl,$(
endef
define gb_Executable__Executable_impl
+$(call gb_Executable_set_targettype_gui,$(2))
$(call gb_LinkTarget_LinkTarget,$(2))
$(call gb_LinkTarget_set_targettype,$(2),Executable)
$(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
@@ -53,6 +54,11 @@ $(call gb_Deliver_add_deliverable,$(call
endef
+define gb_Executable_set_targettype_gui
+$(call gb_Executable_get_target,$(1)) : gb_Executable_TARGETGUI := $(2)
+endef
+
+
define gb_Executable_forward_to_Linktarget
gb_Executable_$(1) = $$(call gb_LinkTarget_$(1),Executable/$$(1)$$(gb_Executable_EXT),$$(2),$$(3))
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk?rev=1409570&r1=1409569&r2=1409570&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk Wed Nov 14 23:46:19 2012
@@ -190,11 +190,11 @@ gb_LinkTarget_LDFLAGS := \
-MACHINE:IX86 \
-NODEFAULTLIB \
-OPT:NOREF \
- -SUBSYSTEM:CONSOLE \
-safeseh \
-nxcompat \
-dynamicbase \
$(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst \,/,$(ILIB))))) \
+
gb_DEBUG_CFLAGS := -Zi
@@ -440,6 +440,7 @@ $(call gb_Helper_abbreviate_dirs_native,
$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
+ $(if $(filter YES,$(gb_Executable_TARGETGUI)), -SUBSYSTEM:WINDOWS, -SUBSYSTEM:CONSOLE) \
$(T_LDFLAGS) \
@$${RESPONSEFILE} \
$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \
@@ -609,6 +610,7 @@ endef
gb_Executable_EXT := .exe
gb_Executable_TARGETTYPEFLAGS := -RELEASE -BASE:0x1b000000 -OPT:NOREF -INCREMENTAL:NO -DEBUG
gb_Executable_get_rpath :=
+gb_Executable_TARGETGUI :=
define gb_Executable_Executable_platform
$(call gb_LinkTarget_set_auxtargets,$(2),\
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk?rev=1409570&r1=1409569&r2=1409570&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk Wed Nov 14 23:46:19 2012
@@ -153,7 +153,6 @@ gb_NoexPrecompiledHeader_NOEXCEPTIONFLAG
gb_LinkTarget_LDFLAGS := \
--export-all-symbols \
--kill-at \
- --subsystem console \
--exclude-libs ALL \
--enable-stdcall-fixup \
--enable-runtime-pseudo-reloc-v2 \
@@ -407,6 +406,7 @@ $(call gb_Helper_abbreviate_dirs_native,
$(NATIVERES) " > $${RESPONSEFILE} && \
$(gb_LINK) \
$(gb_Executable_TARGETTYPEFLAGS) \
+ $(if $(filter YES,$(gb_Executable_TARGETGUI)), --subsystem windows, --subsystem console) \
$(T_LDFLAGS) \
$(gb_MINGWLIBDIR)/crt2.o \
$(MINGW_CLIB_DIR)/crtbegin.o \
@@ -607,7 +607,7 @@ gb_Executable_EXT := .exe
gb_Executable_TARGETTYPEFLAGS :=
gb_Executable_get_rpath :=
gb_Executable_Executable_platform =
-
+gb_Executable_TARGETGUI :=
# CppunitTest class
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/templates/Executable.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/templates/Executable.mk?rev=1409570&r1=1409569&r2=1409570&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/templates/Executable.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/templates/Executable.mk Wed Nov 14 23:46:19 2012
@@ -38,4 +38,7 @@ $(eval $(call gb_Executable_add_linked_l
$(eval $(call gb_Executable_add_exception_objects,EXEC,\
))
+$(eval $(call gb_Executable_set_targettype_gui,EXEC,\
+))
+
# vim: set noet sw=4 ts=4: