diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2013-03-21 12:28:53 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2013-03-21 13:07:42 +0200 |
| commit | 433672d1f4b9198fef362690b195f47822111e21 (patch) | |
| tree | 037da095698f31bdcf106f38a5b525e6945d3b83 /solenv | |
| parent | 7e056403f7986f09981bf69514548e143bbb94b7 (diff) | |
Use subsystem version 5.02 on x64
Change-Id: I957cda779d300449e2110748a516c9662126f761
Diffstat (limited to 'solenv')
| -rwxr-xr-x | solenv/gbuild/platform/com_MSC_class.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 612342d8e76a..60855e4a56ef 100755 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -173,6 +173,12 @@ cut -f 1001- -d ' ' $${RESPONSEFILE} >> $${RESPONSEFILE}.1 && \ mv $${RESPONSEFILE}.1 $${RESPONSEFILE} && endef +ifeq ($(CPUNAME),X86_64) +MSC_SUBSYSTEM_VERSION=$(COMMA)5.02 +else +MSC_SUBSYSTEM_VERSION=$(COMMA)5.01 +endif + define gb_LinkTarget__command $(call gb_Output_announce,$(2),$(true),LNK,4) $(call gb_Helper_abbreviate_dirs,\ @@ -192,7 +198,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(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,$(LIBRARY_X64)),,$(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS$(COMMA)5.01, -SUBSYSTEM:CONSOLE$(COMMA)5.01)) \ + $(if $(filter YES,$(LIBRARY_X64)),,$(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS$(MSC_SUBSYSTEM_VERSION), -SUBSYSTEM:CONSOLE$(MSC_SUBSYSTEM_VERSION))) \ $(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64) \ $(if $(filter YES,$(LIBRARY_X64)), \ -LIBPATH:$(OUTDIR)/lib/x64 \ |