Changeset 1645


Ignore:
Timestamp:
Jul 18, 2012, 6:41:08 PM (8 years ago)
Author:
sam
Message:

core: switch the Win32/x64 binaries to the Windows subsystem so that they
do not open a console at startup.

Location:
trunk
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • trunk/build/vs2010/Lol.Core.Rules.props

    r1612 r1645  
    2323      <GenerateDebugInformation>true</GenerateDebugInformation>
    2424      <Optimization>Disabled</Optimization>
    25       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     25      <RuntimeLibrary Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">MultiThreadedDebugDLL</RuntimeLibrary>
     26      <RuntimeLibrary Condition="'$(Platform)'=='Xbox 360'">MultiThreadedDebug</RuntimeLibrary>
    2627      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    2728    </ClCompile>
     
    3334      <OptimizationLevel>Level2</OptimizationLevel>
    3435
    35       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     36      <RuntimeLibrary Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">MultiThreadedDLL</RuntimeLibrary>
     37      <RuntimeLibrary Condition="'$(Platform)'=='Xbox 360'">MultiThreaded</RuntimeLibrary>
    3638      <FunctionLevelLinking>true</FunctionLevelLinking>
    3739      <IntrinsicFunctions>true</IntrinsicFunctions>
     
    5658      <AdditionalDependencies Condition="'$(Platform)'=='PS3'">$(Ps3Deps);%(AdditionalDependencies)</AdditionalDependencies>
    5759      <AdditionalDependencies Condition="'$(Platform)'=='PS3'">$(GlDeps);%(AdditionalDependencies)</AdditionalDependencies>
     60    </Link>
     61    <Link Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">
     62      <SubSystem>Windows</SubSystem>
    5863    </Link>
    5964    <Link Condition="'$(Configuration)'=='Debug'">
  • trunk/games/ToukyDemo/ToukyDemo.cpp

    r1568 r1645  
    3030#endif
    3131
    32 #if USE_SDL && defined __APPLE__
     32#if USE_SDL
    3333#   include <SDL_main.h>
    3434#endif
  • trunk/test/BtPhysTest.cpp

    r1633 r1645  
    2929#endif
    3030
    31 #if USE_SDL && defined __APPLE__
     31#if USE_SDL
    3232#   include <SDL_main.h>
    3333#endif
  • trunk/test/benchsuite.cpp

    r977 r1645  
    1515#include <cstdio>
    1616
    17 #if USE_SDL && defined __APPLE__
     17#if USE_SDL
    1818#   include <SDL_main.h>
    1919#endif
  • trunk/test/debug/quad.cpp

    r1228 r1645  
    2020using namespace lol;
    2121
    22 #if USE_SDL && defined __APPLE__
     22#if USE_SDL
    2323#   include <SDL_main.h>
    24 #endif
    25 
    26 #if defined _WIN32
    27 #   undef main /* FIXME: still needed? */
    2824#endif
    2925
  • trunk/test/math/pi.cpp

    r1091 r1645  
    1515#include <cstdio>
    1616
    17 #if USE_SDL && defined __APPLE__
     17#if USE_SDL
    1818#   include <SDL_main.h>
    1919#endif
  • trunk/test/math/poly.cpp

    r1050 r1645  
    1515#include <cstdio>
    1616
    17 #if USE_SDL && defined __APPLE__
     17#if USE_SDL
    1818#   include <SDL_main.h>
    1919#endif
  • trunk/test/math/remez.cpp

    r1127 r1645  
    1313#endif
    1414
    15 #if USE_SDL && defined __APPLE__
     15#if USE_SDL
    1616#   include <SDL_main.h>
    1717#endif
  • trunk/test/sandbox/sample.cpp

    r1112 r1645  
    1313#endif
    1414
    15 #if USE_SDL && defined __APPLE__
     15#if USE_SDL
    1616#   include <SDL_main.h>
    1717#endif
  • trunk/test/testsuite.cpp

    r961 r1645  
    1616#include <cstdlib>
    1717
    18 #if USE_SDL && defined __APPLE__
     18#if USE_SDL
    1919#   include <SDL_main.h>
    2020#endif
  • trunk/test/xolotl/xolotl.cpp

    r1513 r1645  
    2020using namespace lol;
    2121
    22 #if USE_SDL && defined __APPLE__
     22#if USE_SDL
    2323#   include <SDL_main.h>
    24 #endif
    25 
    26 #if defined _WIN32
    27 #   undef main /* FIXME: still needed? */
    2824#endif
    2925
  • trunk/tools/neercs/neercs.cpp

    r1644 r1645  
    2828#endif
    2929
    30 #if USE_SDL && defined __APPLE__
     30#if USE_SDL
    3131#   include <SDL_main.h>
    3232#endif
  • trunk/tutorial/01_triangle.cpp

    r1518 r1645  
    1919using namespace lol;
    2020
    21 #if USE_SDL && defined __APPLE__
     21#if USE_SDL
    2222#   include <SDL_main.h>
    2323#endif
    2424
    2525#if defined _WIN32
    26 #   undef main /* FIXME: still needed? */
    2726#   include <direct.h>
    2827#endif
  • trunk/tutorial/02_cube.cpp

    r1518 r1645  
    1919using namespace lol;
    2020
    21 #if USE_SDL && defined __APPLE__
     21#if USE_SDL
    2222#   include <SDL_main.h>
    2323#endif
    2424
    2525#if defined _WIN32
    26 #   undef main /* FIXME: still needed? */
    2726#   include <direct.h>
    2827#endif
  • trunk/tutorial/05_easymesh.cpp

    r1619 r1645  
    1818using namespace lol;
    1919
    20 #if USE_SDL && defined __APPLE__
     20#if USE_SDL
    2121#   include <SDL_main.h>
    2222#endif
  • trunk/tutorial/08_fbo.cpp

    r1574 r1645  
    1919using namespace lol;
    2020
    21 #if USE_SDL && defined __APPLE__
     21#if USE_SDL
    2222#   include <SDL_main.h>
    2323#endif
    2424
    2525#if defined _WIN32
    26 #   undef main /* FIXME: still needed? */
    2726#   include <direct.h>
    2827#endif
  • trunk/tutorial/11_fractal.cpp

    r1557 r1645  
    2727#endif
    2828
    29 #if USE_SDL && defined __APPLE__
     29#if USE_SDL
    3030#   include <SDL_main.h>
    3131#endif
    3232
    3333#if defined _WIN32
    34 #   undef main /* FIXME: still needed? */
    3534#   include <direct.h>
    3635#endif
Note: See TracChangeset for help on using the changeset viewer.