From 2831476774c995abb28a48c721f040bc2e59ae73 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Wed, 4 Apr 2012 18:40:04 +0000 Subject: [PATCH] build: major refactoring of the Win32 and Xbox project files; we now link properly on the Xbox. --- .gitignore | 4 +- src/gradient.cpp | 9 +++-- src/platform/xbox/xboxapp.cpp | 2 + src/video.cpp | 7 ++++ test/benchmark/trig.cpp | 7 +++- test/tutorial/tut01.cpp | 60 +++++++++++++++++++++++++----- win32/benchsuite.vcxproj | 68 ++++++++++++++++------------------ win32/deushax.vcxproj | 68 ++++++++++++++++------------------ win32/editor.vcxproj | 68 ++++++++++++++++------------------ win32/lolcore.vcxproj | 32 +++++++++------- win32/lolengine.sln | 5 +++ win32/monsterz.vcxproj | 68 ++++++++++++++++------------------ win32/mrpigeon.vcxproj | 68 ++++++++++++++++------------------ win32/quad.vcxproj | 68 ++++++++++++++++------------------ win32/testsuite.vcxproj | 68 ++++++++++++++++------------------ win32/tut01.vcxproj | 70 +++++++++++++++++------------------ win32/tut02.vcxproj | 68 ++++++++++++++++------------------ win32/tut03.vcxproj | 68 ++++++++++++++++------------------ 18 files changed, 416 insertions(+), 392 deletions(-) diff --git a/.gitignore b/.gitignore index 716ebec0..3d5a4b39 100644 --- a/.gitignore +++ b/.gitignore @@ -36,8 +36,8 @@ vgcore.* .*.swp *~ # Visual Studio cruft -win32/Debug -win32/Release +win32/*Debug +win32/*Release win32/*.vcxproj.user win32/*.sdf win32/*.suo diff --git a/src/gradient.cpp b/src/gradient.cpp index 72edcbc0..3fed292b 100644 --- a/src/gradient.cpp +++ b/src/gradient.cpp @@ -12,8 +12,6 @@ # include "config.h" #endif -#if !defined _XBOX /* This file is meaningless on Xbox */ - #include #include "core.h" @@ -34,10 +32,13 @@ class GradientData private: Shader *shader; +#if !defined _XBOX /* This file is meaningless on Xbox */ + GLuint bufs[2]; #if defined HAVE_GL_2X && !defined __APPLE__ GLuint vaos[1]; #endif +#endif }; /* @@ -64,6 +65,7 @@ void Gradient::TickDraw(float deltams) { Entity::TickDraw(deltams); +#if !defined _XBOX /* This file is meaningless on Xbox */ if (!data->shader) { #if !defined __CELLOS_LV2__ @@ -233,6 +235,7 @@ void Gradient::TickDraw(float deltams) glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_COLOR_ARRAY); #endif +#endif } Gradient::~Gradient() @@ -242,5 +245,3 @@ Gradient::~Gradient() } } /* namespace lol */ - -#endif /* !defined _XBOX */ diff --git a/src/platform/xbox/xboxapp.cpp b/src/platform/xbox/xboxapp.cpp index 79759d4c..1ebdb633 100644 --- a/src/platform/xbox/xboxapp.cpp +++ b/src/platform/xbox/xboxapp.cpp @@ -60,6 +60,8 @@ void XboxApp::Run() Ticker::TickDraw(); #if defined _XBOX + extern D3DDevice *g_d3ddevice; + g_d3ddevice->Present(NULL, NULL, NULL, NULL); #endif } } diff --git a/src/video.cpp b/src/video.cpp index 0d74ee2f..71440533 100644 --- a/src/video.cpp +++ b/src/video.cpp @@ -30,6 +30,11 @@ using namespace std; +#if defined _XBOX +/* FIXME: g_d3ddevice should never be exported */ +D3DDevice *g_d3ddevice; +#endif + namespace lol { @@ -96,6 +101,8 @@ void Video::Setup(ivec2 size) Log::Error("cannot create D3D device\n"); exit(EXIT_FAILURE); } + + g_d3ddevice = VideoData::d3d_dev; #else # if defined USE_GLEW && !defined __APPLE__ /* Initialise GLEW if necessary */ diff --git a/test/benchmark/trig.cpp b/test/benchmark/trig.cpp index 33697350..c82e7efe 100644 --- a/test/benchmark/trig.cpp +++ b/test/benchmark/trig.cpp @@ -1,7 +1,7 @@ // // Lol Engine - Benchmark program // -// Copyright: (c) 2005-2011 Sam Hocevar +// Copyright: (c) 2005-2012 Sam Hocevar // 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 // Public License, Version 2, as published by Sam Hocevar. See @@ -12,7 +12,10 @@ # include "config.h" #endif -#ifdef WIN32 +#if defined _XBOX +# define _USE_MATH_DEFINES /* for M_PI */ +# include +#elif defined _WIN32 # define _USE_MATH_DEFINES /* for M_PI */ # define WIN32_LEAN_AND_MEAN # include diff --git a/test/tutorial/tut01.cpp b/test/tutorial/tut01.cpp index e320fc30..330554d5 100644 --- a/test/tutorial/tut01.cpp +++ b/test/tutorial/tut01.cpp @@ -1,7 +1,7 @@ // // Lol Engine - Triangle tutorial // -// Copyright: (c) 2011 Sam Hocevar +// Copyright: (c) 2012 Sam Hocevar // 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 // Public License, Version 2, as published by Sam Hocevar. See @@ -49,6 +49,7 @@ public: if (!m_ready) { m_shader = Shader::Create( +#if !defined __CELLOS_LV2__ && !defined _XBOX "#version 120\n" "attribute vec2 coord2d;" "void main(void) {" @@ -60,18 +61,45 @@ public: " gl_FragColor[0] = 0.0;" " gl_FragColor[1] = 0.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_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 */ glGenBuffers(1, &m_vbo); glBindBuffer(GL_ARRAY_BUFFER, m_vbo); glBufferData(GL_ARRAY_BUFFER, sizeof(m_vertices), m_vertices, 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 */ +#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 #endif @@ -79,7 +107,11 @@ public: } 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); glEnableVertexAttribArray(m_attrib); glVertexAttribPointer(m_attrib, 2, GL_FLOAT, GL_FALSE, 0, 0); @@ -92,9 +124,15 @@ public: glVertexPointer(3, GL_FLOAT, 0, m_vertices); #endif +#if defined _XBOX + g_d3ddevice->DrawPrimitive(D3DPT_TRIANGLELIST, 0, 1); +#else 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); glBindBuffer(GL_ARRAY_BUFFER, 0); #elif !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ @@ -108,7 +146,10 @@ public: private: vec2 m_vertices[3]; 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; #endif int m_attrib; @@ -119,9 +160,9 @@ int main(int argc, char **argv) { Application app("Tutorial 1: Triangle", ivec2(640, 480), 60.0f); -#if defined _MSC_VER +#if defined _MSC_VER && !defined _XBOX _chdir(".."); -#elif defined _WIN32 +#elif defined _WIN32 && !defined _XBOX _chdir("../.."); #endif @@ -129,7 +170,6 @@ int main(int argc, char **argv) new Triangle(); app.Run(); - return EXIT_SUCCESS; } diff --git a/win32/benchsuite.vcxproj b/win32/benchsuite.vcxproj index af966b31..a4bf2315 100644 --- a/win32/benchsuite.vcxproj +++ b/win32/benchsuite.vcxproj @@ -25,36 +25,40 @@ + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + {B1E10086-A1DA-401A-834D-969C9DBB5CC1} Win32Proj - testmap Application true - Unicode + MultiByte Dynamic Application true - Unicode + MultiByte Dynamic Application false true - Unicode + MultiByte Dynamic Application false true - Unicode + MultiByte Dynamic @@ -77,21 +81,15 @@ - - Debug\$(ProjectName)\ - true - - - Debug\$(ProjectName)\ + true - - Release\$(ProjectName)\ + false - - Release\$(ProjectName)\ - false + + $(Platform) $(Configuration)\ + $(Platform) $(Configuration)\$(ProjectName)\ @@ -104,13 +102,12 @@ Fast - Console true - 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 + 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) $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) + for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)" @@ -119,19 +116,19 @@ Level3 Disabled + MultiThreadedDebug _XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions) - $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;%(AdditionalIncludeDirectories) Fast - Console true - 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 - $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) + 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) + %(AdditionalLibraryDirectories) - - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) - + + CopyToHardDrive + @@ -146,15 +143,14 @@ Fast - Console true true true - 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 + 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) $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) + for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)" @@ -163,23 +159,23 @@ MaxSpeed + MultiThreaded true true _XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions) - $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;%(AdditionalIncludeDirectories) Fast - Console true true true - 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 - $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) + xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) - - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) - + + CopyToHardDrive + diff --git a/win32/deushax.vcxproj b/win32/deushax.vcxproj index 031fab6b..d6bb234d 100644 --- a/win32/deushax.vcxproj +++ b/win32/deushax.vcxproj @@ -27,36 +27,40 @@ + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + {EF1A4E80-63FA-4EB0-B834-12B6C500F31C} Win32Proj - testmap Application true - Unicode + MultiByte Dynamic Application true - Unicode + MultiByte Dynamic Application false true - Unicode + MultiByte Dynamic Application false true - Unicode + MultiByte Dynamic @@ -79,21 +83,15 @@ - - Debug\$(ProjectName)\ - true - - - Debug\$(ProjectName)\ + true - - Release\$(ProjectName)\ + false - - Release\$(ProjectName)\ - false + + $(Platform) $(Configuration)\ + $(Platform) $(Configuration)\$(ProjectName)\ @@ -105,13 +103,12 @@ $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) - Console true - 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 + 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) $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) + for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)" @@ -120,18 +117,18 @@ Level3 Disabled + MultiThreadedDebug _XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions) - $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;%(AdditionalIncludeDirectories) - Console true - 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 - $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) + 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) + %(AdditionalLibraryDirectories) - - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) - + + CopyToHardDrive + @@ -145,15 +142,14 @@ $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) - Console true true true - 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 + 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) $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) + for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)" @@ -162,22 +158,22 @@ MaxSpeed + MultiThreaded true true _XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions) - $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;%(AdditionalIncludeDirectories) - Console true true true - 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 - $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) + xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) - - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) - + + CopyToHardDrive + diff --git a/win32/editor.vcxproj b/win32/editor.vcxproj index 50ed84f9..307cd6c0 100644 --- a/win32/editor.vcxproj +++ b/win32/editor.vcxproj @@ -27,36 +27,40 @@ + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + {9C66B179-0737-4BDA-AB42-2ADE478A9008} Win32Proj - testmap Application true - Unicode + MultiByte Dynamic Application true - Unicode + MultiByte Dynamic Application false true - Unicode + MultiByte Dynamic Application false true - Unicode + MultiByte Dynamic @@ -79,21 +83,15 @@ - - Debug\$(ProjectName)\ - true - - - Debug\$(ProjectName)\ + true - - Release\$(ProjectName)\ + false - - Release\$(ProjectName)\ - false + + $(Platform) $(Configuration)\ + $(Platform) $(Configuration)\$(ProjectName)\ @@ -105,13 +103,12 @@ $(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GlIncludes);$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories) - Console true - 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 + 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) $(SdlLibs);$(GlLibs);$(GtkLibs);%(AdditionalLibraryDirectories) - for %%I in ($(GtkLibs) $(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) + for %%I in ($(GtkLibs) $(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)" @@ -120,18 +117,18 @@ Level3 Disabled + MultiThreadedDebug _XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions) - $(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GlIncludes);$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories) - Console true - 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 - $(SdlLibs);$(GlLibs);$(GtkLibs);%(AdditionalLibraryDirectories) + 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) + %(AdditionalLibraryDirectories) - - for %%I in ($(GtkLibs) $(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) - + + CopyToHardDrive + @@ -145,15 +142,14 @@ $(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GlIncludes);$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories) - Console true true true - 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 + 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) $(SdlLibs);$(GlLibs);$(GtkLibs);%(AdditionalLibraryDirectories) - for %%I in ($(GtkLibs) $(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) + for %%I in ($(GtkLibs) $(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)" @@ -162,22 +158,22 @@ MaxSpeed + MultiThreaded true true _XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions) - $(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GlIncludes);$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories) - Console true true true - 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 - $(SdlLibs);$(GlLibs);$(GtkLibs);%(AdditionalLibraryDirectories) + xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) - - for %%I in ($(GtkLibs) $(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) - + + CopyToHardDrive + diff --git a/win32/lolcore.vcxproj b/win32/lolcore.vcxproj index 06033f77..8f1f2207 100644 --- a/win32/lolcore.vcxproj +++ b/win32/lolcore.vcxproj @@ -21,30 +21,27 @@ {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} Win32Proj - lolcore StaticLibrary true - Unicode + MultiByte StaticLibrary - true - Unicode + MultiByte StaticLibrary false true - Unicode + MultiByte StaticLibrary - false true - Unicode + MultiByte @@ -66,7 +63,16 @@ - + + true + + + false + + + $(Platform) $(Configuration)\ + $(Platform) $(Configuration)\$(ProjectName)\ + @@ -78,7 +84,6 @@ Fast - Windows true @@ -88,12 +93,12 @@ Level3 Disabled + MultiThreadedDebug _XBOX;_DEBUG;_LIB;$(XboxDefines);%(PreprocessorDefinitions) - $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;%(AdditionalIncludeDirectories) Fast - Windows true @@ -111,7 +116,6 @@ Fast - Windows true true true @@ -124,14 +128,14 @@ MaxSpeed true + MultiThreaded true _XBOX;NDEBUG;_LIB;$(XboxDefines);%(PreprocessorDefinitions) - $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;%(AdditionalIncludeDirectories) Speed Fast - Windows true true true diff --git a/win32/lolengine.sln b/win32/lolengine.sln index 9a85e746..360d84b1 100644 --- a/win32/lolengine.sln +++ b/win32/lolengine.sln @@ -63,6 +63,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrpigeon", "mrpigeon.vcxpro {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Games", "Games", "{1DFE1729-4F1B-47CA-9819-72431FE14E25}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -196,5 +198,8 @@ Global {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB} = {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} + {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 EndGlobal diff --git a/win32/monsterz.vcxproj b/win32/monsterz.vcxproj index 1bf69c40..8c5095b0 100644 --- a/win32/monsterz.vcxproj +++ b/win32/monsterz.vcxproj @@ -38,36 +38,40 @@ + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + {17f0f184-4436-4d08-b8aa-16572ea238db} Win32Proj - testmap Application true - Unicode + MultiByte Dynamic Application true - Unicode + MultiByte Dynamic Application false true - Unicode + MultiByte Dynamic Application false true - Unicode + MultiByte Dynamic @@ -90,21 +94,15 @@ - - Debug\$(ProjectName)\ - true - - - Debug\$(ProjectName)\ + true - - Release\$(ProjectName)\ + false - - Release\$(ProjectName)\ - false + + $(Platform) $(Configuration)\ + $(Platform) $(Configuration)\$(ProjectName)\ @@ -116,13 +114,12 @@ $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) - Console true - 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 + 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) $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) + for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)" @@ -131,18 +128,18 @@ Level3 Disabled + MultiThreadedDebug _XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions) - $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;%(AdditionalIncludeDirectories) - Console true - 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 - $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) + 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) + %(AdditionalLibraryDirectories) - - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) - + + CopyToHardDrive + @@ -156,15 +153,14 @@ $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) - Console true true true - 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 + 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) $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) + for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)" @@ -173,22 +169,22 @@ MaxSpeed + MultiThreaded true true _XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions) - $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;%(AdditionalIncludeDirectories) - Console true true true - 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 - $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) + xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) - - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) - + + CopyToHardDrive + diff --git a/win32/mrpigeon.vcxproj b/win32/mrpigeon.vcxproj index 8be8e551..4ba4f616 100644 --- a/win32/mrpigeon.vcxproj +++ b/win32/mrpigeon.vcxproj @@ -24,36 +24,40 @@ + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + {32f3f8cf-d22e-45e4-beb8-ad909e8c5515} Win32Proj - testmap Application true - Unicode + MultiByte Dynamic Application true - Unicode + MultiByte Dynamic Application false true - Unicode + MultiByte Dynamic Application false true - Unicode + MultiByte Dynamic @@ -76,21 +80,15 @@ - - Debug\$(ProjectName)\ - true - - - Debug\$(ProjectName)\ + true - - Release\$(ProjectName)\ + false - - Release\$(ProjectName)\ - false + + $(Platform) $(Configuration)\ + $(Platform) $(Configuration)\$(ProjectName)\ @@ -102,13 +100,12 @@ $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) - Console true - 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 + 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) $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) + for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)" @@ -117,18 +114,18 @@ Level3 Disabled + MultiThreadedDebug _XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions) - $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;%(AdditionalIncludeDirectories) - Console true - 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 - $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) + 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) + %(AdditionalLibraryDirectories) - - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) - + + CopyToHardDrive + @@ -142,15 +139,14 @@ $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) - Console true true true - 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 + 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) $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) + for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)" @@ -159,22 +155,22 @@ MaxSpeed + MultiThreaded true true _XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions) - $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;%(AdditionalIncludeDirectories) - Console true true true - 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 - $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) + xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) - - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) - + + CopyToHardDrive + diff --git a/win32/quad.vcxproj b/win32/quad.vcxproj index 8023c857..e4bf6cf4 100644 --- a/win32/quad.vcxproj +++ b/win32/quad.vcxproj @@ -21,36 +21,40 @@ + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E} Win32Proj - testmap Application true - Unicode + MultiByte Dynamic Application true - Unicode + MultiByte Dynamic Application false true - Unicode + MultiByte Dynamic Application false true - Unicode + MultiByte Dynamic @@ -73,21 +77,15 @@ - - Debug\$(ProjectName)\ - true - - - Debug\$(ProjectName)\ + true - - Release\$(ProjectName)\ + false - - Release\$(ProjectName)\ - false + + $(Platform) $(Configuration)\ + $(Platform) $(Configuration)\$(ProjectName)\ @@ -99,13 +97,12 @@ $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) - Console true - 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 + 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) $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) + for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)" @@ -114,18 +111,18 @@ Level3 Disabled + MultiThreadedDebug _XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions) - $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;%(AdditionalIncludeDirectories) - Console true - 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 - $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) + 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) + %(AdditionalLibraryDirectories) - - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) - + + CopyToHardDrive + @@ -139,15 +136,14 @@ $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) - Console true true true - 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 + 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) $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) + for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)" @@ -156,22 +152,22 @@ MaxSpeed + MultiThreaded true true _XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions) - $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;%(AdditionalIncludeDirectories) - Console true true true - 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 - $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) + xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) - - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) - + + CopyToHardDrive + diff --git a/win32/testsuite.vcxproj b/win32/testsuite.vcxproj index 80fcf932..db7c9026 100644 --- a/win32/testsuite.vcxproj +++ b/win32/testsuite.vcxproj @@ -29,36 +29,40 @@ + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + {80F81C11-8DA2-4990-91CB-9807783BA46E} Win32Proj - testmap Application true - Unicode + MultiByte Dynamic Application true - Unicode + MultiByte Dynamic Application false true - Unicode + MultiByte Dynamic Application false true - Unicode + MultiByte Dynamic @@ -81,21 +85,15 @@ - - Debug\$(ProjectName)\ - true - - - Debug\$(ProjectName)\ + true - - Release\$(ProjectName)\ + false - - Release\$(ProjectName)\ - false + + $(Platform) $(Configuration)\ + $(Platform) $(Configuration)\$(ProjectName)\ @@ -108,13 +106,12 @@ Fast - Console true - 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 + 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) $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) + for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)" @@ -123,19 +120,19 @@ Level3 Disabled + MultiThreadedDebug _XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions) - $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;%(AdditionalIncludeDirectories) Fast - Console true - 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 - $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) + 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) + %(AdditionalLibraryDirectories) - - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) - + + CopyToHardDrive + @@ -150,15 +147,14 @@ Fast - Console true true true - 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 + 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) $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) + for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)" @@ -167,23 +163,23 @@ MaxSpeed + MultiThreaded true true _XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions) - $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;%(AdditionalIncludeDirectories) Fast - Console true true true - 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 - $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) + xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) - - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) - + + CopyToHardDrive + diff --git a/win32/tut01.vcxproj b/win32/tut01.vcxproj index 3b041f83..803af519 100644 --- a/win32/tut01.vcxproj +++ b/win32/tut01.vcxproj @@ -21,36 +21,40 @@ + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + {b92abadc-45be-4cc5-b724-9426053123a1} Win32Proj - testmap Application true - Unicode + MultiByte Dynamic Application true - Unicode + MultiByte Dynamic Application false true - Unicode + MultiByte Dynamic Application false true - Unicode + MultiByte Dynamic @@ -73,21 +77,15 @@ - - Debug\$(ProjectName)\ - true - - - Debug\$(ProjectName)\ + true - - Release\$(ProjectName)\ + false - - Release\$(ProjectName)\ - false + + $(Platform) $(Configuration)\ + $(Platform) $(Configuration)\$(ProjectName)\ @@ -99,13 +97,12 @@ $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) - Console true - 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 + 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) $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) + for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)" @@ -114,18 +111,19 @@ Level3 Disabled + MultiThreadedDebug _XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions) - $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;%(AdditionalIncludeDirectories) + false - Console true - 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 - $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) + 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) + %(AdditionalLibraryDirectories) - - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) - + + CopyToHardDrive + @@ -139,15 +137,14 @@ $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) - Console true true true - 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 + 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) $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) + for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)" @@ -156,22 +153,23 @@ MaxSpeed + MultiThreaded true true _XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions) - $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;%(AdditionalIncludeDirectories) + false - Console true true true - 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 - $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) + xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) - - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) - + + CopyToHardDrive + diff --git a/win32/tut02.vcxproj b/win32/tut02.vcxproj index ae73fa56..096e58f9 100644 --- a/win32/tut02.vcxproj +++ b/win32/tut02.vcxproj @@ -21,36 +21,40 @@ + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + {7b083da2-fe08-4f6d-bfdd-195d5c2783eb} Win32Proj - testmap Application true - Unicode + MultiByte Dynamic Application true - Unicode + MultiByte Dynamic Application false true - Unicode + MultiByte Dynamic Application false true - Unicode + MultiByte Dynamic @@ -73,21 +77,15 @@ - - Debug\$(ProjectName)\ - true - - - Debug\$(ProjectName)\ + true - - Release\$(ProjectName)\ + false - - Release\$(ProjectName)\ - false + + $(Platform) $(Configuration)\ + $(Platform) $(Configuration)\$(ProjectName)\ @@ -99,13 +97,12 @@ $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) - Console true - 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 + 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) $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) + for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)" @@ -114,18 +111,18 @@ Level3 Disabled + MultiThreadedDebug _XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions) - $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;%(AdditionalIncludeDirectories) - Console true - 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 - $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) + 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) + %(AdditionalLibraryDirectories) - - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) - + + CopyToHardDrive + @@ -139,15 +136,14 @@ $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) - Console true true true - 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 + 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) $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) + for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)" @@ -156,22 +152,22 @@ MaxSpeed + MultiThreaded true true _XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions) - $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;%(AdditionalIncludeDirectories) - Console true true true - 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 - $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) + xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) - - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) - + + CopyToHardDrive + diff --git a/win32/tut03.vcxproj b/win32/tut03.vcxproj index afe426b8..d51e6cb6 100644 --- a/win32/tut03.vcxproj +++ b/win32/tut03.vcxproj @@ -21,36 +21,40 @@ + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + {6bf81b39-edc2-4227-9992-c2d8abea95af} Win32Proj - testmap Application true - Unicode + MultiByte Dynamic Application true - Unicode + MultiByte Dynamic Application false true - Unicode + MultiByte Dynamic Application false true - Unicode + MultiByte Dynamic @@ -73,21 +77,15 @@ - - Debug\$(ProjectName)\ - true - - - Debug\$(ProjectName)\ + true - - Release\$(ProjectName)\ + false - - Release\$(ProjectName)\ - false + + $(Platform) $(Configuration)\ + $(Platform) $(Configuration)\$(ProjectName)\ @@ -99,13 +97,12 @@ $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) - Console true - 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 + 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) $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) + for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)" @@ -114,18 +111,18 @@ Level3 Disabled + MultiThreadedDebug _XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions) - $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;%(AdditionalIncludeDirectories) - Console true - 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 - $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) + 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) + %(AdditionalLibraryDirectories) - - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) - + + CopyToHardDrive + @@ -139,15 +136,14 @@ $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) - Console true true true - 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 + 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) $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) + for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)" @@ -156,22 +152,22 @@ MaxSpeed + MultiThreaded true true _XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions) - $(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;%(AdditionalIncludeDirectories) - Console true true true - 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 - $(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories) + xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) - - for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir) - + + CopyToHardDrive +