aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrigory Petrov <grigory.v.p@gmail.com>2013-05-08 01:00:00 +0400
committerGrigory Petrov <grigory.v.p@gmail.com>2013-05-08 01:00:00 +0400
commitb07cff51a39f25ef1efd88bd0f672718e875978c (patch)
treefdafe6426a7ae360e1c310584d279ecf526cba58
parent328600bdabf9645cd6f8a16c9f735384c8bfb2b0 (diff)
downloadexternal_python_setuptools-b07cff51a39f25ef1efd88bd0f672718e875978c.tar.gz
external_python_setuptools-b07cff51a39f25ef1efd88bd0f672718e875978c.tar.bz2
external_python_setuptools-b07cff51a39f25ef1efd88bd0f672718e875978c.zip
Fixed a (probably) bug with GUI windows launcher actually being
compiled as CONSOLE windows application. The "GUI=0" and "GUI=1" is a compiler definition that affects how compiled code will work (.py or .pyw file to launch etc). But executable type is defined by a linker and can be changed only via /SUBSYSTEM command-line key. --HG-- branch : distribute extra : rebase_source : f909e335ae948d7743e07e690c7d564ad0f98c15
-rw-r--r--msvc-build-launcher.cmd8
1 files changed, 4 insertions, 4 deletions
diff --git a/msvc-build-launcher.cmd b/msvc-build-launcher.cmd
index fb5935c0..939fb656 100644
--- a/msvc-build-launcher.cmd
+++ b/msvc-build-launcher.cmd
@@ -11,8 +11,8 @@ set PATH=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC;%PATH%
REM set up the environment to compile to x86
call VCVARSALL x86 >nul 2>&1
if "%ERRORLEVEL%"=="0" (
- cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /out:setuptools/cli-32.exe
- cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /out:setuptools/gui-32.exe
+ cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /SUBSYSTEM:CONSOLE /out:setuptools/cli-32.exe
+ cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /SUBSYSTEM:WINDOWS /out:setuptools/gui-32.exe
) else (
echo Visual Studio ^(Express^) 2008 not found to build Windows 32-bit version
)
@@ -20,8 +20,8 @@ if "%ERRORLEVEL%"=="0" (
REM now for 64-bit
call VCVARSALL x86_amd64 >nul 2>&1
if "%ERRORLEVEL%"=="0" (
- cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /out:setuptools/cli-64.exe
- cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /out:setuptools/gui-64.exe
+ cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /SUBSYSTEM:CONSOLE /out:setuptools/cli-64.exe
+ cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /SUBSYSTEM:WINDOWS /out:setuptools/gui-64.exe
) else (
echo Visual Studio ^(Express^) 2008 not found to build Windows 64-bit version
)