diff --git a/Program/MFC71.dll b/Program/MFC71.dll deleted file mode 100644 index ebfbc3246f..0000000000 Binary files a/Program/MFC71.dll and /dev/null differ diff --git a/Program/Microsoft.VC80.CRT.manifest b/Program/Microsoft.VC80.CRT.manifest deleted file mode 100644 index 796fe9a378..0000000000 --- a/Program/Microsoft.VC80.CRT.manifest +++ /dev/null @@ -1,8 +0,0 @@ - - - - - n9On8FItNsK/DmT8UQxu6jYDtWQ= - 0KJ/VTwP4OUHx98HlIW2AdW1kuY= - YJuB+9Os2oxW4mY+2oC/r8lICZE= - diff --git a/Program/msvcp100.dll b/Program/msvcp100.dll new file mode 100644 index 0000000000..8502dfae5e Binary files /dev/null and b/Program/msvcp100.dll differ diff --git a/Program/msvcp60.dll b/Program/msvcp60.dll deleted file mode 100644 index bae56d0184..0000000000 Binary files a/Program/msvcp60.dll and /dev/null differ diff --git a/Program/msvcp71.dll b/Program/msvcp71.dll deleted file mode 100644 index 9ed0d17e13..0000000000 Binary files a/Program/msvcp71.dll and /dev/null differ diff --git a/Program/msvcp80.dll b/Program/msvcp80.dll deleted file mode 100644 index f0b52ebf12..0000000000 Binary files a/Program/msvcp80.dll and /dev/null differ diff --git a/Program/msvcp90.dll b/Program/msvcp90.dll deleted file mode 100644 index 354eed356a..0000000000 Binary files a/Program/msvcp90.dll and /dev/null differ diff --git a/Program/msvcr100.dll b/Program/msvcr100.dll new file mode 100644 index 0000000000..3e82b1aeac Binary files /dev/null and b/Program/msvcr100.dll differ diff --git a/Program/msvcr71.dll b/Program/msvcr71.dll deleted file mode 100644 index 9d9e0286c4..0000000000 Binary files a/Program/msvcr71.dll and /dev/null differ diff --git a/Program/msvcr80.dll b/Program/msvcr80.dll deleted file mode 100644 index 53c005efc1..0000000000 Binary files a/Program/msvcr80.dll and /dev/null differ diff --git a/Program/msvcr90.dll b/Program/msvcr90.dll deleted file mode 100644 index e2e66019c0..0000000000 Binary files a/Program/msvcr90.dll and /dev/null differ diff --git a/src/RageDisplay_D3D.cpp b/src/RageDisplay_D3D.cpp index e97865f5fd..cdc747d3d0 100644 --- a/src/RageDisplay_D3D.cpp +++ b/src/RageDisplay_D3D.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include "archutils/Win32/GraphicsWindow.h" @@ -24,7 +24,7 @@ #if defined(_MSC_VER) #pragma comment(lib, "d3d9.lib") #pragma comment(lib, "d3dx9.lib") - #pragma comment(lib, "DxErr.lib") + #pragma comment(lib, "DxErr9.lib") #endif #include @@ -32,7 +32,7 @@ RString GetErrorString( HRESULT hr ) { - return DXGetErrorString(hr); + return DXGetErrorString9(hr); } // Globals diff --git a/src/StepMania-net2010.vcxproj b/src/StepMania-net2010.vcxproj index 9ee42972fe..ce6cf4c69a 100644 --- a/src/StepMania-net2010.vcxproj +++ b/src/StepMania-net2010.vcxproj @@ -93,15 +93,23 @@ AllRules.ruleset + C:\Program Files (x86)\Microsoft DirectX 9.0 SDK (Summer 2004)\Include;$(IncludePath) + C:\Program Files (x86)\Microsoft DirectX 9.0 SDK (Summer 2004)\Lib;$(LibraryPath) + C:\Program Files (x86)\Microsoft DirectX 9.0 SDK (Summer 2004)\Include;$(IncludePath) + C:\Program Files (x86)\Microsoft DirectX 9.0 SDK (Summer 2004)\Include;$(IncludePath) StepMania-debug StepMania-fastdebug StepMania-SSE2 StepMania + C:\Program Files (x86)\Microsoft DirectX 9.0 SDK (Summer 2004)\Include;$(IncludePath) + C:\Program Files (x86)\Microsoft DirectX 9.0 SDK (Summer 2004)\Lib;$(LibraryPath) + C:\Program Files (x86)\Microsoft DirectX 9.0 SDK (Summer 2004)\Lib;$(LibraryPath) + C:\Program Files (x86)\Microsoft DirectX 9.0 SDK (Summer 2004)\Lib;$(LibraryPath) archutils\Win32\verinc -cl /Zl /nologo /c verstub.cpp /Fo$(IntDir) +cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)verstub.obj" _DEBUG;%(PreprocessorDefinitions) @@ -112,7 +120,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir) Disabled - .;..\extern\lua-5.1\src;..\extern\ffmpeg\include;BaseClasses;..\extern\jsoncpp\include;..\extern\glew-1.5.8\include;..\extern\pcre;..\extern\mad-0.15.1b;..\extern\libpng\lib;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;$(DXSDK_DIR)\include;%(AdditionalIncludeDirectories) + .;..\extern\lua-5.1\src;..\extern\ffmpeg\include;BaseClasses;..\extern\jsoncpp\include;..\extern\glew-1.5.8\include;..\extern\pcre;..\extern\mad-0.15.1b;..\extern\libpng\lib;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINDOWS;DEBUG;GLEW_STATIC;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -140,7 +148,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir) shell32.lib;gdi32.lib;user32.lib;ole32.lib;advapi32.lib;Comctl32.lib;swscale.lib;avcodec.lib;avformat.lib;avutil.lib;%(AdditionalDependencies) ..\Program\StepMania-debug.exe true - ..\extern\libpng\lib;..\extern\ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;$(DXSDK_DIR)\Lib\x86;..\extern\mad-0.15.1b\msvc++\Release\%(AdditionalLibraryDirectories) + ..\extern\libpng\lib;..\extern\ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;..\extern\mad-0.15.1b\msvc++\Release\%(AdditionalLibraryDirectories) wininet.lib;msimg32.lib;libci.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries) true $(IntDir)StepMania.pdb @@ -160,7 +168,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir) archutils\Win32\verinc -cl /Zl /nologo /c verstub.cpp /Fo$(IntDir) +cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)verstub.obj" NDEBUG;%(PreprocessorDefinitions) @@ -175,7 +183,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir) AnySuitable true Size - .;..\extern\lua-5.1\src;..\extern\ffmpeg\include;BaseClasses;..\extern\jsoncpp\include;..\extern\glew-1.5.8\include;..\extern\pcre;..\extern\mad-0.15.1b;..\extern\libpng\lib;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;$(DXSDK_DIR)\include;%(AdditionalIncludeDirectories) + .;..\extern\lua-5.1\src;..\extern\ffmpeg\include;BaseClasses;..\extern\jsoncpp\include;..\extern\glew-1.5.8\include;..\extern\pcre;..\extern\mad-0.15.1b;..\extern\libpng\lib;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINDOWS;RELEASE;GLEW_STATIC;%(PreprocessorDefinitions) true Sync @@ -205,7 +213,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir) shell32.lib;gdi32.lib;user32.lib;ole32.lib;advapi32.lib;Comctl32.lib;swscale.lib;avcodec.lib;avformat.lib;avutil.lib;%(AdditionalDependencies) ..\Program\StepMania.exe true - ..\extern\libpng\lib;..\extern\ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;$(DXSDK_DIR)\Lib\x86;..\extern\mad-0.15.1b\msvc++\Release\%(AdditionalLibraryDirectories) + ..\extern\libpng\lib;..\extern\ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;..\extern\mad-0.15.1b\msvc++\Release\%(AdditionalLibraryDirectories) wininet.lib;msimg32.lib;libci.lib;%(IgnoreSpecificDefaultLibraries) $(IntDir)StepMania.pdb true @@ -226,7 +234,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir) archutils\Win32\verinc -cl /Zl /nologo /c verstub.cpp /Fo$(IntDir) +cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)verstub.obj" _DEBUG;%(PreprocessorDefinitions) @@ -237,7 +245,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir) MaxSpeed - .;..\extern\lua-5.1\src;..\extern\ffmpeg\include;BaseClasses;..\extern\jsoncpp\include;..\extern\glew-1.5.8\include;..\extern\pcre;..\extern\mad-0.15.1b;..\extern\libpng\lib;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;$(DXSDK_DIR)\include;%(AdditionalIncludeDirectories) + .;..\extern\lua-5.1\src;..\extern\ffmpeg\include;BaseClasses;..\extern\jsoncpp\include;..\extern\glew-1.5.8\include;..\extern\pcre;..\extern\mad-0.15.1b;..\extern\libpng\lib;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINDOWS;DEBUG;GLEW_STATIC;%(PreprocessorDefinitions) Sync Default @@ -268,7 +276,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir) shell32.lib;gdi32.lib;user32.lib;ole32.lib;advapi32.lib;Comctl32.lib;swscale.lib;avcodec.lib;avformat.lib;avutil.lib;%(AdditionalDependencies) ..\Program\StepMania-fastdebug.exe true - ..\extern\libpng\lib;..\extern\ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;$(DXSDK_DIR)\Lib\x86;..\extern\mad-0.15.1b\msvc++\Release\;%(AdditionalLibraryDirectories) + ..\extern\libpng\lib;..\extern\ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;..\extern\mad-0.15.1b\msvc++\Release\;%(AdditionalLibraryDirectories) wininet.lib;msimg32.lib;libci.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries) true $(IntDir)StepMania.pdb @@ -289,7 +297,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir) archutils\Win32\verinc -cl /Zl /nologo /c verstub.cpp /Fo$(IntDir) +cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)verstub.obj" NDEBUG;%(PreprocessorDefinitions) @@ -303,7 +311,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir) AnySuitable true Speed - .;..\extern\lua-5.1\src;..\extern\ffmpeg\include;BaseClasses;..\extern\jsoncpp\include;..\extern\glew-1.5.8\include;..\extern\pcre;..\extern\mad-0.15.1b;..\extern\libpng\lib;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;$(DXSDK_DIR)\include;%(AdditionalIncludeDirectories) + .;..\extern\lua-5.1\src;..\extern\ffmpeg\include;BaseClasses;..\extern\jsoncpp\include;..\extern\glew-1.5.8\include;..\extern\pcre;..\extern\mad-0.15.1b;..\extern\libpng\lib;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINDOWS;RELEASE;GLEW_STATIC;%(PreprocessorDefinitions) true @@ -335,7 +343,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir) shell32.lib;gdi32.lib;user32.lib;ole32.lib;advapi32.lib;Comctl32.lib;swscale.lib;avcodec.lib;avformat.lib;avutil.lib;%(AdditionalDependencies) ..\Program\StepMania-SSE2.exe true - ..\extern\libpng\lib;..\extern\ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;$(DXSDK_DIR)\Lib\x86;..\extern\mad-0.15.1b\msvc++\Release\%(AdditionalLibraryDirectories) + ..\extern\libpng\lib;..\extern\ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;..\extern\mad-0.15.1b\msvc++\Release\%(AdditionalLibraryDirectories) wininet.lib;msimg32.lib;libci.lib;%(IgnoreSpecificDefaultLibraries) $(IntDir)StepMania-SSE2.pdb true diff --git a/src/Texture Font Generator/TextureFont.cpp b/src/Texture Font Generator/TextureFont.cpp index 640d74965b..170f8ce420 100644 --- a/src/Texture Font Generator/TextureFont.cpp +++ b/src/Texture Font Generator/TextureFont.cpp @@ -4,6 +4,7 @@ #include #include +#include TextureFont::TextureFont() { @@ -482,7 +483,7 @@ void TextureFont::Save( CString sBasePath, CString sBitmapAppendBeforeExtension, sPageName += "-stroke"; break; default: - FAIL_M(ssprintf("Unexpected value for j: %i", j)); + assert(false); } CString sFile; diff --git a/src/archutils/Win32/DirectXHelpers.cpp b/src/archutils/Win32/DirectXHelpers.cpp index 4d47a9b60a..ecc6a37204 100644 --- a/src/archutils/Win32/DirectXHelpers.cpp +++ b/src/archutils/Win32/DirectXHelpers.cpp @@ -3,9 +3,9 @@ #include "RageUtil.h" #include -#include +#include #if defined(_MSC_VER) -# pragma comment(lib, "dxerr.lib") +# pragma comment(lib, "dxerr9.lib") #endif RString hr_ssprintf( int hr, const char *fmt, ... ) @@ -15,7 +15,7 @@ RString hr_ssprintf( int hr, const char *fmt, ... ) RString s = vssprintf( fmt, va ); va_end(va); - const char *szError = DXGetErrorString( hr ); + const char *szError = DXGetErrorString9( hr ); return s + ssprintf( " (%s)", szError ); } diff --git a/src/archutils/Win32/mapconv.cpp b/src/archutils/Win32/mapconv.cpp index f3cb96f907..137b6a464f 100644 --- a/src/archutils/Win32/mapconv.cpp +++ b/src/archutils/Win32/mapconv.cpp @@ -8,8 +8,7 @@ #include #include -#define MAX_CNAMBUF (0x20000) -#define MAX_FNAMBUF (0x800000) +#define MAX_FNAMBUF (0x0FFFFFFF) #define MAX_SEGMENTS (64) #define MAX_GROUPS (64) diff --git a/src/archutils/Win32/mapconv.exe b/src/archutils/Win32/mapconv.exe index 8b23d80115..2cf2ed7f36 100644 Binary files a/src/archutils/Win32/mapconv.exe and b/src/archutils/Win32/mapconv.exe differ diff --git a/src/archutils/Win32/mapconv.sln b/src/archutils/Win32/mapconv.sln index c10e90d218..f6e5066d85 100644 --- a/src/archutils/Win32/mapconv.sln +++ b/src/archutils/Win32/mapconv.sln @@ -1,21 +1,19 @@ -Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapconv", "mapconv.vcproj", "{46C1AA00-F02C-4E0A-8150-542C9728474C}" +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapconv", "mapconv.vcxproj", "{46C1AA00-F02C-4E0A-8150-542C9728474C}" EndProject Global - GlobalSection(SolutionConfiguration) = preSolution - ConfigName.0 = Debug - ConfigName.1 = Release + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {46C1AA00-F02C-4E0A-8150-542C9728474C}.Debug|Win32.ActiveCfg = Debug|Win32 + {46C1AA00-F02C-4E0A-8150-542C9728474C}.Debug|Win32.Build.0 = Debug|Win32 + {46C1AA00-F02C-4E0A-8150-542C9728474C}.Release|Win32.ActiveCfg = Release|Win32 + {46C1AA00-F02C-4E0A-8150-542C9728474C}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {46C1AA00-F02C-4E0A-8150-542C9728474C}.Debug.ActiveCfg = Debug|Win32 - {46C1AA00-F02C-4E0A-8150-542C9728474C}.Debug.Build.0 = Debug|Win32 - {46C1AA00-F02C-4E0A-8150-542C9728474C}.Release.ActiveCfg = Release|Win32 - {46C1AA00-F02C-4E0A-8150-542C9728474C}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff --git a/src/archutils/Win32/mapconv.vcproj b/src/archutils/Win32/mapconv.vcproj deleted file mode 100644 index a77fab80a7..0000000000 --- a/src/archutils/Win32/mapconv.vcproj +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/archutils/Win32/mapconv.vcxproj b/src/archutils/Win32/mapconv.vcxproj new file mode 100644 index 0000000000..2d63d52772 --- /dev/null +++ b/src/archutils/Win32/mapconv.vcxproj @@ -0,0 +1,89 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {46C1AA00-F02C-4E0A-8150-542C9728474C} + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + Debug\ + Debug\ + true + Release\ + Release\ + false + + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + + + $(OutDir)mapconv.exe + true + $(OutDir)mapconv.pdb + Console + MachineX86 + + + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + $(OutDir)mapconv.exe + true + Console + true + true + MachineX86 + + + + + + + + + \ No newline at end of file diff --git a/src/archutils/Win32/mapconv.vcxproj.filters b/src/archutils/Win32/mapconv.vcxproj.filters new file mode 100644 index 0000000000..86f3a1afcd --- /dev/null +++ b/src/archutils/Win32/mapconv.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + + + Source Files + + + \ No newline at end of file