From fc66447e184764e0f56bb699c256ef649220fc46 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Sun, 13 Feb 2011 18:02:13 +0000 Subject: [PATCH] make ac_client.exe a native windows app rather than console git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6097 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- assaultcube.bat | 3 +-- assaultcube_release.bat | 3 +-- source/src/Makefile | 1 - source/vcpp/cube.vcproj | 12 ++++++------ 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/assaultcube.bat b/assaultcube.bat index 227a031a..a88e5944 100644 --- a/assaultcube.bat +++ b/assaultcube.bat @@ -1,2 +1 @@ -bin_win32\ac_client.exe --init %1 %2 %3 %4 %5 -pause +start bin_win32\ac_client.exe --init %1 %2 %3 %4 %5 diff --git a/assaultcube_release.bat b/assaultcube_release.bat index f96ab218..613b14a6 100644 --- a/assaultcube_release.bat +++ b/assaultcube_release.bat @@ -1,2 +1 @@ -bin_win32\ac_client.exe "--home=?MYDOCUMENTS?\AssaultCube_v1.1" --init %1 %2 %3 %4 %5 -pause +start bin_win32\ac_client.exe "--home=?MYDOCUMENTS?\AssaultCube_v1.1" --init %1 %2 %3 %4 %5 diff --git a/source/src/Makefile b/source/src/Makefile index a6faa8dc..7cc268f3 100644 --- a/source/src/Makefile +++ b/source/src/Makefile @@ -1,4 +1,3 @@ -//CXX=g++-gcc-4.2.3 CXXFLAGS= -O3 -fomit-frame-pointer override CXXFLAGS+= -Wall -fsigned-char diff --git a/source/vcpp/cube.vcproj b/source/vcpp/cube.vcproj index 30c83b6d..92700cd7 100644 --- a/source/vcpp/cube.vcproj +++ b/source/vcpp/cube.vcproj @@ -50,7 +50,7 @@ FavorSizeOrSpeed="1" OmitFramePointers="true" AdditionalIncludeDirectories="..\include\vorbis;..\include\ogg;..\enet\include;..\include;..\src;..\include\al;..\include" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" + PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS" StringPooling="true" MinimalRebuild="false" ExceptionHandling="0" @@ -97,7 +97,7 @@ GenerateMapFile="true" MapFileName=".\Release/cube.map" MapExports="true" - SubSystem="1" + SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" OptimizeForWindows98="1" @@ -159,7 +159,7 @@ AdditionalOptions="/GS" Optimization="0" AdditionalIncludeDirectories="..\include\vorbis;..\include\ogg;..\enet\include;..\include;..\src;..\include\al;..\include" - PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,ENET_DEBUG" + PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,ENET_DEBUG" BasicRuntimeChecks="3" RuntimeLibrary="1" FloatingPointModel="2" @@ -198,7 +198,7 @@ IgnoreAllDefaultLibraries="false" GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug/ac_client.pdb" - SubSystem="1" + SubSystem="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" /> @@ -262,7 +262,7 @@ FavorSizeOrSpeed="1" OmitFramePointers="true" AdditionalIncludeDirectories="..\include\vorbis;..\include\ogg;..\enet\include;..\include;..\src;..\include\al;..\include" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE,USE_ENET" + PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,USE_ENET" StringPooling="true" MinimalRebuild="true" ExceptionHandling="0" @@ -308,7 +308,7 @@ GenerateMapFile="true" MapFileName=".\Release/cube.map" MapExports="true" - SubSystem="1" + SubSystem="2" OptimizeForWindows98="1" RandomizedBaseAddress="1" DataExecutionPrevention="0"