Commit b07cff51 authored by Grigory Petrov's avatar Grigory Petrov

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
parent 328600bd
...@@ -11,8 +11,8 @@ set PATH=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC;%PATH% ...@@ -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 REM set up the environment to compile to x86
call VCVARSALL x86 >nul 2>&1 call VCVARSALL x86 >nul 2>&1
if "%ERRORLEVEL%"=="0" ( 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=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 /out:setuptools/gui-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 ( ) else (
echo Visual Studio ^(Express^) 2008 not found to build Windows 32-bit version echo Visual Studio ^(Express^) 2008 not found to build Windows 32-bit version
) )
...@@ -20,8 +20,8 @@ if "%ERRORLEVEL%"=="0" ( ...@@ -20,8 +20,8 @@ if "%ERRORLEVEL%"=="0" (
REM now for 64-bit REM now for 64-bit
call VCVARSALL x86_amd64 >nul 2>&1 call VCVARSALL x86_amd64 >nul 2>&1
if "%ERRORLEVEL%"=="0" ( 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=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 /out:setuptools/gui-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 ( ) else (
echo Visual Studio ^(Express^) 2008 not found to build Windows 64-bit version echo Visual Studio ^(Express^) 2008 not found to build Windows 64-bit version
) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment