From 1fd75915a9f53e8a1f97afe4f63611b0444b7edb Mon Sep 17 00:00:00 2001 From: stephenjust Date: Fri, 20 Jul 2012 22:17:45 +0000 Subject: [PATCH] Add x64 configs which I've been using to the VC10 project. Need to compile 64-bit dependencies to use. Shouldn't affect normal 32-bit compilation. git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11411 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/ide/vc10/bullet_lib.vcxproj | 56 ++++++++++++++++++ src/ide/vc10/enet.vcxproj | 59 +++++++++++++++++++ src/ide/vc10/supertuxkart.sln | 16 +++++- src/ide/vc10/supertuxkart.vcxproj | 95 +++++++++++++++++++++++++++++++ 4 files changed, 225 insertions(+), 1 deletion(-) diff --git a/src/ide/vc10/bullet_lib.vcxproj b/src/ide/vc10/bullet_lib.vcxproj index b75095a02..c0ebbadc9 100644 --- a/src/ide/vc10/bullet_lib.vcxproj +++ b/src/ide/vc10/bullet_lib.vcxproj @@ -5,10 +5,18 @@ debug Win32 + + debug + x64 + Release Win32 + + Release + x64 + {54AA44B9-B07B-49DA-8B1A-05BBFE8AD5D4} @@ -21,28 +29,49 @@ MultiByte false + + StaticLibrary + MultiByte + false + StaticLibrary MultiByte false true + + StaticLibrary + MultiByte + false + true + + + + + + + <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ @@ -57,6 +86,18 @@ ProgramDatabase + + + false + ..\..\bullet\src;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;BT_NO_PROFILE;HAVE_GLUT;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + Disabled @@ -72,6 +113,21 @@ EditAndContinue + + + Disabled + ..\..\bullet\src;%(AdditionalIncludeDirectories) + WIN32;BT_NO_PROFILE;HAVE_GLUT;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + false + + + Level3 + ProgramDatabase + true + + true diff --git a/src/ide/vc10/enet.vcxproj b/src/ide/vc10/enet.vcxproj index bc9faffce..d3239d7a9 100644 --- a/src/ide/vc10/enet.vcxproj +++ b/src/ide/vc10/enet.vcxproj @@ -5,10 +5,18 @@ debug Win32 + + debug + x64 + Release Win32 + + Release + x64 + {B0E92B97-089A-4D5B-BF17-77F1BC5DAEEF} @@ -21,27 +29,47 @@ Unicode true + + StaticLibrary + Unicode + true + StaticLibrary Unicode true + + StaticLibrary + Unicode + true + + + + + + + <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ @@ -58,6 +86,21 @@ ProgramDatabase + + + MaxSpeed + true + false + ../../enet/include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + MaxSpeed @@ -73,6 +116,22 @@ ProgramDatabase + + + MaxSpeed + true + false + ../../enet/include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + true + + diff --git a/src/ide/vc10/supertuxkart.sln b/src/ide/vc10/supertuxkart.sln index aee17a5e8..c90b4ec60 100644 --- a/src/ide/vc10/supertuxkart.sln +++ b/src/ide/vc10/supertuxkart.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "supertuxkart", "supertuxkart.vcxproj", "{B1BC2764-1A43-4800-A654-788B0D05EDA2}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bullet_lib", "bullet_lib.vcxproj", "{54AA44B9-B07B-49DA-8B1A-05BBFE8AD5D4}" @@ -10,21 +10,35 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug|Win32 = debug|Win32 + debug|x64 = debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B1BC2764-1A43-4800-A654-788B0D05EDA2}.debug|Win32.ActiveCfg = debug|Win32 {B1BC2764-1A43-4800-A654-788B0D05EDA2}.debug|Win32.Build.0 = debug|Win32 + {B1BC2764-1A43-4800-A654-788B0D05EDA2}.debug|x64.ActiveCfg = debug|x64 + {B1BC2764-1A43-4800-A654-788B0D05EDA2}.debug|x64.Build.0 = debug|x64 {B1BC2764-1A43-4800-A654-788B0D05EDA2}.Release|Win32.ActiveCfg = Release|Win32 {B1BC2764-1A43-4800-A654-788B0D05EDA2}.Release|Win32.Build.0 = Release|Win32 + {B1BC2764-1A43-4800-A654-788B0D05EDA2}.Release|x64.ActiveCfg = Release|x64 + {B1BC2764-1A43-4800-A654-788B0D05EDA2}.Release|x64.Build.0 = Release|x64 {54AA44B9-B07B-49DA-8B1A-05BBFE8AD5D4}.debug|Win32.ActiveCfg = debug|Win32 {54AA44B9-B07B-49DA-8B1A-05BBFE8AD5D4}.debug|Win32.Build.0 = debug|Win32 + {54AA44B9-B07B-49DA-8B1A-05BBFE8AD5D4}.debug|x64.ActiveCfg = debug|x64 + {54AA44B9-B07B-49DA-8B1A-05BBFE8AD5D4}.debug|x64.Build.0 = debug|x64 {54AA44B9-B07B-49DA-8B1A-05BBFE8AD5D4}.Release|Win32.ActiveCfg = Release|Win32 {54AA44B9-B07B-49DA-8B1A-05BBFE8AD5D4}.Release|Win32.Build.0 = Release|Win32 + {54AA44B9-B07B-49DA-8B1A-05BBFE8AD5D4}.Release|x64.ActiveCfg = Release|x64 + {54AA44B9-B07B-49DA-8B1A-05BBFE8AD5D4}.Release|x64.Build.0 = Release|x64 {B0E92B97-089A-4D5B-BF17-77F1BC5DAEEF}.debug|Win32.ActiveCfg = debug|Win32 {B0E92B97-089A-4D5B-BF17-77F1BC5DAEEF}.debug|Win32.Build.0 = debug|Win32 + {B0E92B97-089A-4D5B-BF17-77F1BC5DAEEF}.debug|x64.ActiveCfg = debug|x64 + {B0E92B97-089A-4D5B-BF17-77F1BC5DAEEF}.debug|x64.Build.0 = debug|x64 {B0E92B97-089A-4D5B-BF17-77F1BC5DAEEF}.Release|Win32.ActiveCfg = Release|Win32 {B0E92B97-089A-4D5B-BF17-77F1BC5DAEEF}.Release|Win32.Build.0 = Release|Win32 + {B0E92B97-089A-4D5B-BF17-77F1BC5DAEEF}.Release|x64.ActiveCfg = Release|x64 + {B0E92B97-089A-4D5B-BF17-77F1BC5DAEEF}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/ide/vc10/supertuxkart.vcxproj b/src/ide/vc10/supertuxkart.vcxproj index 997970111..b90e8d9ce 100644 --- a/src/ide/vc10/supertuxkart.vcxproj +++ b/src/ide/vc10/supertuxkart.vcxproj @@ -5,10 +5,18 @@ debug Win32 + + debug + x64 + Release Win32 + + Release + x64 + {B1BC2764-1A43-4800-A654-788B0D05EDA2} @@ -20,30 +28,52 @@ Application MultiByte + + Application + MultiByte + Application MultiByte true + + Application + MultiByte + true + + + + + + + <_ProjectFileVersion>10.0.30319.1 ..\..\../ + ..\..\../ $(Configuration)\ + $(Configuration)\ false + false ..\..\../ + ..\..\../ $(Configuration)\ + $(Configuration)\ true + true $(ProjectName)_d + $(ProjectName)_d @@ -71,6 +101,31 @@ MachineX86 + + + true + ../../../src;../../../src/bullet/src;../../../src/enet/include;../../../dependencies/include;../../../dependencies/include/irrlicht;%(AdditionalIncludeDirectories) + HAVE_OGGVORBIS;NDEBUG;_CONSOLE;WIN32;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;BT_NO_PROFILE;PACKAGE="supertuxkart";ENABLE_BIDI;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + opengl32.lib;user32.lib;gdi32.lib;winmm.lib;advapi32.lib;OpenAL32.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;Irrlicht.lib.release;ws2_32.lib;fribidi.lib;pthreadVC2.lib;libcurl_imp.lib;%(AdditionalDependencies) + $(OutDir)/$(ProjectName).exe + ../../../dependencies/lib;%(AdditionalLibraryDirectories) + libcmt.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + false + + + + Disabled @@ -109,6 +164,43 @@ false + + + Disabled + false + ../../../src;../../../src/bullet/src;../../../src/enet/include;../../../dependencies/include;../../../dependencies/include/irrlicht;%(AdditionalIncludeDirectories) + BT_NO_PROFILE;HAVE_OGGVORBIS;_DEBUG;_CONSOLE;WIN32;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;PACKAGE="supertuxkart";_CRTDBG_MAP_ALLOC;ENABLE_BIDI;ADDONS_MANAGER;%(PreprocessorDefinitions) + false + false + EnableFastChecks + MultiThreadedDebugDLL + false + + + Level3 + ProgramDatabase + true + + + opengl32.lib;user32.lib;gdi32.lib;winmm.lib;advapi32.lib;OpenAL32.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;Irrlicht.lib;ws2_32.lib;fribidi.lib;libpthread.a;libcurl.lib;%(AdditionalDependencies) + $(TargetPath) + ../../../dependencies/lib;%(AdditionalLibraryDirectories) + false + libcmt.lib;%(IgnoreSpecificDefaultLibraries) + true + false + + + false + Console + + + false + + + false + + @@ -146,8 +238,11 @@ false + false false + false false + false