mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-27 12:50:09 +00:00
Factor out console linker flags for Win32 (MOZ_WINCONSOLE) into config.mk so that we can use them from elsewhere. r=cls.
This commit is contained in:
parent
4e7eefe5e4
commit
6f2dee8b61
@ -436,6 +436,28 @@ endif
|
||||
endif
|
||||
|
||||
|
||||
# Set link flags according to whether we want a console.
|
||||
ifdef MOZ_WINCONSOLE
|
||||
ifeq ($(MOZ_WINCONSOLE),1)
|
||||
ifeq ($(MOZ_OS2_TOOLS),EMX)
|
||||
BIN_FLAGS := -Zlinker /PM:VIO -Zlinker /Stack:0x30000
|
||||
endif
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
WIN32_EXE_LDFLAGS += /SUBSYSTEM:CONSOLE
|
||||
endif
|
||||
else # MOZ_WINCONSOLE
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
LDFLAGS += /PM:PM
|
||||
endif
|
||||
ifeq ($(MOZ_OS2_TOOLS),EMX)
|
||||
BIN_FLAGS := -Zlinker /PM:PM -Zlinker /Stack:0x30000
|
||||
endif
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
WIN32_EXE_LDFLAGS += /SUBSYSTEM:WINDOWS
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
#
|
||||
# Personal makefile customizations go in these optional make include files.
|
||||
#
|
||||
|
@ -266,26 +266,6 @@ MOZ_WINCONSOLE=0
|
||||
endif
|
||||
endif
|
||||
|
||||
# Set link flags according to whether we want a console.
|
||||
ifeq ($(MOZ_WINCONSOLE),1)
|
||||
ifeq ($(MOZ_OS2_TOOLS),EMX)
|
||||
BIN_FLAGS := -Zlinker /PM:VIO -Zlinker /Stack:0x30000
|
||||
endif
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
LDFLAGS += /SUBSYSTEM:CONSOLE
|
||||
endif
|
||||
else # MOZ_WINCONSOLE
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
LDFLAGS += /PM:PM
|
||||
endif
|
||||
ifeq ($(MOZ_OS2_TOOLS),EMX)
|
||||
BIN_FLAGS := -Zlinker /PM:PM -Zlinker /Stack:0x30000
|
||||
endif
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
LDFLAGS += /SUBSYSTEM:WINDOWS
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
#
|
||||
# Control the default heap size.
|
||||
|
Loading…
x
Reference in New Issue
Block a user