From 2d136ebc29f520933783aa3b72d22f832dd50fc2 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Thu, 2 Nov 2006 19:44:58 +0000 Subject: [PATCH] fixed manfest was created for .exe during static build --- configure/os/CONFIG.win32-x86.win32-x86 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configure/os/CONFIG.win32-x86.win32-x86 b/configure/os/CONFIG.win32-x86.win32-x86 index b6b0127c8..9923dfa78 100644 --- a/configure/os/CONFIG.win32-x86.win32-x86 +++ b/configure/os/CONFIG.win32-x86.win32-x86 @@ -57,7 +57,7 @@ WARN_CFLAGS_NO = /W1 # /MD use MSVCRT (run-time as DLL, multi-thread support) # /GL whole program optimization # /Zi generate program database for debugging information -OPT_CFLAGS_YES = /Ox /GL +OPT_CFLAGS_YES = /Ox /GL # # /Zi generate program database for debugging information @@ -124,7 +124,7 @@ WARN_CXXFLAGS_NO = /W1 # /Ox maximum optimizations # /GL whole program optimization # /Zi generate program database for debugging information -OPT_CXXFLAGS_YES = /Ox /GL +OPT_CXXFLAGS_YES = /Ox /GL # # /Zi generate program database for debugging information @@ -300,6 +300,8 @@ LINK.cpp = $(WINLINK) -nologo $(STATIC_LDFLAGS) $(LDFLAGS) $(PROD_LDFLAGS) -out: # ifeq ($(shell $(PERL) $(TOOLS)/useManifestTool.pl),1) MT_DLL_COMMAND = mt.exe /manifest $@.manifest /outputresource:$@;\#2 -MT_EXE_COMMAND = mt.exe /manifest $@.manifest /outputresource:$@;\#1 +MT_EXE_COMMAND_YES = +MT_EXE_COMMAND_NO = mt.exe /manifest $@.manifest /outputresource:$@;\#1 +MT_EXE_COMMAND = $(MT_EXE_COMMAND_$(STATIC_BUILD)) endif