From 7e18aa6a2ae983642d97f474e22b2e4527172fe9 Mon Sep 17 00:00:00 2001 From: Andrew Copland Date: Fri, 28 Sep 2012 11:28:57 +0100 Subject: [PATCH 1/2] Fix the Visual Studio 2012 project files. Adding the DeadView and LuaDev files. --- win32/vc2012/pioneer.vcxproj | 800 ++++++------ win32/vc2012/pioneer.vcxproj.filters | 1688 +++++++++++++------------- 2 files changed, 1252 insertions(+), 1236 deletions(-) diff --git a/win32/vc2012/pioneer.vcxproj b/win32/vc2012/pioneer.vcxproj index 3057935b70e..ac182f2ee60 100644 --- a/win32/vc2012/pioneer.vcxproj +++ b/win32/vc2012/pioneer.vcxproj @@ -1,399 +1,403 @@ - - - - - Debug - Win32 - - - PreRelease - Win32 - - - Release - Win32 - - - - {65A1BBFB-7A42-497C-BF65-A0A06664A204} - Win32Proj - pioneer - - - - Application - true - Unicode - v110 - - - Application - true - Unicode - v110 - - - Application - false - true - Unicode - v110 - - - - - - - - - - - - - - - - - - - - - - $(Configuration)\$(ProjectName)\ - $(SolutionDir)..\..\ - $(ProjectName)-debug - - - $(Configuration)\$(ProjectName)\ - $(SolutionDir)..\..\ - $(ProjectName)-prerelease - false - - - $(Configuration)\$(ProjectName)\ - $(SolutionDir)..\..\ - - - - ../../src;../../win32/src;../../win32/include;../../contrib - - - Windows - shlwapi.lib;libogg_static_vc2012_debug.lib;libvorbis_static_vc2012_debug.lib;libvorbisfile_static_vc2012_debug.lib;sdl.lib;sdlmain.lib;opengl32.lib;glu32.lib;SDL_image.lib;freetype2312MT.lib;glew32.lib;sigc-vc2012-d-2_2_8.lib;libpng15_staticd.lib;zlibd.lib;collider.lib;galaxy.lib;graphics.lib;gui.lib;jenkins.lib;lua.lib;miniz.lib;terrain.lib;text.lib;%(AdditionalDependencies) - ../../win32/lib;$(SolutionDir)$(Configuration) - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - - - - - - Windows - shlwapi.lib;libogg_static_vc2012_release.lib;libvorbis_static_vc2012_release.lib;libvorbisfile_static_vc2012_release.lib;sdl.lib;sdlmain.lib;opengl32.lib;glu32.lib;SDL_image.lib;freetype2312MT.lib;glew32.lib;sigc-vc2012-d-2_2_8.lib;libpng15_staticd.lib;zlibd.lib;collider.lib;galaxy.lib;graphics.lib;gui.lib;jenkins.lib;lua.lib;miniz.lib;terrain.lib;text.lib;%(AdditionalDependencies) - ../../win32/lib;$(SolutionDir)$(Configuration) - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - UseLinkTimeCodeGeneration - - - - - - Windows - lua.lib;jenkins.lib;miniz.lib;shlwapi.lib;libogg_static_vc2012_release.lib;libvorbis_static_vc2012_release.lib;libvorbisfile_static_vc2012_release.lib;sdl.lib;sdlmain.lib;opengl32.lib;glu32.lib;SDL_image.lib;freetype2312MT.lib;glew32.lib;sigc-vc2012-2_2_8.lib;libpng15_static.lib;zlib.lib;text.lib;galaxy.lib;collider.lib;graphics.lib;terrain.lib;gui.lib;%(AdditionalDependencies) - ../../win32/lib;$(SolutionDir)$(Configuration) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - - - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + PreRelease + Win32 + + + Release + Win32 + + + + {65A1BBFB-7A42-497C-BF65-A0A06664A204} + Win32Proj + pioneer + + + + Application + true + Unicode + v110 + + + Application + true + Unicode + v110 + + + Application + false + true + Unicode + v110 + + + + + + + + + + + + + + + + + + + + + + $(Configuration)\$(ProjectName)\ + $(SolutionDir)..\..\ + $(ProjectName)-debug + + + $(Configuration)\$(ProjectName)\ + $(SolutionDir)..\..\ + $(ProjectName)-prerelease + false + + + $(Configuration)\$(ProjectName)\ + $(SolutionDir)..\..\ + + + + ../../src;../../win32/src;../../win32/include;../../contrib + + + Windows + shlwapi.lib;libogg_static_vc2012_debug.lib;libvorbis_static_vc2012_debug.lib;libvorbisfile_static_vc2012_debug.lib;sdl.lib;sdlmain.lib;opengl32.lib;glu32.lib;SDL_image.lib;freetype2312MT.lib;glew32.lib;sigc-vc2012-d-2_2_8.lib;libpng15_staticd.lib;zlibd.lib;collider.lib;galaxy.lib;graphics.lib;gui.lib;jenkins.lib;lua.lib;miniz.lib;terrain.lib;text.lib;%(AdditionalDependencies) + ../../win32/lib;$(SolutionDir)$(Configuration) + msvcrt.lib;%(IgnoreSpecificDefaultLibraries) + + + + + + Windows + shlwapi.lib;libogg_static_vc2012_release.lib;libvorbis_static_vc2012_release.lib;libvorbisfile_static_vc2012_release.lib;sdl.lib;sdlmain.lib;opengl32.lib;glu32.lib;SDL_image.lib;freetype2312MT.lib;glew32.lib;sigc-vc2012-d-2_2_8.lib;libpng15_staticd.lib;zlibd.lib;collider.lib;galaxy.lib;graphics.lib;gui.lib;jenkins.lib;lua.lib;miniz.lib;terrain.lib;text.lib;%(AdditionalDependencies) + ../../win32/lib;$(SolutionDir)$(Configuration) + msvcrt.lib;%(IgnoreSpecificDefaultLibraries) + UseLinkTimeCodeGeneration + + + + + + Windows + lua.lib;jenkins.lib;miniz.lib;shlwapi.lib;libogg_static_vc2012_release.lib;libvorbis_static_vc2012_release.lib;libvorbisfile_static_vc2012_release.lib;sdl.lib;sdlmain.lib;opengl32.lib;glu32.lib;SDL_image.lib;freetype2312MT.lib;glew32.lib;sigc-vc2012-2_2_8.lib;libpng15_static.lib;zlib.lib;text.lib;galaxy.lib;collider.lib;graphics.lib;terrain.lib;gui.lib;%(AdditionalDependencies) + ../../win32/lib;$(SolutionDir)$(Configuration) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + + + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/win32/vc2012/pioneer.vcxproj.filters b/win32/vc2012/pioneer.vcxproj.filters index 88aec53bbf2..ef9a80d3b63 100644 --- a/win32/vc2012/pioneer.vcxproj.filters +++ b/win32/vc2012/pioneer.vcxproj.filters @@ -1,839 +1,851 @@ - - - - - {2ef8ea5b-7c53-4337-93b0-a929d9103bd6} - - - {172c1b95-e18a-4158-8227-10b5cc882b62} - - - {6d264ce7-1454-4144-a050-a665481a0a20} - - - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src\win32 - - - src\win32 - - - src\win32 - - - src\posix - - - src\posix - - - src\win32 - - - src - - - src - - - src - - - src - - - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src\win32 - - - src - - - src\win32 - - - src\win32 - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - - - src - - + + + + + {2ef8ea5b-7c53-4337-93b0-a929d9103bd6} + + + {172c1b95-e18a-4158-8227-10b5cc882b62} + + + {6d264ce7-1454-4144-a050-a665481a0a20} + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src\win32 + + + src\win32 + + + src\win32 + + + src\posix + + + src\posix + + + src\win32 + + + src + + + src + + + src + + + src + + + src + + + src + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src\win32 + + + src + + + src\win32 + + + src\win32 + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + + + src + + \ No newline at end of file From 231a67ab6c6beafd4e2697eb374ab80a15a3b82f Mon Sep 17 00:00:00 2001 From: Andrew Copland Date: Fri, 28 Sep 2012 11:29:26 +0100 Subject: [PATCH 2/2] Also noticed the VC2010 files were bust for the same reason. Fix those too. --- win32/vc2010/pioneer.vcxproj | 4 ++++ win32/vc2010/pioneer.vcxproj.filters | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/win32/vc2010/pioneer.vcxproj b/win32/vc2010/pioneer.vcxproj index 3808e15f4ec..f33d18261ea 100755 --- a/win32/vc2010/pioneer.vcxproj +++ b/win32/vc2010/pioneer.vcxproj @@ -111,6 +111,7 @@ + @@ -141,6 +142,7 @@ + @@ -258,6 +260,7 @@ + @@ -291,6 +294,7 @@ + diff --git a/win32/vc2010/pioneer.vcxproj.filters b/win32/vc2010/pioneer.vcxproj.filters index 133ebbdf0df..7698988755e 100644 --- a/win32/vc2010/pioneer.vcxproj.filters +++ b/win32/vc2010/pioneer.vcxproj.filters @@ -393,6 +393,12 @@ src + + src + + + src + @@ -833,6 +839,12 @@ src + + src + + + src +