Browse Source
build: major refactoring of the Win32 and Xbox project files; we now
link properly on the Xbox.legacy
sam
18 changed files with 416 additions and 392 deletions
Unified View
Diff Options
-
+2 -2.gitignore
-
+5 -4src/gradient.cpp
-
+2 -0src/platform/xbox/xboxapp.cpp
-
+7 -0src/video.cpp
-
+5 -2test/benchmark/trig.cpp
-
+50 -10test/tutorial/tut01.cpp
-
+32 -36win32/benchsuite.vcxproj
-
+32 -36win32/deushax.vcxproj
-
+32 -36win32/editor.vcxproj
-
+18 -14win32/lolcore.vcxproj
-
+5 -0win32/lolengine.sln
-
+32 -36win32/monsterz.vcxproj
-
+32 -36win32/mrpigeon.vcxproj
-
+32 -36win32/quad.vcxproj
-
+32 -36win32/testsuite.vcxproj
-
+34 -36win32/tut01.vcxproj
-
+32 -36win32/tut02.vcxproj
-
+32 -36win32/tut03.vcxproj
+ 2
- 2
.gitignore
View File
| @@ -36,8 +36,8 @@ vgcore.* | |||||
| .*.swp | .*.swp | ||||
| *~ | *~ | ||||
| # Visual Studio cruft | # Visual Studio cruft | ||||
| win32/Debug | |||||
| win32/Release | |||||
| win32/*Debug | |||||
| win32/*Release | |||||
| win32/*.vcxproj.user | win32/*.vcxproj.user | ||||
| win32/*.sdf | win32/*.sdf | ||||
| win32/*.suo | win32/*.suo | ||||
+ 5
- 4
src/gradient.cpp
View File
| @@ -12,8 +12,6 @@ | |||||
| # include "config.h" | # include "config.h" | ||||
| #endif | #endif | ||||
| #if !defined _XBOX /* This file is meaningless on Xbox */ | |||||
| #include <cmath> | #include <cmath> | ||||
| #include "core.h" | #include "core.h" | ||||
| @@ -34,10 +32,13 @@ class GradientData | |||||
| private: | private: | ||||
| Shader *shader; | Shader *shader; | ||||
| #if !defined _XBOX /* This file is meaningless on Xbox */ | |||||
| GLuint bufs[2]; | GLuint bufs[2]; | ||||
| #if defined HAVE_GL_2X && !defined __APPLE__ | #if defined HAVE_GL_2X && !defined __APPLE__ | ||||
| GLuint vaos[1]; | GLuint vaos[1]; | ||||
| #endif | #endif | ||||
| #endif | |||||
| }; | }; | ||||
| /* | /* | ||||
| @@ -64,6 +65,7 @@ void Gradient::TickDraw(float deltams) | |||||
| { | { | ||||
| Entity::TickDraw(deltams); | Entity::TickDraw(deltams); | ||||
| #if !defined _XBOX /* This file is meaningless on Xbox */ | |||||
| if (!data->shader) | if (!data->shader) | ||||
| { | { | ||||
| #if !defined __CELLOS_LV2__ | #if !defined __CELLOS_LV2__ | ||||
| @@ -233,6 +235,7 @@ void Gradient::TickDraw(float deltams) | |||||
| glDisableClientState(GL_VERTEX_ARRAY); | glDisableClientState(GL_VERTEX_ARRAY); | ||||
| glDisableClientState(GL_COLOR_ARRAY); | glDisableClientState(GL_COLOR_ARRAY); | ||||
| #endif | #endif | ||||
| #endif | |||||
| } | } | ||||
| Gradient::~Gradient() | Gradient::~Gradient() | ||||
| @@ -242,5 +245,3 @@ Gradient::~Gradient() | |||||
| } | } | ||||
| } /* namespace lol */ | } /* namespace lol */ | ||||
| #endif /* !defined _XBOX */ | |||||
+ 2
- 0
src/platform/xbox/xboxapp.cpp
View File
| @@ -60,6 +60,8 @@ void XboxApp::Run() | |||||
| Ticker::TickDraw(); | Ticker::TickDraw(); | ||||
| #if defined _XBOX | #if defined _XBOX | ||||
| extern D3DDevice *g_d3ddevice; | |||||
| g_d3ddevice->Present(NULL, NULL, NULL, NULL); | |||||
| #endif | #endif | ||||
| } | } | ||||
| } | } | ||||
+ 7
- 0
src/video.cpp
View File
| @@ -30,6 +30,11 @@ | |||||
| using namespace std; | using namespace std; | ||||
| #if defined _XBOX | |||||
| /* FIXME: g_d3ddevice should never be exported */ | |||||
| D3DDevice *g_d3ddevice; | |||||
| #endif | |||||
| namespace lol | namespace lol | ||||
| { | { | ||||
| @@ -96,6 +101,8 @@ void Video::Setup(ivec2 size) | |||||
| Log::Error("cannot create D3D device\n"); | Log::Error("cannot create D3D device\n"); | ||||
| exit(EXIT_FAILURE); | exit(EXIT_FAILURE); | ||||
| } | } | ||||
| g_d3ddevice = VideoData::d3d_dev; | |||||
| #else | #else | ||||
| # if defined USE_GLEW && !defined __APPLE__ | # if defined USE_GLEW && !defined __APPLE__ | ||||
| /* Initialise GLEW if necessary */ | /* Initialise GLEW if necessary */ | ||||
+ 5
- 2
test/benchmark/trig.cpp
View File
| @@ -1,7 +1,7 @@ | |||||
| // | // | ||||
| // Lol Engine - Benchmark program | // Lol Engine - Benchmark program | ||||
| // | // | ||||
| // Copyright: (c) 2005-2011 Sam Hocevar <sam@hocevar.net> | |||||
| // Copyright: (c) 2005-2012 Sam Hocevar <sam@hocevar.net> | |||||
| // This program is free software; you can redistribute it and/or | // This program is free software; you can redistribute it and/or | ||||
| // modify it under the terms of the Do What The Fuck You Want To | // modify it under the terms of the Do What The Fuck You Want To | ||||
| // Public License, Version 2, as published by Sam Hocevar. See | // Public License, Version 2, as published by Sam Hocevar. See | ||||
| @@ -12,7 +12,10 @@ | |||||
| # include "config.h" | # include "config.h" | ||||
| #endif | #endif | ||||
| #ifdef WIN32 | |||||
| #if defined _XBOX | |||||
| # define _USE_MATH_DEFINES /* for M_PI */ | |||||
| # include <xtl.h> | |||||
| #elif defined _WIN32 | |||||
| # define _USE_MATH_DEFINES /* for M_PI */ | # define _USE_MATH_DEFINES /* for M_PI */ | ||||
| # define WIN32_LEAN_AND_MEAN | # define WIN32_LEAN_AND_MEAN | ||||
| # include <windows.h> | # include <windows.h> | ||||
+ 50
- 10
test/tutorial/tut01.cpp
View File
| @@ -1,7 +1,7 @@ | |||||
| // | // | ||||
| // Lol Engine - Triangle tutorial | // Lol Engine - Triangle tutorial | ||||
| // | // | ||||
| // Copyright: (c) 2011 Sam Hocevar <sam@hocevar.net> | |||||
| // Copyright: (c) 2012 Sam Hocevar <sam@hocevar.net> | |||||
| // This program is free software; you can redistribute it and/or | // This program is free software; you can redistribute it and/or | ||||
| // modify it under the terms of the Do What The Fuck You Want To | // modify it under the terms of the Do What The Fuck You Want To | ||||
| // Public License, Version 2, as published by Sam Hocevar. See | // Public License, Version 2, as published by Sam Hocevar. See | ||||
| @@ -49,6 +49,7 @@ public: | |||||
| if (!m_ready) | if (!m_ready) | ||||
| { | { | ||||
| m_shader = Shader::Create( | m_shader = Shader::Create( | ||||
| #if !defined __CELLOS_LV2__ && !defined _XBOX | |||||
| "#version 120\n" | "#version 120\n" | ||||
| "attribute vec2 coord2d;" | "attribute vec2 coord2d;" | ||||
| "void main(void) {" | "void main(void) {" | ||||
| @@ -60,18 +61,45 @@ public: | |||||
| " gl_FragColor[0] = 0.0;" | " gl_FragColor[0] = 0.0;" | ||||
| " gl_FragColor[1] = 0.0;" | " gl_FragColor[1] = 0.0;" | ||||
| " gl_FragColor[2] = 1.0;" | " gl_FragColor[2] = 1.0;" | ||||
| "}"); | |||||
| "}" | |||||
| #else | |||||
| "void main(float2 coord2d : POSITION," | |||||
| " out float4 out_Position : POSITION) {" | |||||
| " out_Position = float4(coord2d, 0.0, 1.0);" | |||||
| "}", | |||||
| "void main(out float4 out_FragColor : COLOR) {" | |||||
| " out_FragColor[0] = 0.0;" | |||||
| " out_FragColor[0] = 0.0;" | |||||
| " out_FragColor[0] = 1.0;" | |||||
| "}" | |||||
| #endif | |||||
| ); | |||||
| m_attrib = m_shader->GetAttribLocation("coord2d"); | m_attrib = m_shader->GetAttribLocation("coord2d"); | ||||
| m_ready = true; | m_ready = true; | ||||
| #if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ | |||||
| #if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ && !defined _XBOX | |||||
| /* Method 1: store vertex buffer on the GPU memory */ | /* Method 1: store vertex buffer on the GPU memory */ | ||||
| glGenBuffers(1, &m_vbo); | glGenBuffers(1, &m_vbo); | ||||
| glBindBuffer(GL_ARRAY_BUFFER, m_vbo); | glBindBuffer(GL_ARRAY_BUFFER, m_vbo); | ||||
| glBufferData(GL_ARRAY_BUFFER, sizeof(m_vertices), m_vertices, | glBufferData(GL_ARRAY_BUFFER, sizeof(m_vertices), m_vertices, | ||||
| GL_STATIC_DRAW); | GL_STATIC_DRAW); | ||||
| #elif !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ | |||||
| #elif !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ && !defined _XBOX | |||||
| /* Method 2: upload vertex information at each frame */ | /* Method 2: upload vertex information at each frame */ | ||||
| #elif defined _XBOX | |||||
| extern D3DDevice *g_d3ddevice; | |||||
| D3DVERTEXELEMENT9 const elements[3] = | |||||
| { | |||||
| { 0, 0, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0 }, | |||||
| D3DDECL_END() | |||||
| }; | |||||
| g_d3ddevice->CreateVertexDeclaration(elements, &m_vdecl); | |||||
| g_d3ddevice->CreateVertexBuffer(sizeof(m_vertices), D3DUSAGE_WRITEONLY, NULL, D3DPOOL_MANAGED, &m_vbo, NULL); | |||||
| vec2 *vertices; | |||||
| m_vbo->Lock(0, 0, (void **)&vertices, 0); | |||||
| memcpy(vertices, m_vertices, sizeof(m_vertices)); | |||||
| m_vbo->Unlock(); | |||||
| #else | #else | ||||
| #endif | #endif | ||||
| @@ -79,7 +107,11 @@ public: | |||||
| } | } | ||||
| m_shader->Bind(); | m_shader->Bind(); | ||||
| #if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ | |||||
| #if defined _XBOX | |||||
| extern D3DDevice *g_d3ddevice; | |||||
| g_d3ddevice->SetVertexDeclaration(m_vdecl); | |||||
| g_d3ddevice->SetStreamSource(0, m_vbo, 0, sizeof(*m_vertices)); | |||||
| #elif !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ | |||||
| glBindBuffer(GL_ARRAY_BUFFER, m_vbo); | glBindBuffer(GL_ARRAY_BUFFER, m_vbo); | ||||
| glEnableVertexAttribArray(m_attrib); | glEnableVertexAttribArray(m_attrib); | ||||
| glVertexAttribPointer(m_attrib, 2, GL_FLOAT, GL_FALSE, 0, 0); | glVertexAttribPointer(m_attrib, 2, GL_FLOAT, GL_FALSE, 0, 0); | ||||
| @@ -92,9 +124,15 @@ public: | |||||
| glVertexPointer(3, GL_FLOAT, 0, m_vertices); | glVertexPointer(3, GL_FLOAT, 0, m_vertices); | ||||
| #endif | #endif | ||||
| #if defined _XBOX | |||||
| g_d3ddevice->DrawPrimitive(D3DPT_TRIANGLELIST, 0, 1); | |||||
| #else | |||||
| glDrawArrays(GL_TRIANGLES, 0, 3); | glDrawArrays(GL_TRIANGLES, 0, 3); | ||||
| #endif | |||||
| #if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ | |||||
| #if defined _XBOX | |||||
| /* FIXME: do we need to unset anything here? */ | |||||
| #elif !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ | |||||
| glDisableVertexAttribArray(m_attrib); | glDisableVertexAttribArray(m_attrib); | ||||
| glBindBuffer(GL_ARRAY_BUFFER, 0); | glBindBuffer(GL_ARRAY_BUFFER, 0); | ||||
| #elif !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ | #elif !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ | ||||
| @@ -108,7 +146,10 @@ public: | |||||
| private: | private: | ||||
| vec2 m_vertices[3]; | vec2 m_vertices[3]; | ||||
| Shader *m_shader; | Shader *m_shader; | ||||
| #if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ | |||||
| #if defined _XBOX | |||||
| D3DVertexDeclaration *m_vdecl; | |||||
| D3DVertexBuffer *m_vbo; | |||||
| #elif !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ | |||||
| GLuint m_vbo; | GLuint m_vbo; | ||||
| #endif | #endif | ||||
| int m_attrib; | int m_attrib; | ||||
| @@ -119,9 +160,9 @@ int main(int argc, char **argv) | |||||
| { | { | ||||
| Application app("Tutorial 1: Triangle", ivec2(640, 480), 60.0f); | Application app("Tutorial 1: Triangle", ivec2(640, 480), 60.0f); | ||||
| #if defined _MSC_VER | |||||
| #if defined _MSC_VER && !defined _XBOX | |||||
| _chdir(".."); | _chdir(".."); | ||||
| #elif defined _WIN32 | |||||
| #elif defined _WIN32 && !defined _XBOX | |||||
| _chdir("../.."); | _chdir("../.."); | ||||
| #endif | #endif | ||||
| @@ -129,7 +170,6 @@ int main(int argc, char **argv) | |||||
| new Triangle(); | new Triangle(); | ||||
| app.Run(); | app.Run(); | ||||
| return EXIT_SUCCESS; | return EXIT_SUCCESS; | ||||
| } | } | ||||
+ 32
- 36
win32/benchsuite.vcxproj
View File
| @@ -25,36 +25,40 @@ | |||||
| <ClCompile Include="..\test\benchmark\vector.cpp" /> | <ClCompile Include="..\test\benchmark\vector.cpp" /> | ||||
| <ClCompile Include="..\test\benchsuite.cpp" /> | <ClCompile Include="..\test\benchsuite.cpp" /> | ||||
| </ItemGroup> | </ItemGroup> | ||||
| <ItemGroup> | |||||
| <ProjectReference Include="lolcore.vcxproj"> | |||||
| <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> | |||||
| </ProjectReference> | |||||
| </ItemGroup> | |||||
| <PropertyGroup Label="Globals"> | <PropertyGroup Label="Globals"> | ||||
| <ProjectGuid>{B1E10086-A1DA-401A-834D-969C9DBB5CC1}</ProjectGuid> | <ProjectGuid>{B1E10086-A1DA-401A-834D-969C9DBB5CC1}</ProjectGuid> | ||||
| <Keyword>Win32Proj</Keyword> | <Keyword>Win32Proj</Keyword> | ||||
| <RootNamespace>testmap</RootNamespace> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>true</UseDebugLibraries> | <UseDebugLibraries>true</UseDebugLibraries> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>true</UseDebugLibraries> | <UseDebugLibraries>true</UseDebugLibraries> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>false</UseDebugLibraries> | <UseDebugLibraries>false</UseDebugLibraries> | ||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>false</UseDebugLibraries> | <UseDebugLibraries>false</UseDebugLibraries> | ||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||||
| @@ -77,21 +81,15 @@ | |||||
| <Import Project="Contribs.props" /> | <Import Project="Contribs.props" /> | ||||
| </ImportGroup> | </ImportGroup> | ||||
| <PropertyGroup Label="UserMacros" /> | <PropertyGroup Label="UserMacros" /> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |||||
| <IntDir>Debug\$(ProjectName)\</IntDir> | |||||
| <LinkIncremental>true</LinkIncremental> | |||||
| </PropertyGroup> | |||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | |||||
| <IntDir>Debug\$(ProjectName)\</IntDir> | |||||
| <PropertyGroup Condition="'$(Configuration)'=='Debug'"> | |||||
| <LinkIncremental>true</LinkIncremental> | <LinkIncremental>true</LinkIncremental> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |||||
| <IntDir>Release\$(ProjectName)\</IntDir> | |||||
| <PropertyGroup Condition="'$(Configuration)'=='Release'"> | |||||
| <LinkIncremental>false</LinkIncremental> | <LinkIncremental>false</LinkIncremental> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | |||||
| <IntDir>Release\$(ProjectName)\</IntDir> | |||||
| <LinkIncremental>false</LinkIncremental> | |||||
| <PropertyGroup> | |||||
| <OutDir>$(Platform) $(Configuration)\</OutDir> | |||||
| <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||||
| <ClCompile> | <ClCompile> | ||||
| @@ -104,13 +102,12 @@ | |||||
| <FloatingPointModel>Fast</FloatingPointModel> | <FloatingPointModel>Fast</FloatingPointModel> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <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> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | <PostBuildEvent> | ||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command> | |||||
| </PostBuildEvent> | </PostBuildEvent> | ||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | ||||
| @@ -119,19 +116,19 @@ | |||||
| </PrecompiledHeader> | </PrecompiledHeader> | ||||
| <WarningLevel>Level3</WarningLevel> | <WarningLevel>Level3</WarningLevel> | ||||
| <Optimization>Disabled</Optimization> | <Optimization>Disabled</Optimization> | ||||
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | |||||
| <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <FloatingPointModel>Fast</FloatingPointModel> | <FloatingPointModel>Fast</FloatingPointModel> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| </PostBuildEvent> | |||||
| <Deploy> | |||||
| <DeploymentType>CopyToHardDrive</DeploymentType> | |||||
| </Deploy> | |||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||||
| <ClCompile> | <ClCompile> | ||||
| @@ -146,15 +143,14 @@ | |||||
| <FloatingPointModel>Fast</FloatingPointModel> | <FloatingPointModel>Fast</FloatingPointModel> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||||
| <OptimizeReferences>true</OptimizeReferences> | <OptimizeReferences>true</OptimizeReferences> | ||||
| <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> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | <PostBuildEvent> | ||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command> | |||||
| </PostBuildEvent> | </PostBuildEvent> | ||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | ||||
| @@ -163,23 +159,23 @@ | |||||
| <PrecompiledHeader> | <PrecompiledHeader> | ||||
| </PrecompiledHeader> | </PrecompiledHeader> | ||||
| <Optimization>MaxSpeed</Optimization> | <Optimization>MaxSpeed</Optimization> | ||||
| <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |||||
| <FunctionLevelLinking>true</FunctionLevelLinking> | <FunctionLevelLinking>true</FunctionLevelLinking> | ||||
| <IntrinsicFunctions>true</IntrinsicFunctions> | <IntrinsicFunctions>true</IntrinsicFunctions> | ||||
| <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <FloatingPointModel>Fast</FloatingPointModel> | <FloatingPointModel>Fast</FloatingPointModel> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||||
| <OptimizeReferences>true</OptimizeReferences> | <OptimizeReferences>true</OptimizeReferences> | ||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| </PostBuildEvent> | |||||
| <Deploy> | |||||
| <DeploymentType>CopyToHardDrive</DeploymentType> | |||||
| </Deploy> | |||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||||
| <ImportGroup Label="ExtensionTargets"> | <ImportGroup Label="ExtensionTargets"> | ||||
+ 32
- 36
win32/deushax.vcxproj
View File
| @@ -27,36 +27,40 @@ | |||||
| <ClCompile Include="..\deushax\deushax.cpp" /> | <ClCompile Include="..\deushax\deushax.cpp" /> | ||||
| <ClCompile Include="..\deushax\game.cpp" /> | <ClCompile Include="..\deushax\game.cpp" /> | ||||
| </ItemGroup> | </ItemGroup> | ||||
| <ItemGroup> | |||||
| <ProjectReference Include="lolcore.vcxproj"> | |||||
| <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> | |||||
| </ProjectReference> | |||||
| </ItemGroup> | |||||
| <PropertyGroup Label="Globals"> | <PropertyGroup Label="Globals"> | ||||
| <ProjectGuid>{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}</ProjectGuid> | <ProjectGuid>{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}</ProjectGuid> | ||||
| <Keyword>Win32Proj</Keyword> | <Keyword>Win32Proj</Keyword> | ||||
| <RootNamespace>testmap</RootNamespace> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>true</UseDebugLibraries> | <UseDebugLibraries>true</UseDebugLibraries> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>true</UseDebugLibraries> | <UseDebugLibraries>true</UseDebugLibraries> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>false</UseDebugLibraries> | <UseDebugLibraries>false</UseDebugLibraries> | ||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>false</UseDebugLibraries> | <UseDebugLibraries>false</UseDebugLibraries> | ||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||||
| @@ -79,21 +83,15 @@ | |||||
| <Import Project="Contribs.props" /> | <Import Project="Contribs.props" /> | ||||
| </ImportGroup> | </ImportGroup> | ||||
| <PropertyGroup Label="UserMacros" /> | <PropertyGroup Label="UserMacros" /> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |||||
| <IntDir>Debug\$(ProjectName)\</IntDir> | |||||
| <LinkIncremental>true</LinkIncremental> | |||||
| </PropertyGroup> | |||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | |||||
| <IntDir>Debug\$(ProjectName)\</IntDir> | |||||
| <PropertyGroup Condition="'$(Configuration)'=='Debug'"> | |||||
| <LinkIncremental>true</LinkIncremental> | <LinkIncremental>true</LinkIncremental> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |||||
| <IntDir>Release\$(ProjectName)\</IntDir> | |||||
| <PropertyGroup Condition="'$(Configuration)'=='Release'"> | |||||
| <LinkIncremental>false</LinkIncremental> | <LinkIncremental>false</LinkIncremental> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | |||||
| <IntDir>Release\$(ProjectName)\</IntDir> | |||||
| <LinkIncremental>false</LinkIncremental> | |||||
| <PropertyGroup> | |||||
| <OutDir>$(Platform) $(Configuration)\</OutDir> | |||||
| <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||||
| <ClCompile> | <ClCompile> | ||||
| @@ -105,13 +103,12 @@ | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <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> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | <PostBuildEvent> | ||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command> | |||||
| </PostBuildEvent> | </PostBuildEvent> | ||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | ||||
| @@ -120,18 +117,18 @@ | |||||
| </PrecompiledHeader> | </PrecompiledHeader> | ||||
| <WarningLevel>Level3</WarningLevel> | <WarningLevel>Level3</WarningLevel> | ||||
| <Optimization>Disabled</Optimization> | <Optimization>Disabled</Optimization> | ||||
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | |||||
| <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| </PostBuildEvent> | |||||
| <Deploy> | |||||
| <DeploymentType>CopyToHardDrive</DeploymentType> | |||||
| </Deploy> | |||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||||
| <ClCompile> | <ClCompile> | ||||
| @@ -145,15 +142,14 @@ | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||||
| <OptimizeReferences>true</OptimizeReferences> | <OptimizeReferences>true</OptimizeReferences> | ||||
| <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> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | <PostBuildEvent> | ||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command> | |||||
| </PostBuildEvent> | </PostBuildEvent> | ||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | ||||
| @@ -162,22 +158,22 @@ | |||||
| <PrecompiledHeader> | <PrecompiledHeader> | ||||
| </PrecompiledHeader> | </PrecompiledHeader> | ||||
| <Optimization>MaxSpeed</Optimization> | <Optimization>MaxSpeed</Optimization> | ||||
| <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |||||
| <FunctionLevelLinking>true</FunctionLevelLinking> | <FunctionLevelLinking>true</FunctionLevelLinking> | ||||
| <IntrinsicFunctions>true</IntrinsicFunctions> | <IntrinsicFunctions>true</IntrinsicFunctions> | ||||
| <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||||
| <OptimizeReferences>true</OptimizeReferences> | <OptimizeReferences>true</OptimizeReferences> | ||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| </PostBuildEvent> | |||||
| <Deploy> | |||||
| <DeploymentType>CopyToHardDrive</DeploymentType> | |||||
| </Deploy> | |||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||||
| <ImportGroup Label="ExtensionTargets"> | <ImportGroup Label="ExtensionTargets"> | ||||
+ 32
- 36
win32/editor.vcxproj
View File
| @@ -27,36 +27,40 @@ | |||||
| <ClCompile Include="..\deushax\gtk\glmapview.cpp" /> | <ClCompile Include="..\deushax\gtk\glmapview.cpp" /> | ||||
| <ClCompile Include="..\deushax\mapviewer.cpp" /> | <ClCompile Include="..\deushax\mapviewer.cpp" /> | ||||
| </ItemGroup> | </ItemGroup> | ||||
| <ItemGroup> | |||||
| <ProjectReference Include="lolcore.vcxproj"> | |||||
| <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> | |||||
| </ProjectReference> | |||||
| </ItemGroup> | |||||
| <PropertyGroup Label="Globals"> | <PropertyGroup Label="Globals"> | ||||
| <ProjectGuid>{9C66B179-0737-4BDA-AB42-2ADE478A9008}</ProjectGuid> | <ProjectGuid>{9C66B179-0737-4BDA-AB42-2ADE478A9008}</ProjectGuid> | ||||
| <Keyword>Win32Proj</Keyword> | <Keyword>Win32Proj</Keyword> | ||||
| <RootNamespace>testmap</RootNamespace> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>true</UseDebugLibraries> | <UseDebugLibraries>true</UseDebugLibraries> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>true</UseDebugLibraries> | <UseDebugLibraries>true</UseDebugLibraries> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>false</UseDebugLibraries> | <UseDebugLibraries>false</UseDebugLibraries> | ||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>false</UseDebugLibraries> | <UseDebugLibraries>false</UseDebugLibraries> | ||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||||
| @@ -79,21 +83,15 @@ | |||||
| <Import Project="Contribs.props" /> | <Import Project="Contribs.props" /> | ||||
| </ImportGroup> | </ImportGroup> | ||||
| <PropertyGroup Label="UserMacros" /> | <PropertyGroup Label="UserMacros" /> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |||||
| <IntDir>Debug\$(ProjectName)\</IntDir> | |||||
| <LinkIncremental>true</LinkIncremental> | |||||
| </PropertyGroup> | |||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | |||||
| <IntDir>Debug\$(ProjectName)\</IntDir> | |||||
| <PropertyGroup Condition="'$(Configuration)'=='Debug'"> | |||||
| <LinkIncremental>true</LinkIncremental> | <LinkIncremental>true</LinkIncremental> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |||||
| <IntDir>Release\$(ProjectName)\</IntDir> | |||||
| <PropertyGroup Condition="'$(Configuration)'=='Release'"> | |||||
| <LinkIncremental>false</LinkIncremental> | <LinkIncremental>false</LinkIncremental> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | |||||
| <IntDir>Release\$(ProjectName)\</IntDir> | |||||
| <LinkIncremental>false</LinkIncremental> | |||||
| <PropertyGroup> | |||||
| <OutDir>$(Platform) $(Configuration)\</OutDir> | |||||
| <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||||
| <ClCompile> | <ClCompile> | ||||
| @@ -105,13 +103,12 @@ | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GlIncludes);$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GlIncludes);$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <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> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | <PostBuildEvent> | ||||
| <Command>for %%I in ($(GtkLibs) $(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| <Command>for %%I in ($(GtkLibs) $(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command> | |||||
| </PostBuildEvent> | </PostBuildEvent> | ||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | ||||
| @@ -120,18 +117,18 @@ | |||||
| </PrecompiledHeader> | </PrecompiledHeader> | ||||
| <WarningLevel>Level3</WarningLevel> | <WarningLevel>Level3</WarningLevel> | ||||
| <Optimization>Disabled</Optimization> | <Optimization>Disabled</Optimization> | ||||
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | |||||
| <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GlIncludes);$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | |||||
| <Command>for %%I in ($(GtkLibs) $(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| </PostBuildEvent> | |||||
| <Deploy> | |||||
| <DeploymentType>CopyToHardDrive</DeploymentType> | |||||
| </Deploy> | |||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||||
| <ClCompile> | <ClCompile> | ||||
| @@ -145,15 +142,14 @@ | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GlIncludes);$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GlIncludes);$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||||
| <OptimizeReferences>true</OptimizeReferences> | <OptimizeReferences>true</OptimizeReferences> | ||||
| <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> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | <PostBuildEvent> | ||||
| <Command>for %%I in ($(GtkLibs) $(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| <Command>for %%I in ($(GtkLibs) $(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command> | |||||
| </PostBuildEvent> | </PostBuildEvent> | ||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | ||||
| @@ -162,22 +158,22 @@ | |||||
| <PrecompiledHeader> | <PrecompiledHeader> | ||||
| </PrecompiledHeader> | </PrecompiledHeader> | ||||
| <Optimization>MaxSpeed</Optimization> | <Optimization>MaxSpeed</Optimization> | ||||
| <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |||||
| <FunctionLevelLinking>true</FunctionLevelLinking> | <FunctionLevelLinking>true</FunctionLevelLinking> | ||||
| <IntrinsicFunctions>true</IntrinsicFunctions> | <IntrinsicFunctions>true</IntrinsicFunctions> | ||||
| <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GlIncludes);$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||||
| <OptimizeReferences>true</OptimizeReferences> | <OptimizeReferences>true</OptimizeReferences> | ||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | |||||
| <Command>for %%I in ($(GtkLibs) $(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| </PostBuildEvent> | |||||
| <Deploy> | |||||
| <DeploymentType>CopyToHardDrive</DeploymentType> | |||||
| </Deploy> | |||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||||
| <ImportGroup Label="ExtensionTargets"> | <ImportGroup Label="ExtensionTargets"> | ||||
+ 18
- 14
win32/lolcore.vcxproj
View File
| @@ -21,30 +21,27 @@ | |||||
| <PropertyGroup Label="Globals"> | <PropertyGroup Label="Globals"> | ||||
| <ProjectGuid>{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}</ProjectGuid> | <ProjectGuid>{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}</ProjectGuid> | ||||
| <Keyword>Win32Proj</Keyword> | <Keyword>Win32Proj</Keyword> | ||||
| <RootNamespace>lolcore</RootNamespace> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
| <ConfigurationType>StaticLibrary</ConfigurationType> | <ConfigurationType>StaticLibrary</ConfigurationType> | ||||
| <UseDebugLibraries>true</UseDebugLibraries> | <UseDebugLibraries>true</UseDebugLibraries> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> | ||||
| <ConfigurationType>StaticLibrary</ConfigurationType> | <ConfigurationType>StaticLibrary</ConfigurationType> | ||||
| <UseDebugLibraries>true</UseDebugLibraries> | |||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||||
| <ConfigurationType>StaticLibrary</ConfigurationType> | <ConfigurationType>StaticLibrary</ConfigurationType> | ||||
| <UseDebugLibraries>false</UseDebugLibraries> | <UseDebugLibraries>false</UseDebugLibraries> | ||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> | ||||
| <ConfigurationType>StaticLibrary</ConfigurationType> | <ConfigurationType>StaticLibrary</ConfigurationType> | ||||
| <UseDebugLibraries>false</UseDebugLibraries> | |||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||||
| <ImportGroup Label="ExtensionSettings"> | <ImportGroup Label="ExtensionSettings"> | ||||
| @@ -66,7 +63,16 @@ | |||||
| <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||||
| </ImportGroup> | </ImportGroup> | ||||
| <PropertyGroup Label="UserMacros" /> | <PropertyGroup Label="UserMacros" /> | ||||
| <PropertyGroup /> | |||||
| <PropertyGroup Condition="'$(Configuration)'=='Debug'"> | |||||
| <LinkIncremental>true</LinkIncremental> | |||||
| </PropertyGroup> | |||||
| <PropertyGroup Condition="'$(Configuration)'=='Release'"> | |||||
| <LinkIncremental>false</LinkIncremental> | |||||
| </PropertyGroup> | |||||
| <PropertyGroup> | |||||
| <OutDir>$(Platform) $(Configuration)\</OutDir> | |||||
| <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir> | |||||
| </PropertyGroup> | |||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||||
| <ClCompile> | <ClCompile> | ||||
| <PrecompiledHeader> | <PrecompiledHeader> | ||||
| @@ -78,7 +84,6 @@ | |||||
| <FloatingPointModel>Fast</FloatingPointModel> | <FloatingPointModel>Fast</FloatingPointModel> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Windows</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| </Link> | </Link> | ||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| @@ -88,12 +93,12 @@ | |||||
| </PrecompiledHeader> | </PrecompiledHeader> | ||||
| <WarningLevel>Level3</WarningLevel> | <WarningLevel>Level3</WarningLevel> | ||||
| <Optimization>Disabled</Optimization> | <Optimization>Disabled</Optimization> | ||||
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | |||||
| <PreprocessorDefinitions>_XBOX;_DEBUG;_LIB;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | <PreprocessorDefinitions>_XBOX;_DEBUG;_LIB;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <FloatingPointModel>Fast</FloatingPointModel> | <FloatingPointModel>Fast</FloatingPointModel> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Windows</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| </Link> | </Link> | ||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| @@ -111,7 +116,6 @@ | |||||
| <FloatingPointModel>Fast</FloatingPointModel> | <FloatingPointModel>Fast</FloatingPointModel> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Windows</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||||
| <OptimizeReferences>true</OptimizeReferences> | <OptimizeReferences>true</OptimizeReferences> | ||||
| @@ -124,14 +128,14 @@ | |||||
| </PrecompiledHeader> | </PrecompiledHeader> | ||||
| <Optimization>MaxSpeed</Optimization> | <Optimization>MaxSpeed</Optimization> | ||||
| <FunctionLevelLinking>true</FunctionLevelLinking> | <FunctionLevelLinking>true</FunctionLevelLinking> | ||||
| <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |||||
| <IntrinsicFunctions>true</IntrinsicFunctions> | <IntrinsicFunctions>true</IntrinsicFunctions> | ||||
| <PreprocessorDefinitions>_XBOX;NDEBUG;_LIB;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | <PreprocessorDefinitions>_XBOX;NDEBUG;_LIB;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> | <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> | ||||
| <FloatingPointModel>Fast</FloatingPointModel> | <FloatingPointModel>Fast</FloatingPointModel> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Windows</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||||
| <OptimizeReferences>true</OptimizeReferences> | <OptimizeReferences>true</OptimizeReferences> | ||||
+ 5
- 0
win32/lolengine.sln
View File
| @@ -63,6 +63,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrpigeon", "mrpigeon.vcxpro | |||||
| {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} | {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} | ||||
| EndProjectSection | EndProjectSection | ||||
| EndProject | EndProject | ||||
| Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Games", "Games", "{1DFE1729-4F1B-47CA-9819-72431FE14E25}" | |||||
| EndProject | |||||
| Global | Global | ||||
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||||
| Debug|Win32 = Debug|Win32 | Debug|Win32 = Debug|Win32 | ||||
| @@ -196,5 +198,8 @@ Global | |||||
| {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} | {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} | ||||
| {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} | {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} | ||||
| {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515} = {33704AA4-F2B5-4138-A40D-E3E77F89ED46} | {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515} = {33704AA4-F2B5-4138-A40D-E3E77F89ED46} | ||||
| {08C6A854-533D-4A1E-924E-C4A62281869F} = {1DFE1729-4F1B-47CA-9819-72431FE14E25} | |||||
| {2F87CEAB-4818-443C-A5E3-6C34E7D967EC} = {1DFE1729-4F1B-47CA-9819-72431FE14E25} | |||||
| {33704AA4-F2B5-4138-A40D-E3E77F89ED46} = {1DFE1729-4F1B-47CA-9819-72431FE14E25} | |||||
| EndGlobalSection | EndGlobalSection | ||||
| EndGlobal | EndGlobal | ||||
+ 32
- 36
win32/monsterz.vcxproj
View File
| @@ -38,36 +38,40 @@ | |||||
| <ClCompile Include="..\monsterz\thumbs.cpp" /> | <ClCompile Include="..\monsterz\thumbs.cpp" /> | ||||
| <ClCompile Include="..\monsterz\title.cpp" /> | <ClCompile Include="..\monsterz\title.cpp" /> | ||||
| </ItemGroup> | </ItemGroup> | ||||
| <ItemGroup> | |||||
| <ProjectReference Include="lolcore.vcxproj"> | |||||
| <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> | |||||
| </ProjectReference> | |||||
| </ItemGroup> | |||||
| <PropertyGroup Label="Globals"> | <PropertyGroup Label="Globals"> | ||||
| <ProjectGuid>{17f0f184-4436-4d08-b8aa-16572ea238db}</ProjectGuid> | <ProjectGuid>{17f0f184-4436-4d08-b8aa-16572ea238db}</ProjectGuid> | ||||
| <Keyword>Win32Proj</Keyword> | <Keyword>Win32Proj</Keyword> | ||||
| <RootNamespace>testmap</RootNamespace> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>true</UseDebugLibraries> | <UseDebugLibraries>true</UseDebugLibraries> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>true</UseDebugLibraries> | <UseDebugLibraries>true</UseDebugLibraries> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>false</UseDebugLibraries> | <UseDebugLibraries>false</UseDebugLibraries> | ||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>false</UseDebugLibraries> | <UseDebugLibraries>false</UseDebugLibraries> | ||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||||
| @@ -90,21 +94,15 @@ | |||||
| <Import Project="Contribs.props" /> | <Import Project="Contribs.props" /> | ||||
| </ImportGroup> | </ImportGroup> | ||||
| <PropertyGroup Label="UserMacros" /> | <PropertyGroup Label="UserMacros" /> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |||||
| <IntDir>Debug\$(ProjectName)\</IntDir> | |||||
| <LinkIncremental>true</LinkIncremental> | |||||
| </PropertyGroup> | |||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | |||||
| <IntDir>Debug\$(ProjectName)\</IntDir> | |||||
| <PropertyGroup Condition="'$(Configuration)'=='Debug'"> | |||||
| <LinkIncremental>true</LinkIncremental> | <LinkIncremental>true</LinkIncremental> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |||||
| <IntDir>Release\$(ProjectName)\</IntDir> | |||||
| <PropertyGroup Condition="'$(Configuration)'=='Release'"> | |||||
| <LinkIncremental>false</LinkIncremental> | <LinkIncremental>false</LinkIncremental> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | |||||
| <IntDir>Release\$(ProjectName)\</IntDir> | |||||
| <LinkIncremental>false</LinkIncremental> | |||||
| <PropertyGroup> | |||||
| <OutDir>$(Platform) $(Configuration)\</OutDir> | |||||
| <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||||
| <ClCompile> | <ClCompile> | ||||
| @@ -116,13 +114,12 @@ | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <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> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | <PostBuildEvent> | ||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command> | |||||
| </PostBuildEvent> | </PostBuildEvent> | ||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | ||||
| @@ -131,18 +128,18 @@ | |||||
| </PrecompiledHeader> | </PrecompiledHeader> | ||||
| <WarningLevel>Level3</WarningLevel> | <WarningLevel>Level3</WarningLevel> | ||||
| <Optimization>Disabled</Optimization> | <Optimization>Disabled</Optimization> | ||||
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | |||||
| <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| </PostBuildEvent> | |||||
| <Deploy> | |||||
| <DeploymentType>CopyToHardDrive</DeploymentType> | |||||
| </Deploy> | |||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||||
| <ClCompile> | <ClCompile> | ||||
| @@ -156,15 +153,14 @@ | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||||
| <OptimizeReferences>true</OptimizeReferences> | <OptimizeReferences>true</OptimizeReferences> | ||||
| <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> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | <PostBuildEvent> | ||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command> | |||||
| </PostBuildEvent> | </PostBuildEvent> | ||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | ||||
| @@ -173,22 +169,22 @@ | |||||
| <PrecompiledHeader> | <PrecompiledHeader> | ||||
| </PrecompiledHeader> | </PrecompiledHeader> | ||||
| <Optimization>MaxSpeed</Optimization> | <Optimization>MaxSpeed</Optimization> | ||||
| <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |||||
| <FunctionLevelLinking>true</FunctionLevelLinking> | <FunctionLevelLinking>true</FunctionLevelLinking> | ||||
| <IntrinsicFunctions>true</IntrinsicFunctions> | <IntrinsicFunctions>true</IntrinsicFunctions> | ||||
| <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||||
| <OptimizeReferences>true</OptimizeReferences> | <OptimizeReferences>true</OptimizeReferences> | ||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| </PostBuildEvent> | |||||
| <Deploy> | |||||
| <DeploymentType>CopyToHardDrive</DeploymentType> | |||||
| </Deploy> | |||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||||
| <ImportGroup Label="ExtensionTargets"> | <ImportGroup Label="ExtensionTargets"> | ||||
+ 32
- 36
win32/mrpigeon.vcxproj
View File
| @@ -24,36 +24,40 @@ | |||||
| <ItemGroup> | <ItemGroup> | ||||
| <ClCompile Include="..\mrpigeon\mrpigeon.cpp" /> | <ClCompile Include="..\mrpigeon\mrpigeon.cpp" /> | ||||
| </ItemGroup> | </ItemGroup> | ||||
| <ItemGroup> | |||||
| <ProjectReference Include="lolcore.vcxproj"> | |||||
| <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> | |||||
| </ProjectReference> | |||||
| </ItemGroup> | |||||
| <PropertyGroup Label="Globals"> | <PropertyGroup Label="Globals"> | ||||
| <ProjectGuid>{32f3f8cf-d22e-45e4-beb8-ad909e8c5515}</ProjectGuid> | <ProjectGuid>{32f3f8cf-d22e-45e4-beb8-ad909e8c5515}</ProjectGuid> | ||||
| <Keyword>Win32Proj</Keyword> | <Keyword>Win32Proj</Keyword> | ||||
| <RootNamespace>testmap</RootNamespace> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>true</UseDebugLibraries> | <UseDebugLibraries>true</UseDebugLibraries> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>true</UseDebugLibraries> | <UseDebugLibraries>true</UseDebugLibraries> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>false</UseDebugLibraries> | <UseDebugLibraries>false</UseDebugLibraries> | ||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>false</UseDebugLibraries> | <UseDebugLibraries>false</UseDebugLibraries> | ||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||||
| @@ -76,21 +80,15 @@ | |||||
| <Import Project="Contribs.props" /> | <Import Project="Contribs.props" /> | ||||
| </ImportGroup> | </ImportGroup> | ||||
| <PropertyGroup Label="UserMacros" /> | <PropertyGroup Label="UserMacros" /> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |||||
| <IntDir>Debug\$(ProjectName)\</IntDir> | |||||
| <LinkIncremental>true</LinkIncremental> | |||||
| </PropertyGroup> | |||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | |||||
| <IntDir>Debug\$(ProjectName)\</IntDir> | |||||
| <PropertyGroup Condition="'$(Configuration)'=='Debug'"> | |||||
| <LinkIncremental>true</LinkIncremental> | <LinkIncremental>true</LinkIncremental> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |||||
| <IntDir>Release\$(ProjectName)\</IntDir> | |||||
| <PropertyGroup Condition="'$(Configuration)'=='Release'"> | |||||
| <LinkIncremental>false</LinkIncremental> | <LinkIncremental>false</LinkIncremental> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | |||||
| <IntDir>Release\$(ProjectName)\</IntDir> | |||||
| <LinkIncremental>false</LinkIncremental> | |||||
| <PropertyGroup> | |||||
| <OutDir>$(Platform) $(Configuration)\</OutDir> | |||||
| <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||||
| <ClCompile> | <ClCompile> | ||||
| @@ -102,13 +100,12 @@ | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <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> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | <PostBuildEvent> | ||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command> | |||||
| </PostBuildEvent> | </PostBuildEvent> | ||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | ||||
| @@ -117,18 +114,18 @@ | |||||
| </PrecompiledHeader> | </PrecompiledHeader> | ||||
| <WarningLevel>Level3</WarningLevel> | <WarningLevel>Level3</WarningLevel> | ||||
| <Optimization>Disabled</Optimization> | <Optimization>Disabled</Optimization> | ||||
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | |||||
| <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| </PostBuildEvent> | |||||
| <Deploy> | |||||
| <DeploymentType>CopyToHardDrive</DeploymentType> | |||||
| </Deploy> | |||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||||
| <ClCompile> | <ClCompile> | ||||
| @@ -142,15 +139,14 @@ | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||||
| <OptimizeReferences>true</OptimizeReferences> | <OptimizeReferences>true</OptimizeReferences> | ||||
| <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> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | <PostBuildEvent> | ||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command> | |||||
| </PostBuildEvent> | </PostBuildEvent> | ||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | ||||
| @@ -159,22 +155,22 @@ | |||||
| <PrecompiledHeader> | <PrecompiledHeader> | ||||
| </PrecompiledHeader> | </PrecompiledHeader> | ||||
| <Optimization>MaxSpeed</Optimization> | <Optimization>MaxSpeed</Optimization> | ||||
| <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |||||
| <FunctionLevelLinking>true</FunctionLevelLinking> | <FunctionLevelLinking>true</FunctionLevelLinking> | ||||
| <IntrinsicFunctions>true</IntrinsicFunctions> | <IntrinsicFunctions>true</IntrinsicFunctions> | ||||
| <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||||
| <OptimizeReferences>true</OptimizeReferences> | <OptimizeReferences>true</OptimizeReferences> | ||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| </PostBuildEvent> | |||||
| <Deploy> | |||||
| <DeploymentType>CopyToHardDrive</DeploymentType> | |||||
| </Deploy> | |||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||||
| <ImportGroup Label="ExtensionTargets"> | <ImportGroup Label="ExtensionTargets"> | ||||
+ 32
- 36
win32/quad.vcxproj
View File
| @@ -21,36 +21,40 @@ | |||||
| <ItemGroup> | <ItemGroup> | ||||
| <ClCompile Include="..\test\debug\quad.cpp" /> | <ClCompile Include="..\test\debug\quad.cpp" /> | ||||
| </ItemGroup> | </ItemGroup> | ||||
| <ItemGroup> | |||||
| <ProjectReference Include="lolcore.vcxproj"> | |||||
| <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> | |||||
| </ProjectReference> | |||||
| </ItemGroup> | |||||
| <PropertyGroup Label="Globals"> | <PropertyGroup Label="Globals"> | ||||
| <ProjectGuid>{53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}</ProjectGuid> | <ProjectGuid>{53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}</ProjectGuid> | ||||
| <Keyword>Win32Proj</Keyword> | <Keyword>Win32Proj</Keyword> | ||||
| <RootNamespace>testmap</RootNamespace> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>true</UseDebugLibraries> | <UseDebugLibraries>true</UseDebugLibraries> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>true</UseDebugLibraries> | <UseDebugLibraries>true</UseDebugLibraries> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>false</UseDebugLibraries> | <UseDebugLibraries>false</UseDebugLibraries> | ||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>false</UseDebugLibraries> | <UseDebugLibraries>false</UseDebugLibraries> | ||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||||
| @@ -73,21 +77,15 @@ | |||||
| <Import Project="Contribs.props" /> | <Import Project="Contribs.props" /> | ||||
| </ImportGroup> | </ImportGroup> | ||||
| <PropertyGroup Label="UserMacros" /> | <PropertyGroup Label="UserMacros" /> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |||||
| <IntDir>Debug\$(ProjectName)\</IntDir> | |||||
| <LinkIncremental>true</LinkIncremental> | |||||
| </PropertyGroup> | |||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | |||||
| <IntDir>Debug\$(ProjectName)\</IntDir> | |||||
| <PropertyGroup Condition="'$(Configuration)'=='Debug'"> | |||||
| <LinkIncremental>true</LinkIncremental> | <LinkIncremental>true</LinkIncremental> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |||||
| <IntDir>Release\$(ProjectName)\</IntDir> | |||||
| <PropertyGroup Condition="'$(Configuration)'=='Release'"> | |||||
| <LinkIncremental>false</LinkIncremental> | <LinkIncremental>false</LinkIncremental> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | |||||
| <IntDir>Release\$(ProjectName)\</IntDir> | |||||
| <LinkIncremental>false</LinkIncremental> | |||||
| <PropertyGroup> | |||||
| <OutDir>$(Platform) $(Configuration)\</OutDir> | |||||
| <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||||
| <ClCompile> | <ClCompile> | ||||
| @@ -99,13 +97,12 @@ | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <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> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | <PostBuildEvent> | ||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command> | |||||
| </PostBuildEvent> | </PostBuildEvent> | ||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | ||||
| @@ -114,18 +111,18 @@ | |||||
| </PrecompiledHeader> | </PrecompiledHeader> | ||||
| <WarningLevel>Level3</WarningLevel> | <WarningLevel>Level3</WarningLevel> | ||||
| <Optimization>Disabled</Optimization> | <Optimization>Disabled</Optimization> | ||||
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | |||||
| <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| </PostBuildEvent> | |||||
| <Deploy> | |||||
| <DeploymentType>CopyToHardDrive</DeploymentType> | |||||
| </Deploy> | |||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||||
| <ClCompile> | <ClCompile> | ||||
| @@ -139,15 +136,14 @@ | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||||
| <OptimizeReferences>true</OptimizeReferences> | <OptimizeReferences>true</OptimizeReferences> | ||||
| <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> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | <PostBuildEvent> | ||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command> | |||||
| </PostBuildEvent> | </PostBuildEvent> | ||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | ||||
| @@ -156,22 +152,22 @@ | |||||
| <PrecompiledHeader> | <PrecompiledHeader> | ||||
| </PrecompiledHeader> | </PrecompiledHeader> | ||||
| <Optimization>MaxSpeed</Optimization> | <Optimization>MaxSpeed</Optimization> | ||||
| <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |||||
| <FunctionLevelLinking>true</FunctionLevelLinking> | <FunctionLevelLinking>true</FunctionLevelLinking> | ||||
| <IntrinsicFunctions>true</IntrinsicFunctions> | <IntrinsicFunctions>true</IntrinsicFunctions> | ||||
| <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||||
| <OptimizeReferences>true</OptimizeReferences> | <OptimizeReferences>true</OptimizeReferences> | ||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| </PostBuildEvent> | |||||
| <Deploy> | |||||
| <DeploymentType>CopyToHardDrive</DeploymentType> | |||||
| </Deploy> | |||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||||
| <ImportGroup Label="ExtensionTargets"> | <ImportGroup Label="ExtensionTargets"> | ||||
+ 32
- 36
win32/testsuite.vcxproj
View File
| @@ -29,36 +29,40 @@ | |||||
| <ClCompile Include="..\test\unit\trig.cpp" /> | <ClCompile Include="..\test\unit\trig.cpp" /> | ||||
| <ClCompile Include="..\test\unit\vector.cpp" /> | <ClCompile Include="..\test\unit\vector.cpp" /> | ||||
| </ItemGroup> | </ItemGroup> | ||||
| <ItemGroup> | |||||
| <ProjectReference Include="lolcore.vcxproj"> | |||||
| <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> | |||||
| </ProjectReference> | |||||
| </ItemGroup> | |||||
| <PropertyGroup Label="Globals"> | <PropertyGroup Label="Globals"> | ||||
| <ProjectGuid>{80F81C11-8DA2-4990-91CB-9807783BA46E}</ProjectGuid> | <ProjectGuid>{80F81C11-8DA2-4990-91CB-9807783BA46E}</ProjectGuid> | ||||
| <Keyword>Win32Proj</Keyword> | <Keyword>Win32Proj</Keyword> | ||||
| <RootNamespace>testmap</RootNamespace> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>true</UseDebugLibraries> | <UseDebugLibraries>true</UseDebugLibraries> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>true</UseDebugLibraries> | <UseDebugLibraries>true</UseDebugLibraries> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>false</UseDebugLibraries> | <UseDebugLibraries>false</UseDebugLibraries> | ||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>false</UseDebugLibraries> | <UseDebugLibraries>false</UseDebugLibraries> | ||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||||
| @@ -81,21 +85,15 @@ | |||||
| <Import Project="Contribs.props" /> | <Import Project="Contribs.props" /> | ||||
| </ImportGroup> | </ImportGroup> | ||||
| <PropertyGroup Label="UserMacros" /> | <PropertyGroup Label="UserMacros" /> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |||||
| <IntDir>Debug\$(ProjectName)\</IntDir> | |||||
| <LinkIncremental>true</LinkIncremental> | |||||
| </PropertyGroup> | |||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | |||||
| <IntDir>Debug\$(ProjectName)\</IntDir> | |||||
| <PropertyGroup Condition="'$(Configuration)'=='Debug'"> | |||||
| <LinkIncremental>true</LinkIncremental> | <LinkIncremental>true</LinkIncremental> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |||||
| <IntDir>Release\$(ProjectName)\</IntDir> | |||||
| <PropertyGroup Condition="'$(Configuration)'=='Release'"> | |||||
| <LinkIncremental>false</LinkIncremental> | <LinkIncremental>false</LinkIncremental> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | |||||
| <IntDir>Release\$(ProjectName)\</IntDir> | |||||
| <LinkIncremental>false</LinkIncremental> | |||||
| <PropertyGroup> | |||||
| <OutDir>$(Platform) $(Configuration)\</OutDir> | |||||
| <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||||
| <ClCompile> | <ClCompile> | ||||
| @@ -108,13 +106,12 @@ | |||||
| <FloatingPointModel>Fast</FloatingPointModel> | <FloatingPointModel>Fast</FloatingPointModel> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <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> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | <PostBuildEvent> | ||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command> | |||||
| </PostBuildEvent> | </PostBuildEvent> | ||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | ||||
| @@ -123,19 +120,19 @@ | |||||
| </PrecompiledHeader> | </PrecompiledHeader> | ||||
| <WarningLevel>Level3</WarningLevel> | <WarningLevel>Level3</WarningLevel> | ||||
| <Optimization>Disabled</Optimization> | <Optimization>Disabled</Optimization> | ||||
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | |||||
| <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <FloatingPointModel>Fast</FloatingPointModel> | <FloatingPointModel>Fast</FloatingPointModel> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| </PostBuildEvent> | |||||
| <Deploy> | |||||
| <DeploymentType>CopyToHardDrive</DeploymentType> | |||||
| </Deploy> | |||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||||
| <ClCompile> | <ClCompile> | ||||
| @@ -150,15 +147,14 @@ | |||||
| <FloatingPointModel>Fast</FloatingPointModel> | <FloatingPointModel>Fast</FloatingPointModel> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||||
| <OptimizeReferences>true</OptimizeReferences> | <OptimizeReferences>true</OptimizeReferences> | ||||
| <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> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | <PostBuildEvent> | ||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command> | |||||
| </PostBuildEvent> | </PostBuildEvent> | ||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | ||||
| @@ -167,23 +163,23 @@ | |||||
| <PrecompiledHeader> | <PrecompiledHeader> | ||||
| </PrecompiledHeader> | </PrecompiledHeader> | ||||
| <Optimization>MaxSpeed</Optimization> | <Optimization>MaxSpeed</Optimization> | ||||
| <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |||||
| <FunctionLevelLinking>true</FunctionLevelLinking> | <FunctionLevelLinking>true</FunctionLevelLinking> | ||||
| <IntrinsicFunctions>true</IntrinsicFunctions> | <IntrinsicFunctions>true</IntrinsicFunctions> | ||||
| <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <FloatingPointModel>Fast</FloatingPointModel> | <FloatingPointModel>Fast</FloatingPointModel> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||||
| <OptimizeReferences>true</OptimizeReferences> | <OptimizeReferences>true</OptimizeReferences> | ||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| </PostBuildEvent> | |||||
| <Deploy> | |||||
| <DeploymentType>CopyToHardDrive</DeploymentType> | |||||
| </Deploy> | |||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||||
| <ImportGroup Label="ExtensionTargets"> | <ImportGroup Label="ExtensionTargets"> | ||||
+ 34
- 36
win32/tut01.vcxproj
View File
| @@ -21,36 +21,40 @@ | |||||
| <ItemGroup> | <ItemGroup> | ||||
| <ClCompile Include="..\test\tutorial\tut01.cpp" /> | <ClCompile Include="..\test\tutorial\tut01.cpp" /> | ||||
| </ItemGroup> | </ItemGroup> | ||||
| <ItemGroup> | |||||
| <ProjectReference Include="lolcore.vcxproj"> | |||||
| <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> | |||||
| </ProjectReference> | |||||
| </ItemGroup> | |||||
| <PropertyGroup Label="Globals"> | <PropertyGroup Label="Globals"> | ||||
| <ProjectGuid>{b92abadc-45be-4cc5-b724-9426053123a1}</ProjectGuid> | <ProjectGuid>{b92abadc-45be-4cc5-b724-9426053123a1}</ProjectGuid> | ||||
| <Keyword>Win32Proj</Keyword> | <Keyword>Win32Proj</Keyword> | ||||
| <RootNamespace>testmap</RootNamespace> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>true</UseDebugLibraries> | <UseDebugLibraries>true</UseDebugLibraries> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>true</UseDebugLibraries> | <UseDebugLibraries>true</UseDebugLibraries> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>false</UseDebugLibraries> | <UseDebugLibraries>false</UseDebugLibraries> | ||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>false</UseDebugLibraries> | <UseDebugLibraries>false</UseDebugLibraries> | ||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||||
| @@ -73,21 +77,15 @@ | |||||
| <Import Project="Contribs.props" /> | <Import Project="Contribs.props" /> | ||||
| </ImportGroup> | </ImportGroup> | ||||
| <PropertyGroup Label="UserMacros" /> | <PropertyGroup Label="UserMacros" /> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |||||
| <IntDir>Debug\$(ProjectName)\</IntDir> | |||||
| <LinkIncremental>true</LinkIncremental> | |||||
| </PropertyGroup> | |||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | |||||
| <IntDir>Debug\$(ProjectName)\</IntDir> | |||||
| <PropertyGroup Condition="'$(Configuration)'=='Debug'"> | |||||
| <LinkIncremental>true</LinkIncremental> | <LinkIncremental>true</LinkIncremental> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |||||
| <IntDir>Release\$(ProjectName)\</IntDir> | |||||
| <PropertyGroup Condition="'$(Configuration)'=='Release'"> | |||||
| <LinkIncremental>false</LinkIncremental> | <LinkIncremental>false</LinkIncremental> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | |||||
| <IntDir>Release\$(ProjectName)\</IntDir> | |||||
| <LinkIncremental>false</LinkIncremental> | |||||
| <PropertyGroup> | |||||
| <OutDir>$(Platform) $(Configuration)\</OutDir> | |||||
| <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||||
| <ClCompile> | <ClCompile> | ||||
| @@ -99,13 +97,12 @@ | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <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> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | <PostBuildEvent> | ||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command> | |||||
| </PostBuildEvent> | </PostBuildEvent> | ||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | ||||
| @@ -114,18 +111,19 @@ | |||||
| </PrecompiledHeader> | </PrecompiledHeader> | ||||
| <WarningLevel>Level3</WarningLevel> | <WarningLevel>Level3</WarningLevel> | ||||
| <Optimization>Disabled</Optimization> | <Optimization>Disabled</Optimization> | ||||
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | |||||
| <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <BufferSecurityCheck>false</BufferSecurityCheck> | |||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| </PostBuildEvent> | |||||
| <Deploy> | |||||
| <DeploymentType>CopyToHardDrive</DeploymentType> | |||||
| </Deploy> | |||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||||
| <ClCompile> | <ClCompile> | ||||
| @@ -139,15 +137,14 @@ | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||||
| <OptimizeReferences>true</OptimizeReferences> | <OptimizeReferences>true</OptimizeReferences> | ||||
| <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> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | <PostBuildEvent> | ||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command> | |||||
| </PostBuildEvent> | </PostBuildEvent> | ||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | ||||
| @@ -156,22 +153,23 @@ | |||||
| <PrecompiledHeader> | <PrecompiledHeader> | ||||
| </PrecompiledHeader> | </PrecompiledHeader> | ||||
| <Optimization>MaxSpeed</Optimization> | <Optimization>MaxSpeed</Optimization> | ||||
| <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |||||
| <FunctionLevelLinking>true</FunctionLevelLinking> | <FunctionLevelLinking>true</FunctionLevelLinking> | ||||
| <IntrinsicFunctions>true</IntrinsicFunctions> | <IntrinsicFunctions>true</IntrinsicFunctions> | ||||
| <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <BufferSecurityCheck>false</BufferSecurityCheck> | |||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||||
| <OptimizeReferences>true</OptimizeReferences> | <OptimizeReferences>true</OptimizeReferences> | ||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| </PostBuildEvent> | |||||
| <Deploy> | |||||
| <DeploymentType>CopyToHardDrive</DeploymentType> | |||||
| </Deploy> | |||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||||
| <ImportGroup Label="ExtensionTargets"> | <ImportGroup Label="ExtensionTargets"> | ||||
+ 32
- 36
win32/tut02.vcxproj
View File
| @@ -21,36 +21,40 @@ | |||||
| <ItemGroup> | <ItemGroup> | ||||
| <ClCompile Include="..\test\tutorial\tut02.cpp" /> | <ClCompile Include="..\test\tutorial\tut02.cpp" /> | ||||
| </ItemGroup> | </ItemGroup> | ||||
| <ItemGroup> | |||||
| <ProjectReference Include="lolcore.vcxproj"> | |||||
| <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> | |||||
| </ProjectReference> | |||||
| </ItemGroup> | |||||
| <PropertyGroup Label="Globals"> | <PropertyGroup Label="Globals"> | ||||
| <ProjectGuid>{7b083da2-fe08-4f6d-bfdd-195d5c2783eb}</ProjectGuid> | <ProjectGuid>{7b083da2-fe08-4f6d-bfdd-195d5c2783eb}</ProjectGuid> | ||||
| <Keyword>Win32Proj</Keyword> | <Keyword>Win32Proj</Keyword> | ||||
| <RootNamespace>testmap</RootNamespace> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>true</UseDebugLibraries> | <UseDebugLibraries>true</UseDebugLibraries> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>true</UseDebugLibraries> | <UseDebugLibraries>true</UseDebugLibraries> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>false</UseDebugLibraries> | <UseDebugLibraries>false</UseDebugLibraries> | ||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>false</UseDebugLibraries> | <UseDebugLibraries>false</UseDebugLibraries> | ||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||||
| @@ -73,21 +77,15 @@ | |||||
| <Import Project="Contribs.props" /> | <Import Project="Contribs.props" /> | ||||
| </ImportGroup> | </ImportGroup> | ||||
| <PropertyGroup Label="UserMacros" /> | <PropertyGroup Label="UserMacros" /> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |||||
| <IntDir>Debug\$(ProjectName)\</IntDir> | |||||
| <LinkIncremental>true</LinkIncremental> | |||||
| </PropertyGroup> | |||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | |||||
| <IntDir>Debug\$(ProjectName)\</IntDir> | |||||
| <PropertyGroup Condition="'$(Configuration)'=='Debug'"> | |||||
| <LinkIncremental>true</LinkIncremental> | <LinkIncremental>true</LinkIncremental> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |||||
| <IntDir>Release\$(ProjectName)\</IntDir> | |||||
| <PropertyGroup Condition="'$(Configuration)'=='Release'"> | |||||
| <LinkIncremental>false</LinkIncremental> | <LinkIncremental>false</LinkIncremental> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | |||||
| <IntDir>Release\$(ProjectName)\</IntDir> | |||||
| <LinkIncremental>false</LinkIncremental> | |||||
| <PropertyGroup> | |||||
| <OutDir>$(Platform) $(Configuration)\</OutDir> | |||||
| <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||||
| <ClCompile> | <ClCompile> | ||||
| @@ -99,13 +97,12 @@ | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <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> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | <PostBuildEvent> | ||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command> | |||||
| </PostBuildEvent> | </PostBuildEvent> | ||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | ||||
| @@ -114,18 +111,18 @@ | |||||
| </PrecompiledHeader> | </PrecompiledHeader> | ||||
| <WarningLevel>Level3</WarningLevel> | <WarningLevel>Level3</WarningLevel> | ||||
| <Optimization>Disabled</Optimization> | <Optimization>Disabled</Optimization> | ||||
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | |||||
| <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| </PostBuildEvent> | |||||
| <Deploy> | |||||
| <DeploymentType>CopyToHardDrive</DeploymentType> | |||||
| </Deploy> | |||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||||
| <ClCompile> | <ClCompile> | ||||
| @@ -139,15 +136,14 @@ | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||||
| <OptimizeReferences>true</OptimizeReferences> | <OptimizeReferences>true</OptimizeReferences> | ||||
| <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> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | <PostBuildEvent> | ||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command> | |||||
| </PostBuildEvent> | </PostBuildEvent> | ||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | ||||
| @@ -156,22 +152,22 @@ | |||||
| <PrecompiledHeader> | <PrecompiledHeader> | ||||
| </PrecompiledHeader> | </PrecompiledHeader> | ||||
| <Optimization>MaxSpeed</Optimization> | <Optimization>MaxSpeed</Optimization> | ||||
| <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |||||
| <FunctionLevelLinking>true</FunctionLevelLinking> | <FunctionLevelLinking>true</FunctionLevelLinking> | ||||
| <IntrinsicFunctions>true</IntrinsicFunctions> | <IntrinsicFunctions>true</IntrinsicFunctions> | ||||
| <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||||
| <OptimizeReferences>true</OptimizeReferences> | <OptimizeReferences>true</OptimizeReferences> | ||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| </PostBuildEvent> | |||||
| <Deploy> | |||||
| <DeploymentType>CopyToHardDrive</DeploymentType> | |||||
| </Deploy> | |||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||||
| <ImportGroup Label="ExtensionTargets"> | <ImportGroup Label="ExtensionTargets"> | ||||
+ 32
- 36
win32/tut03.vcxproj
View File
| @@ -21,36 +21,40 @@ | |||||
| <ItemGroup> | <ItemGroup> | ||||
| <ClCompile Include="..\test\tutorial\tut03.cpp" /> | <ClCompile Include="..\test\tutorial\tut03.cpp" /> | ||||
| </ItemGroup> | </ItemGroup> | ||||
| <ItemGroup> | |||||
| <ProjectReference Include="lolcore.vcxproj"> | |||||
| <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> | |||||
| </ProjectReference> | |||||
| </ItemGroup> | |||||
| <PropertyGroup Label="Globals"> | <PropertyGroup Label="Globals"> | ||||
| <ProjectGuid>{6bf81b39-edc2-4227-9992-c2d8abea95af}</ProjectGuid> | <ProjectGuid>{6bf81b39-edc2-4227-9992-c2d8abea95af}</ProjectGuid> | ||||
| <Keyword>Win32Proj</Keyword> | <Keyword>Win32Proj</Keyword> | ||||
| <RootNamespace>testmap</RootNamespace> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>true</UseDebugLibraries> | <UseDebugLibraries>true</UseDebugLibraries> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>true</UseDebugLibraries> | <UseDebugLibraries>true</UseDebugLibraries> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>false</UseDebugLibraries> | <UseDebugLibraries>false</UseDebugLibraries> | ||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> | ||||
| <ConfigurationType>Application</ConfigurationType> | <ConfigurationType>Application</ConfigurationType> | ||||
| <UseDebugLibraries>false</UseDebugLibraries> | <UseDebugLibraries>false</UseDebugLibraries> | ||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
| <CharacterSet>Unicode</CharacterSet> | |||||
| <CharacterSet>MultiByte</CharacterSet> | |||||
| <UseOfMfc>Dynamic</UseOfMfc> | <UseOfMfc>Dynamic</UseOfMfc> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||||
| @@ -73,21 +77,15 @@ | |||||
| <Import Project="Contribs.props" /> | <Import Project="Contribs.props" /> | ||||
| </ImportGroup> | </ImportGroup> | ||||
| <PropertyGroup Label="UserMacros" /> | <PropertyGroup Label="UserMacros" /> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |||||
| <IntDir>Debug\$(ProjectName)\</IntDir> | |||||
| <LinkIncremental>true</LinkIncremental> | |||||
| </PropertyGroup> | |||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | |||||
| <IntDir>Debug\$(ProjectName)\</IntDir> | |||||
| <PropertyGroup Condition="'$(Configuration)'=='Debug'"> | |||||
| <LinkIncremental>true</LinkIncremental> | <LinkIncremental>true</LinkIncremental> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |||||
| <IntDir>Release\$(ProjectName)\</IntDir> | |||||
| <PropertyGroup Condition="'$(Configuration)'=='Release'"> | |||||
| <LinkIncremental>false</LinkIncremental> | <LinkIncremental>false</LinkIncremental> | ||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | |||||
| <IntDir>Release\$(ProjectName)\</IntDir> | |||||
| <LinkIncremental>false</LinkIncremental> | |||||
| <PropertyGroup> | |||||
| <OutDir>$(Platform) $(Configuration)\</OutDir> | |||||
| <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||||
| <ClCompile> | <ClCompile> | ||||
| @@ -99,13 +97,12 @@ | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <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> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | <PostBuildEvent> | ||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command> | |||||
| </PostBuildEvent> | </PostBuildEvent> | ||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> | ||||
| @@ -114,18 +111,18 @@ | |||||
| </PrecompiledHeader> | </PrecompiledHeader> | ||||
| <WarningLevel>Level3</WarningLevel> | <WarningLevel>Level3</WarningLevel> | ||||
| <Optimization>Disabled</Optimization> | <Optimization>Disabled</Optimization> | ||||
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | |||||
| <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| </PostBuildEvent> | |||||
| <Deploy> | |||||
| <DeploymentType>CopyToHardDrive</DeploymentType> | |||||
| </Deploy> | |||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||||
| <ClCompile> | <ClCompile> | ||||
| @@ -139,15 +136,14 @@ | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||||
| <OptimizeReferences>true</OptimizeReferences> | <OptimizeReferences>true</OptimizeReferences> | ||||
| <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> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | <PostBuildEvent> | ||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command> | |||||
| </PostBuildEvent> | </PostBuildEvent> | ||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> | ||||
| @@ -156,22 +152,22 @@ | |||||
| <PrecompiledHeader> | <PrecompiledHeader> | ||||
| </PrecompiledHeader> | </PrecompiledHeader> | ||||
| <Optimization>MaxSpeed</Optimization> | <Optimization>MaxSpeed</Optimization> | ||||
| <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |||||
| <FunctionLevelLinking>true</FunctionLevelLinking> | <FunctionLevelLinking>true</FunctionLevelLinking> | ||||
| <IntrinsicFunctions>true</IntrinsicFunctions> | <IntrinsicFunctions>true</IntrinsicFunctions> | ||||
| <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||||
| </ClCompile> | </ClCompile> | ||||
| <Link> | <Link> | ||||
| <SubSystem>Console</SubSystem> | |||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||||
| <OptimizeReferences>true</OptimizeReferences> | <OptimizeReferences>true</OptimizeReferences> | ||||
| <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> | |||||
| <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| <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> | |||||
| <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
| </Link> | </Link> | ||||
| <PostBuildEvent> | |||||
| <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> | |||||
| </PostBuildEvent> | |||||
| <Deploy> | |||||
| <DeploymentType>CopyToHardDrive</DeploymentType> | |||||
| </Deploy> | |||||
| </ItemDefinitionGroup> | </ItemDefinitionGroup> | ||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||||
| <ImportGroup Label="ExtensionTargets"> | <ImportGroup Label="ExtensionTargets"> | ||||