Changeset 1189


Ignore:
Timestamp:
Apr 4, 2012, 8:40:04 PM (11 years ago)
Author:
sam
Message:

build: major refactoring of the Win32 and Xbox project files; we now
link properly on the Xbox.

Location:
trunk
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/.gitignore

    r1168 r1189  
    3737*~
    3838# Visual Studio cruft
    39 win32/Debug
    40 win32/Release
     39win32/*Debug
     40win32/*Release
    4141win32/*.vcxproj.user
    4242win32/*.sdf

  • trunk/monsterz/monsterz.cpp

    r1167 r1189  
    22// Monsterz
    33//
    4 // Copyright: (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4// Copyright: (c) 2005-2012 Sam Hocevar <sam@hocevar.net>
    55//   This program is free software; you can redistribute it and/or
    66//   modify it under the terms of the Do What The Fuck You Want To
    … …  
    3838    Application app("Monsterz", ivec2(640, 480), 60.0f);
    3939
    40 #if defined _WIN32
     40#if defined _MSC_VER && !defined _XBOX
     41    _chdir("..\\..");
     42#elif defined _WIN32 && !defined _XBOX
    4143    _chdir(".."); /* Temporary Win32 hack */
    4244#endif

  • trunk/monsterz/title.cpp

    r1184 r1189  
    22// Monsterz
    33//
    4 // Copyright: (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4// Copyright: (c) 2005-2012 Sam Hocevar <sam@hocevar.net>
    55//   This program is free software; you can redistribute it and/or
    66//   modify it under the terms of the Do What The Fuck You Want To
    … …  
    1313#endif
    1414
    15 #ifdef WIN32
     15#if defined _XBOX
     16#   define _USE_MATH_DEFINES /* for M_PI */
     17#   include <xtl.h>
     18#elif defined _WIN32
    1619#   define _USE_MATH_DEFINES /* for M_PI */
    1720#   define WIN32_LEAN_AND_MEAN

  • trunk/src/gradient.cpp

    r1173 r1189  
    1313#endif
    1414
    15 #if !defined _XBOX /* This file is meaningless on Xbox */
    16 
    1715#include <cmath>
    1816
    … …  
    3533private:
    3634    Shader *shader;
     35#if !defined _XBOX /* This file is meaningless on Xbox */
     36
    3737    GLuint bufs[2];
    3838#if defined HAVE_GL_2X && !defined __APPLE__
    3939    GLuint vaos[1];
     40#endif
    4041#endif
    4142};
    … …  
    6566    Entity::TickDraw(deltams);
    6667
     68#if !defined _XBOX /* This file is meaningless on Xbox */
    6769    if (!data->shader)
    6870    {
    … …  
    234236    glDisableClientState(GL_COLOR_ARRAY);
    235237#endif
     238#endif
    236239}
    237240
    … …  
    243246
    244247} /* namespace lol */
    245 
    246 #endif /* !defined _XBOX */

  • trunk/src/platform/xbox/xboxapp.cpp

    r1187 r1189  
    6161
    6262#if defined _XBOX
     63        extern D3DDevice *g_d3ddevice;
     64        g_d3ddevice->Present(NULL, NULL, NULL, NULL);
    6365#endif
    6466    }

  • trunk/src/video.cpp

    r1179 r1189  
    3131using namespace std;
    3232
     33#if defined _XBOX
     34/* FIXME: g_d3ddevice should never be exported */
     35D3DDevice *g_d3ddevice;
     36#endif
     37
    3338namespace lol
    3439{
    … …  
    97102        exit(EXIT_FAILURE);
    98103    }
     104
     105    g_d3ddevice = VideoData::d3d_dev;
    99106#else
    100107#   if defined USE_GLEW && !defined __APPLE__

  • trunk/test/benchmark/trig.cpp

    r1082 r1189  
    22// Lol Engine - Benchmark program
    33//
    4 // Copyright: (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4// Copyright: (c) 2005-2012 Sam Hocevar <sam@hocevar.net>
    55//   This program is free software; you can redistribute it and/or
    66//   modify it under the terms of the Do What The Fuck You Want To
    … …  
    1313#endif
    1414
    15 #ifdef WIN32
     15#if defined _XBOX
     16#   define _USE_MATH_DEFINES /* for M_PI */
     17#   include <xtl.h>
     18#elif defined _WIN32
    1619#   define _USE_MATH_DEFINES /* for M_PI */
    1720#   define WIN32_LEAN_AND_MEAN

  • trunk/test/tutorial/tut01.cpp

    r1179 r1189  
    22// Lol Engine - Triangle tutorial
    33//
    4 // Copyright: (c) 2011 Sam Hocevar <sam@hocevar.net>
     4// Copyright: (c) 2012 Sam Hocevar <sam@hocevar.net>
    55//   This program is free software; you can redistribute it and/or
    66//   modify it under the terms of the Do What The Fuck You Want To
    … …  
    5050        {
    5151            m_shader = Shader::Create(
     52#if !defined __CELLOS_LV2__ && !defined _XBOX
    5253                "#version 120\n"
    5354                "attribute vec2 coord2d;"
    … …  
    6162                "    gl_FragColor[1] = 0.0;"
    6263                "    gl_FragColor[2] = 1.0;"
    63                 "}");
     64                "}"
     65#else
     66                "void main(float2 coord2d : POSITION,"
     67                "          out float4 out_Position : POSITION) {"
     68                "    out_Position = float4(coord2d, 0.0, 1.0);"
     69                "}",
     70
     71                "void main(out float4 out_FragColor : COLOR) {"
     72                "    out_FragColor[0] = 0.0;"
     73                "    out_FragColor[0] = 0.0;"
     74                "    out_FragColor[0] = 1.0;"
     75                "}"
     76#endif
     77            );
    6478            m_attrib = m_shader->GetAttribLocation("coord2d");
    6579            m_ready = true;
    6680
    67 #if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
     81#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ && !defined _XBOX
    6882            /* Method 1: store vertex buffer on the GPU memory */
    6983            glGenBuffers(1, &m_vbo);
    … …  
    7185            glBufferData(GL_ARRAY_BUFFER, sizeof(m_vertices), m_vertices,
    7286                         GL_STATIC_DRAW);
    73 #elif !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
     87#elif !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ && !defined _XBOX
    7488            /* Method 2: upload vertex information at each frame */
     89#elif defined _XBOX
     90            extern D3DDevice *g_d3ddevice;
     91            D3DVERTEXELEMENT9 const elements[3] =
     92            {
     93                { 0, 0, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0 },
     94                D3DDECL_END()
     95            };
     96            g_d3ddevice->CreateVertexDeclaration(elements, &m_vdecl);
     97            g_d3ddevice->CreateVertexBuffer(sizeof(m_vertices), D3DUSAGE_WRITEONLY, NULL, D3DPOOL_MANAGED, &m_vbo, NULL);
     98
     99            vec2 *vertices;
     100            m_vbo->Lock(0, 0, (void **)&vertices, 0);
     101            memcpy(vertices, m_vertices, sizeof(m_vertices));
     102            m_vbo->Unlock();
    75103#else
    76104#endif
    … …  
    80108
    81109        m_shader->Bind();
    82 #if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
     110#if defined _XBOX
     111        extern D3DDevice *g_d3ddevice;
     112        g_d3ddevice->SetVertexDeclaration(m_vdecl);
     113        g_d3ddevice->SetStreamSource(0, m_vbo, 0, sizeof(*m_vertices));
     114#elif !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
    83115        glBindBuffer(GL_ARRAY_BUFFER, m_vbo);
    84116        glEnableVertexAttribArray(m_attrib);
    … …  
    93125#endif
    94126
     127#if defined _XBOX
     128        g_d3ddevice->DrawPrimitive(D3DPT_TRIANGLELIST, 0, 1);
     129#else
    95130        glDrawArrays(GL_TRIANGLES, 0, 3);
     131#endif
    96132
    97 #if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
     133#if defined _XBOX
     134        /* FIXME: do we need to unset anything here? */
     135#elif !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
    98136        glDisableVertexAttribArray(m_attrib);
    99137        glBindBuffer(GL_ARRAY_BUFFER, 0);
    … …  
    109147    vec2 m_vertices[3];
    110148    Shader *m_shader;
    111 #if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
     149#if defined _XBOX
     150    D3DVertexDeclaration *m_vdecl;
     151    D3DVertexBuffer *m_vbo;
     152#elif !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
    112153    GLuint m_vbo;
    113154#endif
    … …  
    120161    Application app("Tutorial 1: Triangle", ivec2(640, 480), 60.0f);
    121162
    122 #if defined _MSC_VER
     163#if defined _MSC_VER && !defined _XBOX
    123164    _chdir("..");
    124 #elif defined _WIN32
     165#elif defined _WIN32 && !defined _XBOX
    125166    _chdir("../..");
    126167#endif
    … …  
    130171
    131172    app.Run();
    132 
    133173    return EXIT_SUCCESS;
    134174}

  • trunk/win32/benchsuite.vcxproj

    r1178 r1189  
    2626    <ClCompile Include="..\test\benchsuite.cpp" />
    2727  </ItemGroup>
     28  <ItemGroup>
     29    <ProjectReference Include="lolcore.vcxproj">
     30      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     31    </ProjectReference>
     32  </ItemGroup>
    2833  <PropertyGroup Label="Globals">
    2934    <ProjectGuid>{B1E10086-A1DA-401A-834D-969C9DBB5CC1}</ProjectGuid>
    3035    <Keyword>Win32Proj</Keyword>
    31     <RootNamespace>testmap</RootNamespace>
    3236  </PropertyGroup>
    3337  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    … …  
    3539    <ConfigurationType>Application</ConfigurationType>
    3640    <UseDebugLibraries>true</UseDebugLibraries>
    37     <CharacterSet>Unicode</CharacterSet>
     41    <CharacterSet>MultiByte</CharacterSet>
    3842    <UseOfMfc>Dynamic</UseOfMfc>
    3943  </PropertyGroup>
    … …  
    4145    <ConfigurationType>Application</ConfigurationType>
    4246    <UseDebugLibraries>true</UseDebugLibraries>
    43     <CharacterSet>Unicode</CharacterSet>
     47    <CharacterSet>MultiByte</CharacterSet>
    4448    <UseOfMfc>Dynamic</UseOfMfc>
    4549  </PropertyGroup>
    … …  
    4852    <UseDebugLibraries>false</UseDebugLibraries>
    4953    <WholeProgramOptimization>true</WholeProgramOptimization>
    50     <CharacterSet>Unicode</CharacterSet>
     54    <CharacterSet>MultiByte</CharacterSet>
    5155    <UseOfMfc>Dynamic</UseOfMfc>
    5256  </PropertyGroup>
    … …  
    5559    <UseDebugLibraries>false</UseDebugLibraries>
    5660    <WholeProgramOptimization>true</WholeProgramOptimization>
    57     <CharacterSet>Unicode</CharacterSet>
     61    <CharacterSet>MultiByte</CharacterSet>
    5862    <UseOfMfc>Dynamic</UseOfMfc>
    5963  </PropertyGroup>
    … …  
    7882  </ImportGroup>
    7983  <PropertyGroup Label="UserMacros" />
    80   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    81     <IntDir>Debug\$(ProjectName)\</IntDir>
     84  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
    8285    <LinkIncremental>true</LinkIncremental>
    8386  </PropertyGroup>
    84   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
    85     <IntDir>Debug\$(ProjectName)\</IntDir>
    86     <LinkIncremental>true</LinkIncremental>
    87   </PropertyGroup>
    88   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    89     <IntDir>Release\$(ProjectName)\</IntDir>
     87  <PropertyGroup Condition="'$(Configuration)'=='Release'">
    9088    <LinkIncremental>false</LinkIncremental>
    9189  </PropertyGroup>
    92   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
    93     <IntDir>Release\$(ProjectName)\</IntDir>
    94     <LinkIncremental>false</LinkIncremental>
     90  <PropertyGroup>
     91    <OutDir>$(Platform) $(Configuration)\</OutDir>
     92    <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir>
    9593  </PropertyGroup>
    9694  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    … …  
    105103    </ClCompile>
    106104    <Link>
    107       <SubSystem>Console</SubSystem>
    108105      <GenerateDebugInformation>true</GenerateDebugInformation>
    109       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
     106      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps)</AdditionalDependencies>
    110107      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    111108    </Link>
    112109    <PostBuildEvent>
    113       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
     110      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command>
    114111    </PostBuildEvent>
    115112  </ItemDefinitionGroup>
    … …  
    120117      <WarningLevel>Level3</WarningLevel>
    121118      <Optimization>Disabled</Optimization>
     119      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    122120      <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    123       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     121      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    124122      <FloatingPointModel>Fast</FloatingPointModel>
    125123    </ClCompile>
    126124    <Link>
    127       <SubSystem>Console</SubSystem>
    128125      <GenerateDebugInformation>true</GenerateDebugInformation>
    129       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    130       <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     126      <AdditionalDependencies>xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     127      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    131128    </Link>
    132     <PostBuildEvent>
    133       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
    134     </PostBuildEvent>
     129    <Deploy>
     130      <DeploymentType>CopyToHardDrive</DeploymentType>
     131    </Deploy>
    135132  </ItemDefinitionGroup>
    136133  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    … …  
    147144    </ClCompile>
    148145    <Link>
    149       <SubSystem>Console</SubSystem>
    150146      <GenerateDebugInformation>true</GenerateDebugInformation>
    151147      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    152148      <OptimizeReferences>true</OptimizeReferences>
    153       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
     149      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps)</AdditionalDependencies>
    154150      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    155151    </Link>
    156152    <PostBuildEvent>
    157       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
     153      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command>
    158154    </PostBuildEvent>
    159155  </ItemDefinitionGroup>
    … …  
    164160      </PrecompiledHeader>
    165161      <Optimization>MaxSpeed</Optimization>
     162      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    166163      <FunctionLevelLinking>true</FunctionLevelLinking>
    167164      <IntrinsicFunctions>true</IntrinsicFunctions>
    168165      <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    169       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     166      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    170167      <FloatingPointModel>Fast</FloatingPointModel>
    171168    </ClCompile>
    172169    <Link>
    173       <SubSystem>Console</SubSystem>
    174170      <GenerateDebugInformation>true</GenerateDebugInformation>
    175171      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    176172      <OptimizeReferences>true</OptimizeReferences>
    177       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    178       <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     173      <AdditionalDependencies>xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     174      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    179175    </Link>
    180     <PostBuildEvent>
    181       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
    182     </PostBuildEvent>
     176    <Deploy>
     177      <DeploymentType>CopyToHardDrive</DeploymentType>
     178    </Deploy>
    183179  </ItemDefinitionGroup>
    184180  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  • trunk/win32/deushax.vcxproj

    r1178 r1189  
    2828    <ClCompile Include="..\deushax\game.cpp" />
    2929  </ItemGroup>
     30  <ItemGroup>
     31    <ProjectReference Include="lolcore.vcxproj">
     32      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     33    </ProjectReference>
     34  </ItemGroup>
    3035  <PropertyGroup Label="Globals">
    3136    <ProjectGuid>{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}</ProjectGuid>
    3237    <Keyword>Win32Proj</Keyword>
    33     <RootNamespace>testmap</RootNamespace>
    3438  </PropertyGroup>
    3539  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    … …  
    3741    <ConfigurationType>Application</ConfigurationType>
    3842    <UseDebugLibraries>true</UseDebugLibraries>
    39     <CharacterSet>Unicode</CharacterSet>
     43    <CharacterSet>MultiByte</CharacterSet>
    4044    <UseOfMfc>Dynamic</UseOfMfc>
    4145  </PropertyGroup>
    … …  
    4347    <ConfigurationType>Application</ConfigurationType>
    4448    <UseDebugLibraries>true</UseDebugLibraries>
    45     <CharacterSet>Unicode</CharacterSet>
     49    <CharacterSet>MultiByte</CharacterSet>
    4650    <UseOfMfc>Dynamic</UseOfMfc>
    4751  </PropertyGroup>
    … …  
    5054    <UseDebugLibraries>false</UseDebugLibraries>
    5155    <WholeProgramOptimization>true</WholeProgramOptimization>
    52     <CharacterSet>Unicode</CharacterSet>
     56    <CharacterSet>MultiByte</CharacterSet>
    5357    <UseOfMfc>Dynamic</UseOfMfc>
    5458  </PropertyGroup>
    … …  
    5761    <UseDebugLibraries>false</UseDebugLibraries>
    5862    <WholeProgramOptimization>true</WholeProgramOptimization>
    59     <CharacterSet>Unicode</CharacterSet>
     63    <CharacterSet>MultiByte</CharacterSet>
    6064    <UseOfMfc>Dynamic</UseOfMfc>
    6165  </PropertyGroup>
    … …  
    8084  </ImportGroup>
    8185  <PropertyGroup Label="UserMacros" />
    82   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    83     <IntDir>Debug\$(ProjectName)\</IntDir>
     86  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
    8487    <LinkIncremental>true</LinkIncremental>
    8588  </PropertyGroup>
    86   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
    87     <IntDir>Debug\$(ProjectName)\</IntDir>
    88     <LinkIncremental>true</LinkIncremental>
    89   </PropertyGroup>
    90   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    91     <IntDir>Release\$(ProjectName)\</IntDir>
     89  <PropertyGroup Condition="'$(Configuration)'=='Release'">
    9290    <LinkIncremental>false</LinkIncremental>
    9391  </PropertyGroup>
    94   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
    95     <IntDir>Release\$(ProjectName)\</IntDir>
    96     <LinkIncremental>false</LinkIncremental>
     92  <PropertyGroup>
     93    <OutDir>$(Platform) $(Configuration)\</OutDir>
     94    <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir>
    9795  </PropertyGroup>
    9896  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    … …  
    106104    </ClCompile>
    107105    <Link>
    108       <SubSystem>Console</SubSystem>
    109106      <GenerateDebugInformation>true</GenerateDebugInformation>
    110       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
     107      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps)</AdditionalDependencies>
    111108      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    112109    </Link>
    113110    <PostBuildEvent>
    114       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
     111      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command>
    115112    </PostBuildEvent>
    116113  </ItemDefinitionGroup>
    … …  
    121118      <WarningLevel>Level3</WarningLevel>
    122119      <Optimization>Disabled</Optimization>
     120      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    123121      <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    124       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     122      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    125123    </ClCompile>
    126124    <Link>
    127       <SubSystem>Console</SubSystem>
    128125      <GenerateDebugInformation>true</GenerateDebugInformation>
    129       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    130       <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     126      <AdditionalDependencies>xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     127      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    131128    </Link>
    132     <PostBuildEvent>
    133       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
    134     </PostBuildEvent>
     129    <Deploy>
     130      <DeploymentType>CopyToHardDrive</DeploymentType>
     131    </Deploy>
    135132  </ItemDefinitionGroup>
    136133  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    … …  
    146143    </ClCompile>
    147144    <Link>
    148       <SubSystem>Console</SubSystem>
    149145      <GenerateDebugInformation>true</GenerateDebugInformation>
    150146      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    151147      <OptimizeReferences>true</OptimizeReferences>
    152       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
     148      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps)</AdditionalDependencies>
    153149      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    154150    </Link>
    155151    <PostBuildEvent>
    156       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
     152      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command>
    157153    </PostBuildEvent>
    158154  </ItemDefinitionGroup>
    … …  
    163159      </PrecompiledHeader>
    164160      <Optimization>MaxSpeed</Optimization>
     161      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    165162      <FunctionLevelLinking>true</FunctionLevelLinking>
    166163      <IntrinsicFunctions>true</IntrinsicFunctions>
    167164      <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    168       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     165      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    169166    </ClCompile>
    170167    <Link>
    171       <SubSystem>Console</SubSystem>
    172168      <GenerateDebugInformation>true</GenerateDebugInformation>
    173169      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    174170      <OptimizeReferences>true</OptimizeReferences>
    175       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    176       <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     171      <AdditionalDependencies>xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     172      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    177173    </Link>
    178     <PostBuildEvent>
    179       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
    180     </PostBuildEvent>
     174    <Deploy>
     175      <DeploymentType>CopyToHardDrive</DeploymentType>
     176    </Deploy>
    181177  </ItemDefinitionGroup>
    182178  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  • trunk/win32/editor.vcxproj

    r1178 r1189  
    2828    <ClCompile Include="..\deushax\mapviewer.cpp" />
    2929  </ItemGroup>
     30  <ItemGroup>
     31    <ProjectReference Include="lolcore.vcxproj">
     32      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     33    </ProjectReference>
     34  </ItemGroup>
    3035  <PropertyGroup Label="Globals">
    3136    <ProjectGuid>{9C66B179-0737-4BDA-AB42-2ADE478A9008}</ProjectGuid>
    3237    <Keyword>Win32Proj</Keyword>
    33     <RootNamespace>testmap</RootNamespace>
    3438  </PropertyGroup>
    3539  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    … …  
    3741    <ConfigurationType>Application</ConfigurationType>
    3842    <UseDebugLibraries>true</UseDebugLibraries>
    39     <CharacterSet>Unicode</CharacterSet>
     43    <CharacterSet>MultiByte</CharacterSet>
    4044    <UseOfMfc>Dynamic</UseOfMfc>
    4145  </PropertyGroup>
    … …  
    4347    <ConfigurationType>Application</ConfigurationType>
    4448    <UseDebugLibraries>true</UseDebugLibraries>
    45     <CharacterSet>Unicode</CharacterSet>
     49    <CharacterSet>MultiByte</CharacterSet>
    4650    <UseOfMfc>Dynamic</UseOfMfc>
    4751  </PropertyGroup>
    … …  
    5054    <UseDebugLibraries>false</UseDebugLibraries>
    5155    <WholeProgramOptimization>true</WholeProgramOptimization>
    52     <CharacterSet>Unicode</CharacterSet>
     56    <CharacterSet>MultiByte</CharacterSet>
    5357    <UseOfMfc>Dynamic</UseOfMfc>
    5458  </PropertyGroup>
    … …  
    5761    <UseDebugLibraries>false</UseDebugLibraries>
    5862    <WholeProgramOptimization>true</WholeProgramOptimization>
    59     <CharacterSet>Unicode</CharacterSet>
     63    <CharacterSet>MultiByte</CharacterSet>
    6064    <UseOfMfc>Dynamic</UseOfMfc>
    6165  </PropertyGroup>
    … …  
    8084  </ImportGroup>
    8185  <PropertyGroup Label="UserMacros" />
    82   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    83     <IntDir>Debug\$(ProjectName)\</IntDir>
     86  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
    8487    <LinkIncremental>true</LinkIncremental>
    8588  </PropertyGroup>
    86   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
    87     <IntDir>Debug\$(ProjectName)\</IntDir>
    88     <LinkIncremental>true</LinkIncremental>
    89   </PropertyGroup>
    90   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    91     <IntDir>Release\$(ProjectName)\</IntDir>
     89  <PropertyGroup Condition="'$(Configuration)'=='Release'">
    9290    <LinkIncremental>false</LinkIncremental>
    9391  </PropertyGroup>
    94   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
    95     <IntDir>Release\$(ProjectName)\</IntDir>
    96     <LinkIncremental>false</LinkIncremental>
     92  <PropertyGroup>
     93    <OutDir>$(Platform) $(Configuration)\</OutDir>
     94    <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir>
    9795  </PropertyGroup>
    9896  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    … …  
    106104    </ClCompile>
    107105    <Link>
    108       <SubSystem>Console</SubSystem>
    109106      <GenerateDebugInformation>true</GenerateDebugInformation>
    110       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GtkDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
     107      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GtkDeps);$(GlDeps)</AdditionalDependencies>
    111108      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    112109    </Link>
    113110    <PostBuildEvent>
    114       <Command>for %%I in ($(GtkLibs) $(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
     111      <Command>for %%I in ($(GtkLibs) $(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command>
    115112    </PostBuildEvent>
    116113  </ItemDefinitionGroup>
    … …  
    121118      <WarningLevel>Level3</WarningLevel>
    122119      <Optimization>Disabled</Optimization>
     120      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    123121      <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    124       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GlIncludes);$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     122      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    125123    </ClCompile>
    126124    <Link>
    127       <SubSystem>Console</SubSystem>
    128125      <GenerateDebugInformation>true</GenerateDebugInformation>
    129       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GtkDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    130       <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     126      <AdditionalDependencies>xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     127      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    131128    </Link>
    132     <PostBuildEvent>
    133       <Command>for %%I in ($(GtkLibs) $(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
    134     </PostBuildEvent>
     129    <Deploy>
     130      <DeploymentType>CopyToHardDrive</DeploymentType>
     131    </Deploy>
    135132  </ItemDefinitionGroup>
    136133  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    … …  
    146143    </ClCompile>
    147144    <Link>
    148       <SubSystem>Console</SubSystem>
    149145      <GenerateDebugInformation>true</GenerateDebugInformation>
    150146      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    151147      <OptimizeReferences>true</OptimizeReferences>
    152       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GtkDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
     148      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GtkDeps);$(GlDeps)</AdditionalDependencies>
    153149      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    154150    </Link>
    155151    <PostBuildEvent>
    156       <Command>for %%I in ($(GtkLibs) $(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
     152      <Command>for %%I in ($(GtkLibs) $(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command>
    157153    </PostBuildEvent>
    158154  </ItemDefinitionGroup>
    … …  
    163159      </PrecompiledHeader>
    164160      <Optimization>MaxSpeed</Optimization>
     161      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    165162      <FunctionLevelLinking>true</FunctionLevelLinking>
    166163      <IntrinsicFunctions>true</IntrinsicFunctions>
    167164      <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    168       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GlIncludes);$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     165      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    169166    </ClCompile>
    170167    <Link>
    171       <SubSystem>Console</SubSystem>
    172168      <GenerateDebugInformation>true</GenerateDebugInformation>
    173169      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    174170      <OptimizeReferences>true</OptimizeReferences>
    175       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GtkDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    176       <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     171      <AdditionalDependencies>xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     172      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    177173    </Link>
    178     <PostBuildEvent>
    179       <Command>for %%I in ($(GtkLibs) $(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
    180     </PostBuildEvent>
     174    <Deploy>
     175      <DeploymentType>CopyToHardDrive</DeploymentType>
     176    </Deploy>
    181177  </ItemDefinitionGroup>
    182178  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  • trunk/win32/lolcore.vcxproj

    r1180 r1189  
    2222    <ProjectGuid>{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}</ProjectGuid>
    2323    <Keyword>Win32Proj</Keyword>
    24     <RootNamespace>lolcore</RootNamespace>
    2524  </PropertyGroup>
    2625  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    … …  
    2827    <ConfigurationType>StaticLibrary</ConfigurationType>
    2928    <UseDebugLibraries>true</UseDebugLibraries>
    30     <CharacterSet>Unicode</CharacterSet>
     29    <CharacterSet>MultiByte</CharacterSet>
    3130  </PropertyGroup>
    3231  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration">
    3332    <ConfigurationType>StaticLibrary</ConfigurationType>
    34     <UseDebugLibraries>true</UseDebugLibraries>
    35     <CharacterSet>Unicode</CharacterSet>
     33    <CharacterSet>MultiByte</CharacterSet>
    3634  </PropertyGroup>
    3735  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    … …  
    3937    <UseDebugLibraries>false</UseDebugLibraries>
    4038    <WholeProgramOptimization>true</WholeProgramOptimization>
    41     <CharacterSet>Unicode</CharacterSet>
     39    <CharacterSet>MultiByte</CharacterSet>
    4240  </PropertyGroup>
    4341  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration">
    4442    <ConfigurationType>StaticLibrary</ConfigurationType>
    45     <UseDebugLibraries>false</UseDebugLibraries>
    4643    <WholeProgramOptimization>true</WholeProgramOptimization>
    47     <CharacterSet>Unicode</CharacterSet>
     44    <CharacterSet>MultiByte</CharacterSet>
    4845  </PropertyGroup>
    4946  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    … …  
    6764  </ImportGroup>
    6865  <PropertyGroup Label="UserMacros" />
    69   <PropertyGroup />
     66  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     67    <LinkIncremental>true</LinkIncremental>
     68  </PropertyGroup>
     69  <PropertyGroup Condition="'$(Configuration)'=='Release'">
     70    <LinkIncremental>false</LinkIncremental>
     71  </PropertyGroup>
     72  <PropertyGroup>
     73    <OutDir>$(Platform) $(Configuration)\</OutDir>
     74    <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir>
     75  </PropertyGroup>
    7076  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    7177    <ClCompile>
    … …  
    7985    </ClCompile>
    8086    <Link>
    81       <SubSystem>Windows</SubSystem>
    8287      <GenerateDebugInformation>true</GenerateDebugInformation>
    8388    </Link>
    … …  
    8994      <WarningLevel>Level3</WarningLevel>
    9095      <Optimization>Disabled</Optimization>
     96      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    9197      <PreprocessorDefinitions>_XBOX;_DEBUG;_LIB;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    92       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    93       <FloatingPointModel>Fast</FloatingPointModel>
    94     </ClCompile>
    95     <Link>
    96       <SubSystem>Windows</SubSystem>
     98      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     99      <FloatingPointModel>Fast</FloatingPointModel>
     100    </ClCompile>
     101    <Link>
    97102      <GenerateDebugInformation>true</GenerateDebugInformation>
    98103    </Link>
    … …  
    112117    </ClCompile>
    113118    <Link>
    114       <SubSystem>Windows</SubSystem>
    115119      <GenerateDebugInformation>true</GenerateDebugInformation>
    116120      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    … …  
    125129      <Optimization>MaxSpeed</Optimization>
    126130      <FunctionLevelLinking>true</FunctionLevelLinking>
     131      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    127132      <IntrinsicFunctions>true</IntrinsicFunctions>
    128133      <PreprocessorDefinitions>_XBOX;NDEBUG;_LIB;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    129       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     134      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    130135      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
    131136      <FloatingPointModel>Fast</FloatingPointModel>
    132137    </ClCompile>
    133138    <Link>
    134       <SubSystem>Windows</SubSystem>
    135139      <GenerateDebugInformation>true</GenerateDebugInformation>
    136140      <EnableCOMDATFolding>true</EnableCOMDATFolding>

  • trunk/win32/lolengine.sln

    r1187 r1189  
    6363                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
    6464        EndProjectSection
     65EndProject
     66Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Games", "Games", "{1DFE1729-4F1B-47CA-9819-72431FE14E25}"
    6567EndProject
    6668Global
    … …  
    197199                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
    198200                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515} = {33704AA4-F2B5-4138-A40D-E3E77F89ED46}
     201                {08C6A854-533D-4A1E-924E-C4A62281869F} = {1DFE1729-4F1B-47CA-9819-72431FE14E25}
     202                {2F87CEAB-4818-443C-A5E3-6C34E7D967EC} = {1DFE1729-4F1B-47CA-9819-72431FE14E25}
     203                {33704AA4-F2B5-4138-A40D-E3E77F89ED46} = {1DFE1729-4F1B-47CA-9819-72431FE14E25}
    199204        EndGlobalSection
    200205EndGlobal

  • trunk/win32/monsterz.vcxproj

    r1178 r1189  
    3939    <ClCompile Include="..\monsterz\title.cpp" />
    4040  </ItemGroup>
     41  <ItemGroup>
     42    <ProjectReference Include="lolcore.vcxproj">
     43      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     44    </ProjectReference>
     45  </ItemGroup>
    4146  <PropertyGroup Label="Globals">
    4247    <ProjectGuid>{17f0f184-4436-4d08-b8aa-16572ea238db}</ProjectGuid>
    4348    <Keyword>Win32Proj</Keyword>
    44     <RootNamespace>testmap</RootNamespace>
    4549  </PropertyGroup>
    4650  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    … …  
    4852    <ConfigurationType>Application</ConfigurationType>
    4953    <UseDebugLibraries>true</UseDebugLibraries>
    50     <CharacterSet>Unicode</CharacterSet>
     54    <CharacterSet>MultiByte</CharacterSet>
    5155    <UseOfMfc>Dynamic</UseOfMfc>
    5256  </PropertyGroup>
    … …  
    5458    <ConfigurationType>Application</ConfigurationType>
    5559    <UseDebugLibraries>true</UseDebugLibraries>
    56     <CharacterSet>Unicode</CharacterSet>
     60    <CharacterSet>MultiByte</CharacterSet>
    5761    <UseOfMfc>Dynamic</UseOfMfc>
    5862  </PropertyGroup>
    … …  
    6165    <UseDebugLibraries>false</UseDebugLibraries>
    6266    <WholeProgramOptimization>true</WholeProgramOptimization>
    63     <CharacterSet>Unicode</CharacterSet>
     67    <CharacterSet>MultiByte</CharacterSet>
    6468    <UseOfMfc>Dynamic</UseOfMfc>
    6569  </PropertyGroup>
    … …  
    6872    <UseDebugLibraries>false</UseDebugLibraries>
    6973    <WholeProgramOptimization>true</WholeProgramOptimization>
    70     <CharacterSet>Unicode</CharacterSet>
     74    <CharacterSet>MultiByte</CharacterSet>
    7175    <UseOfMfc>Dynamic</UseOfMfc>
    7276  </PropertyGroup>
    … …  
    9195  </ImportGroup>
    9296  <PropertyGroup Label="UserMacros" />
    93   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    94     <IntDir>Debug\$(ProjectName)\</IntDir>
     97  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
    9598    <LinkIncremental>true</LinkIncremental>
    9699  </PropertyGroup>
    97   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
    98     <IntDir>Debug\$(ProjectName)\</IntDir>
    99     <LinkIncremental>true</LinkIncremental>
    100   </PropertyGroup>
    101   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    102     <IntDir>Release\$(ProjectName)\</IntDir>
     100  <PropertyGroup Condition="'$(Configuration)'=='Release'">
    103101    <LinkIncremental>false</LinkIncremental>
    104102  </PropertyGroup>
    105   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
    106     <IntDir>Release\$(ProjectName)\</IntDir>
    107     <LinkIncremental>false</LinkIncremental>
     103  <PropertyGroup>
     104    <OutDir>$(Platform) $(Configuration)\</OutDir>
     105    <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir>
    108106  </PropertyGroup>
    109107  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    … …  
    117115    </ClCompile>
    118116    <Link>
    119       <SubSystem>Console</SubSystem>
    120117      <GenerateDebugInformation>true</GenerateDebugInformation>
    121       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
     118      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps)</AdditionalDependencies>
    122119      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    123120    </Link>
    124121    <PostBuildEvent>
    125       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
     122      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command>
    126123    </PostBuildEvent>
    127124  </ItemDefinitionGroup>
    … …  
    132129      <WarningLevel>Level3</WarningLevel>
    133130      <Optimization>Disabled</Optimization>
     131      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    134132      <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    135       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     133      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    136134    </ClCompile>
    137135    <Link>
    138       <SubSystem>Console</SubSystem>
    139136      <GenerateDebugInformation>true</GenerateDebugInformation>
    140       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    141       <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     137      <AdditionalDependencies>xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     138      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    142139    </Link>
    143     <PostBuildEvent>
    144       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
    145     </PostBuildEvent>
     140    <Deploy>
     141      <DeploymentType>CopyToHardDrive</DeploymentType>
     142    </Deploy>
    146143  </ItemDefinitionGroup>
    147144  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    … …  
    157154    </ClCompile>
    158155    <Link>
    159       <SubSystem>Console</SubSystem>
    160156      <GenerateDebugInformation>true</GenerateDebugInformation>
    161157      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    162158      <OptimizeReferences>true</OptimizeReferences>
    163       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
     159      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps)</AdditionalDependencies>
    164160      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    165161    </Link>
    166162    <PostBuildEvent>
    167       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
     163      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command>
    168164    </PostBuildEvent>
    169165  </ItemDefinitionGroup>
    … …  
    174170      </PrecompiledHeader>
    175171      <Optimization>MaxSpeed</Optimization>
     172      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    176173      <FunctionLevelLinking>true</FunctionLevelLinking>
    177174      <IntrinsicFunctions>true</IntrinsicFunctions>
    178175      <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    179       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     176      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    180177    </ClCompile>
    181178    <Link>
    182       <SubSystem>Console</SubSystem>
    183179      <GenerateDebugInformation>true</GenerateDebugInformation>
    184180      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    185181      <OptimizeReferences>true</OptimizeReferences>
    186       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    187       <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     182      <AdditionalDependencies>xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     183      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    188184    </Link>
    189     <PostBuildEvent>
    190       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
    191     </PostBuildEvent>
     185    <Deploy>
     186      <DeploymentType>CopyToHardDrive</DeploymentType>
     187    </Deploy>
    192188  </ItemDefinitionGroup>
    193189  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  • trunk/win32/mrpigeon.vcxproj

    r1187 r1189  
    2525    <ClCompile Include="..\mrpigeon\mrpigeon.cpp" />
    2626  </ItemGroup>
     27  <ItemGroup>
     28    <ProjectReference Include="lolcore.vcxproj">
     29      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     30    </ProjectReference>
     31  </ItemGroup>
    2732  <PropertyGroup Label="Globals">
    2833    <ProjectGuid>{32f3f8cf-d22e-45e4-beb8-ad909e8c5515}</ProjectGuid>
    2934    <Keyword>Win32Proj</Keyword>
    30     <RootNamespace>testmap</RootNamespace>
    3135  </PropertyGroup>
    3236  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    … …  
    3438    <ConfigurationType>Application</ConfigurationType>
    3539    <UseDebugLibraries>true</UseDebugLibraries>
    36     <CharacterSet>Unicode</CharacterSet>
     40    <CharacterSet>MultiByte</CharacterSet>
    3741    <UseOfMfc>Dynamic</UseOfMfc>
    3842  </PropertyGroup>
    … …  
    4044    <ConfigurationType>Application</ConfigurationType>
    4145    <UseDebugLibraries>true</UseDebugLibraries>
    42     <CharacterSet>Unicode</CharacterSet>
     46    <CharacterSet>MultiByte</CharacterSet>
    4347    <UseOfMfc>Dynamic</UseOfMfc>
    4448  </PropertyGroup>
    … …  
    4751    <UseDebugLibraries>false</UseDebugLibraries>
    4852    <WholeProgramOptimization>true</WholeProgramOptimization>
    49     <CharacterSet>Unicode</CharacterSet>
     53    <CharacterSet>MultiByte</CharacterSet>
    5054    <UseOfMfc>Dynamic</UseOfMfc>
    5155  </PropertyGroup>
    … …  
    5458    <UseDebugLibraries>false</UseDebugLibraries>
    5559    <WholeProgramOptimization>true</WholeProgramOptimization>
    56     <CharacterSet>Unicode</CharacterSet>
     60    <CharacterSet>MultiByte</CharacterSet>
    5761    <UseOfMfc>Dynamic</UseOfMfc>
    5862  </PropertyGroup>
    … …  
    7781  </ImportGroup>
    7882  <PropertyGroup Label="UserMacros" />
    79   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    80     <IntDir>Debug\$(ProjectName)\</IntDir>
     83  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
    8184    <LinkIncremental>true</LinkIncremental>
    8285  </PropertyGroup>
    83   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
    84     <IntDir>Debug\$(ProjectName)\</IntDir>
    85     <LinkIncremental>true</LinkIncremental>
    86   </PropertyGroup>
    87   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    88     <IntDir>Release\$(ProjectName)\</IntDir>
     86  <PropertyGroup Condition="'$(Configuration)'=='Release'">
    8987    <LinkIncremental>false</LinkIncremental>
    9088  </PropertyGroup>
    91   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
    92     <IntDir>Release\$(ProjectName)\</IntDir>
    93     <LinkIncremental>false</LinkIncremental>
     89  <PropertyGroup>
     90    <OutDir>$(Platform) $(Configuration)\</OutDir>
     91    <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir>
    9492  </PropertyGroup>
    9593  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    … …  
    103101    </ClCompile>
    104102    <Link>
    105       <SubSystem>Console</SubSystem>
    106103      <GenerateDebugInformation>true</GenerateDebugInformation>
    107       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
     104      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps)</AdditionalDependencies>
    108105      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    109106    </Link>
    110107    <PostBuildEvent>
    111       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
     108      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command>
    112109    </PostBuildEvent>
    113110  </ItemDefinitionGroup>
    … …  
    118115      <WarningLevel>Level3</WarningLevel>
    119116      <Optimization>Disabled</Optimization>
     117      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    120118      <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    121       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     119      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    122120    </ClCompile>
    123121    <Link>
    124       <SubSystem>Console</SubSystem>
    125122      <GenerateDebugInformation>true</GenerateDebugInformation>
    126       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    127       <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     123      <AdditionalDependencies>xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     124      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    128125    </Link>
    129     <PostBuildEvent>
    130       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
    131     </PostBuildEvent>
     126    <Deploy>
     127      <DeploymentType>CopyToHardDrive</DeploymentType>
     128    </Deploy>
    132129  </ItemDefinitionGroup>
    133130  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    … …  
    143140    </ClCompile>
    144141    <Link>
    145       <SubSystem>Console</SubSystem>
    146142      <GenerateDebugInformation>true</GenerateDebugInformation>
    147143      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    148144      <OptimizeReferences>true</OptimizeReferences>
    149       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
     145      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps)</AdditionalDependencies>
    150146      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    151147    </Link>
    152148    <PostBuildEvent>
    153       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
     149      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command>
    154150    </PostBuildEvent>
    155151  </ItemDefinitionGroup>
    … …  
    160156      </PrecompiledHeader>
    161157      <Optimization>MaxSpeed</Optimization>
     158      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    162159      <FunctionLevelLinking>true</FunctionLevelLinking>
    163160      <IntrinsicFunctions>true</IntrinsicFunctions>
    164161      <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    165       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     162      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    166163    </ClCompile>
    167164    <Link>
    168       <SubSystem>Console</SubSystem>
    169165      <GenerateDebugInformation>true</GenerateDebugInformation>
    170166      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    171167      <OptimizeReferences>true</OptimizeReferences>
    172       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    173       <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     168      <AdditionalDependencies>xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     169      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    174170    </Link>
    175     <PostBuildEvent>
    176       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
    177     </PostBuildEvent>
     171    <Deploy>
     172      <DeploymentType>CopyToHardDrive</DeploymentType>
     173    </Deploy>
    178174  </ItemDefinitionGroup>
    179175  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  • trunk/win32/quad.vcxproj

    r1178 r1189  
    2222    <ClCompile Include="..\test\debug\quad.cpp" />
    2323  </ItemGroup>
     24  <ItemGroup>
     25    <ProjectReference Include="lolcore.vcxproj">
     26      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     27    </ProjectReference>
     28  </ItemGroup>
    2429  <PropertyGroup Label="Globals">
    2530    <ProjectGuid>{53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}</ProjectGuid>
    2631    <Keyword>Win32Proj</Keyword>
    27     <RootNamespace>testmap</RootNamespace>
    2832  </PropertyGroup>
    2933  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    … …  
    3135    <ConfigurationType>Application</ConfigurationType>
    3236    <UseDebugLibraries>true</UseDebugLibraries>
    33     <CharacterSet>Unicode</CharacterSet>
     37    <CharacterSet>MultiByte</CharacterSet>
    3438    <UseOfMfc>Dynamic</UseOfMfc>
    3539  </PropertyGroup>
    … …  
    3741    <ConfigurationType>Application</ConfigurationType>
    3842    <UseDebugLibraries>true</UseDebugLibraries>
    39     <CharacterSet>Unicode</CharacterSet>
     43    <CharacterSet>MultiByte</CharacterSet>
    4044    <UseOfMfc>Dynamic</UseOfMfc>
    4145  </PropertyGroup>
    … …  
    4448    <UseDebugLibraries>false</UseDebugLibraries>
    4549    <WholeProgramOptimization>true</WholeProgramOptimization>
    46     <CharacterSet>Unicode</CharacterSet>
     50    <CharacterSet>MultiByte</CharacterSet>
    4751    <UseOfMfc>Dynamic</UseOfMfc>
    4852  </PropertyGroup>
    … …  
    5155    <UseDebugLibraries>false</UseDebugLibraries>
    5256    <WholeProgramOptimization>true</WholeProgramOptimization>
    53     <CharacterSet>Unicode</CharacterSet>
     57    <CharacterSet>MultiByte</CharacterSet>
    5458    <UseOfMfc>Dynamic</UseOfMfc>
    5559  </PropertyGroup>
    … …  
    7478  </ImportGroup>
    7579  <PropertyGroup Label="UserMacros" />
    76   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    77     <IntDir>Debug\$(ProjectName)\</IntDir>
     80  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
    7881    <LinkIncremental>true</LinkIncremental>
    7982  </PropertyGroup>
    80   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
    81     <IntDir>Debug\$(ProjectName)\</IntDir>
    82     <LinkIncremental>true</LinkIncremental>
    83   </PropertyGroup>
    84   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    85     <IntDir>Release\$(ProjectName)\</IntDir>
     83  <PropertyGroup Condition="'$(Configuration)'=='Release'">
    8684    <LinkIncremental>false</LinkIncremental>
    8785  </PropertyGroup>
    88   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
    89     <IntDir>Release\$(ProjectName)\</IntDir>
    90     <LinkIncremental>false</LinkIncremental>
     86  <PropertyGroup>
     87    <OutDir>$(Platform) $(Configuration)\</OutDir>
     88    <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir>
    9189  </PropertyGroup>
    9290  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    … …  
    10098    </ClCompile>
    10199    <Link>
    102       <SubSystem>Console</SubSystem>
    103100      <GenerateDebugInformation>true</GenerateDebugInformation>
    104       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
     101      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps)</AdditionalDependencies>
    105102      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    106103    </Link>
    107104    <PostBuildEvent>
    108       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
     105      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command>
    109106    </PostBuildEvent>
    110107  </ItemDefinitionGroup>
    … …  
    115112      <WarningLevel>Level3</WarningLevel>
    116113      <Optimization>Disabled</Optimization>
     114      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    117115      <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    118       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     116      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    119117    </ClCompile>
    120118    <Link>
    121       <SubSystem>Console</SubSystem>
    122119      <GenerateDebugInformation>true</GenerateDebugInformation>
    123       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    124       <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     120      <AdditionalDependencies>xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     121      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    125122    </Link>
    126     <PostBuildEvent>
    127       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
    128     </PostBuildEvent>
     123    <Deploy>
     124      <DeploymentType>CopyToHardDrive</DeploymentType>
     125    </Deploy>
    129126  </ItemDefinitionGroup>
    130127  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    … …  
    140137    </ClCompile>
    141138    <Link>
    142       <SubSystem>Console</SubSystem>
    143139      <GenerateDebugInformation>true</GenerateDebugInformation>
    144140      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    145141      <OptimizeReferences>true</OptimizeReferences>
    146       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
     142      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps)</AdditionalDependencies>
    147143      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    148144    </Link>
    149145    <PostBuildEvent>
    150       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
     146      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command>
    151147    </PostBuildEvent>
    152148  </ItemDefinitionGroup>
    … …  
    157153      </PrecompiledHeader>
    158154      <Optimization>MaxSpeed</Optimization>
     155      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    159156      <FunctionLevelLinking>true</FunctionLevelLinking>
    160157      <IntrinsicFunctions>true</IntrinsicFunctions>
    161158      <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    162       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     159      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    163160    </ClCompile>
    164161    <Link>
    165       <SubSystem>Console</SubSystem>
    166162      <GenerateDebugInformation>true</GenerateDebugInformation>
    167163      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    168164      <OptimizeReferences>true</OptimizeReferences>
    169       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    170       <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     165      <AdditionalDependencies>xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     166      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    171167    </Link>
    172     <PostBuildEvent>
    173       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
    174     </PostBuildEvent>
     168    <Deploy>
     169      <DeploymentType>CopyToHardDrive</DeploymentType>
     170    </Deploy>
    175171  </ItemDefinitionGroup>
    176172  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  • trunk/win32/testsuite.vcxproj

    r1178 r1189  
    3030    <ClCompile Include="..\test\unit\vector.cpp" />
    3131  </ItemGroup>
     32  <ItemGroup>
     33    <ProjectReference Include="lolcore.vcxproj">
     34      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     35    </ProjectReference>
     36  </ItemGroup>
    3237  <PropertyGroup Label="Globals">
    3338    <ProjectGuid>{80F81C11-8DA2-4990-91CB-9807783BA46E}</ProjectGuid>
    3439    <Keyword>Win32Proj</Keyword>
    35     <RootNamespace>testmap</RootNamespace>
    3640  </PropertyGroup>
    3741  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    … …  
    3943    <ConfigurationType>Application</ConfigurationType>
    4044    <UseDebugLibraries>true</UseDebugLibraries>
    41     <CharacterSet>Unicode</CharacterSet>
     45    <CharacterSet>MultiByte</CharacterSet>
    4246    <UseOfMfc>Dynamic</UseOfMfc>
    4347  </PropertyGroup>
    … …  
    4549    <ConfigurationType>Application</ConfigurationType>
    4650    <UseDebugLibraries>true</UseDebugLibraries>
    47     <CharacterSet>Unicode</CharacterSet>
     51    <CharacterSet>MultiByte</CharacterSet>
    4852    <UseOfMfc>Dynamic</UseOfMfc>
    4953  </PropertyGroup>
    … …  
    5256    <UseDebugLibraries>false</UseDebugLibraries>
    5357    <WholeProgramOptimization>true</WholeProgramOptimization>
    54     <CharacterSet>Unicode</CharacterSet>
     58    <CharacterSet>MultiByte</CharacterSet>
    5559    <UseOfMfc>Dynamic</UseOfMfc>
    5660  </PropertyGroup>
    … …  
    5963    <UseDebugLibraries>false</UseDebugLibraries>
    6064    <WholeProgramOptimization>true</WholeProgramOptimization>
    61     <CharacterSet>Unicode</CharacterSet>
     65    <CharacterSet>MultiByte</CharacterSet>
    6266    <UseOfMfc>Dynamic</UseOfMfc>
    6367  </PropertyGroup>
    … …  
    8286  </ImportGroup>
    8387  <PropertyGroup Label="UserMacros" />
    84   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    85     <IntDir>Debug\$(ProjectName)\</IntDir>
     88  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
    8689    <LinkIncremental>true</LinkIncremental>
    8790  </PropertyGroup>
    88   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
    89     <IntDir>Debug\$(ProjectName)\</IntDir>
    90     <LinkIncremental>true</LinkIncremental>
    91   </PropertyGroup>
    92   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    93     <IntDir>Release\$(ProjectName)\</IntDir>
     91  <PropertyGroup Condition="'$(Configuration)'=='Release'">
    9492    <LinkIncremental>false</LinkIncremental>
    9593  </PropertyGroup>
    96   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
    97     <IntDir>Release\$(ProjectName)\</IntDir>
    98     <LinkIncremental>false</LinkIncremental>
     94  <PropertyGroup>
     95    <OutDir>$(Platform) $(Configuration)\</OutDir>
     96    <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir>
    9997  </PropertyGroup>
    10098  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    … …  
    109107    </ClCompile>
    110108    <Link>
    111       <SubSystem>Console</SubSystem>
    112109      <GenerateDebugInformation>true</GenerateDebugInformation>
    113       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
     110      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps)</AdditionalDependencies>
    114111      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    115112    </Link>
    116113    <PostBuildEvent>
    117       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
     114      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command>
    118115    </PostBuildEvent>
    119116  </ItemDefinitionGroup>
    … …  
    124121      <WarningLevel>Level3</WarningLevel>
    125122      <Optimization>Disabled</Optimization>
     123      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    126124      <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    127       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     125      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    128126      <FloatingPointModel>Fast</FloatingPointModel>
    129127    </ClCompile>
    130128    <Link>
    131       <SubSystem>Console</SubSystem>
    132129      <GenerateDebugInformation>true</GenerateDebugInformation>
    133       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    134       <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     130      <AdditionalDependencies>xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     131      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    135132    </Link>
    136     <PostBuildEvent>
    137       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
    138     </PostBuildEvent>
     133    <Deploy>
     134      <DeploymentType>CopyToHardDrive</DeploymentType>
     135    </Deploy>
    139136  </ItemDefinitionGroup>
    140137  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    … …  
    151148    </ClCompile>
    152149    <Link>
    153       <SubSystem>Console</SubSystem>
    154150      <GenerateDebugInformation>true</GenerateDebugInformation>
    155151      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    156152      <OptimizeReferences>true</OptimizeReferences>
    157       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
     153      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps)</AdditionalDependencies>
    158154      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    159155    </Link>
    160156    <PostBuildEvent>
    161       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
     157      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command>
    162158    </PostBuildEvent>
    163159  </ItemDefinitionGroup>
    … …  
    168164      </PrecompiledHeader>
    169165      <Optimization>MaxSpeed</Optimization>
     166      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    170167      <FunctionLevelLinking>true</FunctionLevelLinking>
    171168      <IntrinsicFunctions>true</IntrinsicFunctions>
    172169      <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    173       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     170      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    174171      <FloatingPointModel>Fast</FloatingPointModel>
    175172    </ClCompile>
    176173    <Link>
    177       <SubSystem>Console</SubSystem>
    178174      <GenerateDebugInformation>true</GenerateDebugInformation>
    179175      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    180176      <OptimizeReferences>true</OptimizeReferences>
    181       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    182       <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     177      <AdditionalDependencies>xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     178      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    183179    </Link>
    184     <PostBuildEvent>
    185       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
    186     </PostBuildEvent>
     180    <Deploy>
     181      <DeploymentType>CopyToHardDrive</DeploymentType>
     182    </Deploy>
    187183  </ItemDefinitionGroup>
    188184  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  • trunk/win32/tut01.vcxproj

    r1178 r1189  
    2222    <ClCompile Include="..\test\tutorial\tut01.cpp" />
    2323  </ItemGroup>
     24  <ItemGroup>
     25    <ProjectReference Include="lolcore.vcxproj">
     26      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     27    </ProjectReference>
     28  </ItemGroup>
    2429  <PropertyGroup Label="Globals">
    2530    <ProjectGuid>{b92abadc-45be-4cc5-b724-9426053123a1}</ProjectGuid>
    2631    <Keyword>Win32Proj</Keyword>
    27     <RootNamespace>testmap</RootNamespace>
    2832  </PropertyGroup>
    2933  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    … …  
    3135    <ConfigurationType>Application</ConfigurationType>
    3236    <UseDebugLibraries>true</UseDebugLibraries>
    33     <CharacterSet>Unicode</CharacterSet>
     37    <CharacterSet>MultiByte</CharacterSet>
    3438    <UseOfMfc>Dynamic</UseOfMfc>
    3539  </PropertyGroup>
    … …  
    3741    <ConfigurationType>Application</ConfigurationType>
    3842    <UseDebugLibraries>true</UseDebugLibraries>
    39     <CharacterSet>Unicode</CharacterSet>
     43    <CharacterSet>MultiByte</CharacterSet>
    4044    <UseOfMfc>Dynamic</UseOfMfc>
    4145  </PropertyGroup>
    … …  
    4448    <UseDebugLibraries>false</UseDebugLibraries>
    4549    <WholeProgramOptimization>true</WholeProgramOptimization>
    46     <CharacterSet>Unicode</CharacterSet>
     50    <CharacterSet>MultiByte</CharacterSet>
    4751    <UseOfMfc>Dynamic</UseOfMfc>
    4852  </PropertyGroup>
    … …  
    5155    <UseDebugLibraries>false</UseDebugLibraries>
    5256    <WholeProgramOptimization>true</WholeProgramOptimization>
    53     <CharacterSet>Unicode</CharacterSet>
     57    <CharacterSet>MultiByte</CharacterSet>
    5458    <UseOfMfc>Dynamic</UseOfMfc>
    5559  </PropertyGroup>
    … …  
    7478  </ImportGroup>
    7579  <PropertyGroup Label="UserMacros" />
    76   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    77     <IntDir>Debug\$(ProjectName)\</IntDir>
     80  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
    7881    <LinkIncremental>true</LinkIncremental>
    7982  </PropertyGroup>
    80   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
    81     <IntDir>Debug\$(ProjectName)\</IntDir>
    82     <LinkIncremental>true</LinkIncremental>
    83   </PropertyGroup>
    84   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    85     <IntDir>Release\$(ProjectName)\</IntDir>
     83  <PropertyGroup Condition="'$(Configuration)'=='Release'">
    8684    <LinkIncremental>false</LinkIncremental>
    8785  </PropertyGroup>
    88   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
    89     <IntDir>Release\$(ProjectName)\</IntDir>
    90     <LinkIncremental>false</LinkIncremental>
     86  <PropertyGroup>
     87    <OutDir>$(Platform) $(Configuration)\</OutDir>
     88    <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir>
    9189  </PropertyGroup>
    9290  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    … …  
    10098    </ClCompile>
    10199    <Link>
    102       <SubSystem>Console</SubSystem>
    103100      <GenerateDebugInformation>true</GenerateDebugInformation>
    104       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
     101      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps)</AdditionalDependencies>
    105102      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    106103    </Link>
    107104    <PostBuildEvent>
    108       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
     105      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command>
    109106    </PostBuildEvent>
    110107  </ItemDefinitionGroup>
    … …  
    115112      <WarningLevel>Level3</WarningLevel>
    116113      <Optimization>Disabled</Optimization>
     114      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    117115      <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    118       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     116      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     117      <BufferSecurityCheck>false</BufferSecurityCheck>
    119118    </ClCompile>
    120119    <Link>
    121       <SubSystem>Console</SubSystem>
    122120      <GenerateDebugInformation>true</GenerateDebugInformation>
    123       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    124       <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     121      <AdditionalDependencies>xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     122      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    125123    </Link>
    126     <PostBuildEvent>
    127       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
    128     </PostBuildEvent>
     124    <Deploy>
     125      <DeploymentType>CopyToHardDrive</DeploymentType>
     126    </Deploy>
    129127  </ItemDefinitionGroup>
    130128  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    … …  
    140138    </ClCompile>
    141139    <Link>
    142       <SubSystem>Console</SubSystem>
    143140      <GenerateDebugInformation>true</GenerateDebugInformation>
    144141      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    145142      <OptimizeReferences>true</OptimizeReferences>
    146       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
     143      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps)</AdditionalDependencies>
    147144      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    148145    </Link>
    149146    <PostBuildEvent>
    150       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
     147      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command>
    151148    </PostBuildEvent>
    152149  </ItemDefinitionGroup>
    … …  
    157154      </PrecompiledHeader>
    158155      <Optimization>MaxSpeed</Optimization>
     156      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    159157      <FunctionLevelLinking>true</FunctionLevelLinking>
    160158      <IntrinsicFunctions>true</IntrinsicFunctions>
    161159      <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    162       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     160      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     161      <BufferSecurityCheck>false</BufferSecurityCheck>
    163162    </ClCompile>
    164163    <Link>
    165       <SubSystem>Console</SubSystem>
    166164      <GenerateDebugInformation>true</GenerateDebugInformation>
    167165      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    168166      <OptimizeReferences>true</OptimizeReferences>
    169       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    170       <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     167      <AdditionalDependencies>xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     168      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    171169    </Link>
    172     <PostBuildEvent>
    173       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
    174     </PostBuildEvent>
     170    <Deploy>
     171      <DeploymentType>CopyToHardDrive</DeploymentType>
     172    </Deploy>
    175173  </ItemDefinitionGroup>
    176174  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  • trunk/win32/tut02.vcxproj

    r1178 r1189  
    2222    <ClCompile Include="..\test\tutorial\tut02.cpp" />
    2323  </ItemGroup>
     24  <ItemGroup>
     25    <ProjectReference Include="lolcore.vcxproj">
     26      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     27    </ProjectReference>
     28  </ItemGroup>
    2429  <PropertyGroup Label="Globals">
    2530    <ProjectGuid>{7b083da2-fe08-4f6d-bfdd-195d5c2783eb}</ProjectGuid>
    2631    <Keyword>Win32Proj</Keyword>
    27     <RootNamespace>testmap</RootNamespace>
    2832  </PropertyGroup>
    2933  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    … …  
    3135    <ConfigurationType>Application</ConfigurationType>
    3236    <UseDebugLibraries>true</UseDebugLibraries>
    33     <CharacterSet>Unicode</CharacterSet>
     37    <CharacterSet>MultiByte</CharacterSet>
    3438    <UseOfMfc>Dynamic</UseOfMfc>
    3539  </PropertyGroup>
    … …  
    3741    <ConfigurationType>Application</ConfigurationType>
    3842    <UseDebugLibraries>true</UseDebugLibraries>
    39     <CharacterSet>Unicode</CharacterSet>
     43    <CharacterSet>MultiByte</CharacterSet>
    4044    <UseOfMfc>Dynamic</UseOfMfc>
    4145  </PropertyGroup>
    … …  
    4448    <UseDebugLibraries>false</UseDebugLibraries>
    4549    <WholeProgramOptimization>true</WholeProgramOptimization>
    46     <CharacterSet>Unicode</CharacterSet>
     50    <CharacterSet>MultiByte</CharacterSet>
    4751    <UseOfMfc>Dynamic</UseOfMfc>
    4852  </PropertyGroup>
    … …  
    5155    <UseDebugLibraries>false</UseDebugLibraries>
    5256    <WholeProgramOptimization>true</WholeProgramOptimization>
    53     <CharacterSet>Unicode</CharacterSet>
     57    <CharacterSet>MultiByte</CharacterSet>
    5458    <UseOfMfc>Dynamic</UseOfMfc>
    5559  </PropertyGroup>
    … …  
    7478  </ImportGroup>
    7579  <PropertyGroup Label="UserMacros" />
    76   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    77     <IntDir>Debug\$(ProjectName)\</IntDir>
     80  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
    7881    <LinkIncremental>true</LinkIncremental>
    7982  </PropertyGroup>
    80   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
    81     <IntDir>Debug\$(ProjectName)\</IntDir>
    82     <LinkIncremental>true</LinkIncremental>
    83   </PropertyGroup>
    84   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    85     <IntDir>Release\$(ProjectName)\</IntDir>
     83  <PropertyGroup Condition="'$(Configuration)'=='Release'">
    8684    <LinkIncremental>false</LinkIncremental>
    8785  </PropertyGroup>
    88   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
    89     <IntDir>Release\$(ProjectName)\</IntDir>
    90     <LinkIncremental>false</LinkIncremental>
     86  <PropertyGroup>
     87    <OutDir>$(Platform) $(Configuration)\</OutDir>
     88    <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir>
    9189  </PropertyGroup>
    9290  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    … …  
    10098    </ClCompile>
    10199    <Link>
    102       <SubSystem>Console</SubSystem>
    103100      <GenerateDebugInformation>true</GenerateDebugInformation>
    104       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
     101      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps)</AdditionalDependencies>
    105102      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    106103    </Link>
    107104    <PostBuildEvent>
    108       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
     105      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command>
    109106    </PostBuildEvent>
    110107  </ItemDefinitionGroup>
    … …  
    115112      <WarningLevel>Level3</WarningLevel>
    116113      <Optimization>Disabled</Optimization>
     114      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    117115      <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    118       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     116      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    119117    </ClCompile>
    120118    <Link>
    121       <SubSystem>Console</SubSystem>
    122119      <GenerateDebugInformation>true</GenerateDebugInformation>
    123       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    124       <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     120      <AdditionalDependencies>xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     121      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    125122    </Link>
    126     <PostBuildEvent>
    127       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
    128     </PostBuildEvent>
     123    <Deploy>
     124      <DeploymentType>CopyToHardDrive</DeploymentType>
     125    </Deploy>
    129126  </ItemDefinitionGroup>
    130127  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    … …  
    140137    </ClCompile>
    141138    <Link>
    142       <SubSystem>Console</SubSystem>
    143139      <GenerateDebugInformation>true</GenerateDebugInformation>
    144140      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    145141      <OptimizeReferences>true</OptimizeReferences>
    146       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
     142      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps)</AdditionalDependencies>
    147143      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    148144    </Link>
    149145    <PostBuildEvent>
    150       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
     146      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command>
    151147    </PostBuildEvent>
    152148  </ItemDefinitionGroup>
    … …  
    157153      </PrecompiledHeader>
    158154      <Optimization>MaxSpeed</Optimization>
     155      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    159156      <FunctionLevelLinking>true</FunctionLevelLinking>
    160157      <IntrinsicFunctions>true</IntrinsicFunctions>
    161158      <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    162       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     159      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    163160    </ClCompile>
    164161    <Link>
    165       <SubSystem>Console</SubSystem>
    166162      <GenerateDebugInformation>true</GenerateDebugInformation>
    167163      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    168164      <OptimizeReferences>true</OptimizeReferences>
    169       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    170       <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     165      <AdditionalDependencies>xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     166      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    171167    </Link>
    172     <PostBuildEvent>
    173       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
    174     </PostBuildEvent>
     168    <Deploy>
     169      <DeploymentType>CopyToHardDrive</DeploymentType>
     170    </Deploy>
    175171  </ItemDefinitionGroup>
    176172  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  • trunk/win32/tut03.vcxproj

    r1178 r1189  
    2222    <ClCompile Include="..\test\tutorial\tut03.cpp" />
    2323  </ItemGroup>
     24  <ItemGroup>
     25    <ProjectReference Include="lolcore.vcxproj">
     26      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     27    </ProjectReference>
     28  </ItemGroup>
    2429  <PropertyGroup Label="Globals">
    2530    <ProjectGuid>{6bf81b39-edc2-4227-9992-c2d8abea95af}</ProjectGuid>
    2631    <Keyword>Win32Proj</Keyword>
    27     <RootNamespace>testmap</RootNamespace>
    2832  </PropertyGroup>
    2933  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    … …  
    3135    <ConfigurationType>Application</ConfigurationType>
    3236    <UseDebugLibraries>true</UseDebugLibraries>
    33     <CharacterSet>Unicode</CharacterSet>
     37    <CharacterSet>MultiByte</CharacterSet>
    3438    <UseOfMfc>Dynamic</UseOfMfc>
    3539  </PropertyGroup>
    … …  
    3741    <ConfigurationType>Application</ConfigurationType>
    3842    <UseDebugLibraries>true</UseDebugLibraries>
    39     <CharacterSet>Unicode</CharacterSet>
     43    <CharacterSet>MultiByte</CharacterSet>
    4044    <UseOfMfc>Dynamic</UseOfMfc>
    4145  </PropertyGroup>
    … …  
    4448    <UseDebugLibraries>false</UseDebugLibraries>
    4549    <WholeProgramOptimization>true</WholeProgramOptimization>
    46     <CharacterSet>Unicode</CharacterSet>
     50    <CharacterSet>MultiByte</CharacterSet>
    4751    <UseOfMfc>Dynamic</UseOfMfc>
    4852  </PropertyGroup>
    … …  
    5155    <UseDebugLibraries>false</UseDebugLibraries>
    5256    <WholeProgramOptimization>true</WholeProgramOptimization>
    53     <CharacterSet>Unicode</CharacterSet>
     57    <CharacterSet>MultiByte</CharacterSet>
    5458    <UseOfMfc>Dynamic</UseOfMfc>
    5559  </PropertyGroup>
    … …  
    7478  </ImportGroup>
    7579  <PropertyGroup Label="UserMacros" />
    76   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    77     <IntDir>Debug\$(ProjectName)\</IntDir>
     80  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
    7881    <LinkIncremental>true</LinkIncremental>
    7982  </PropertyGroup>
    80   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
    81     <IntDir>Debug\$(ProjectName)\</IntDir>
    82     <LinkIncremental>true</LinkIncremental>
    83   </PropertyGroup>
    84   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    85     <IntDir>Release\$(ProjectName)\</IntDir>
     83  <PropertyGroup Condition="'$(Configuration)'=='Release'">
    8684    <LinkIncremental>false</LinkIncremental>
    8785  </PropertyGroup>
    88   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
    89     <IntDir>Release\$(ProjectName)\</IntDir>
    90     <LinkIncremental>false</LinkIncremental>
     86  <PropertyGroup>
     87    <OutDir>$(Platform) $(Configuration)\</OutDir>
     88    <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir>
    9189  </PropertyGroup>
    9290  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    … …  
    10098    </ClCompile>
    10199    <Link>
    102       <SubSystem>Console</SubSystem>
    103100      <GenerateDebugInformation>true</GenerateDebugInformation>
    104       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
     101      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps)</AdditionalDependencies>
    105102      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    106103    </Link>
    107104    <PostBuildEvent>
    108       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
     105      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command>
    109106    </PostBuildEvent>
    110107  </ItemDefinitionGroup>
    … …  
    115112      <WarningLevel>Level3</WarningLevel>
    116113      <Optimization>Disabled</Optimization>
     114      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    117115      <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    118       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     116      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    119117    </ClCompile>
    120118    <Link>
    121       <SubSystem>Console</SubSystem>
    122119      <GenerateDebugInformation>true</GenerateDebugInformation>
    123       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    124       <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     120      <AdditionalDependencies>xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     121      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    125122    </Link>
    126     <PostBuildEvent>
    127       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
    128     </PostBuildEvent>
     123    <Deploy>
     124      <DeploymentType>CopyToHardDrive</DeploymentType>
     125    </Deploy>
    129126  </ItemDefinitionGroup>
    130127  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    … …  
    140137    </ClCompile>
    141138    <Link>
    142       <SubSystem>Console</SubSystem>
    143139      <GenerateDebugInformation>true</GenerateDebugInformation>
    144140      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    145141      <OptimizeReferences>true</OptimizeReferences>
    146       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
     142      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps)</AdditionalDependencies>
    147143      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    148144    </Link>
    149145    <PostBuildEvent>
    150       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
     146      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command>
    151147    </PostBuildEvent>
    152148  </ItemDefinitionGroup>
    … …  
    157153      </PrecompiledHeader>
    158154      <Optimization>MaxSpeed</Optimization>
     155      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    159156      <FunctionLevelLinking>true</FunctionLevelLinking>
    160157      <IntrinsicFunctions>true</IntrinsicFunctions>
    161158      <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    162       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     159      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    163160    </ClCompile>
    164161    <Link>
    165       <SubSystem>Console</SubSystem>
    166162      <GenerateDebugInformation>true</GenerateDebugInformation>
    167163      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    168164      <OptimizeReferences>true</OptimizeReferences>
    169       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    170       <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     165      <AdditionalDependencies>xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     166      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    171167    </Link>
    172     <PostBuildEvent>
    173       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
    174     </PostBuildEvent>
     168    <Deploy>
     169      <DeploymentType>CopyToHardDrive</DeploymentType>
     170    </Deploy>
    175171  </ItemDefinitionGroup>
    176172  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Note: See TracChangeset for help on using the changeset viewer.