diff --git a/Data/splash.png b/Data/splash.png
index c6a96df4a7..2c365a3306 100644
Binary files a/Data/splash.png and b/Data/splash.png differ
diff --git a/src/StepMania-net2010.vcxproj b/src/StepMania-net2010.vcxproj
index d44826bcdc..ae25c03b62 100644
--- a/src/StepMania-net2010.vcxproj
+++ b/src/StepMania-net2010.vcxproj
@@ -76,7 +76,7 @@
false
$(TargetDir)
$(SolutionDir)/build-$(SolutionName)/$(ProjectName)/$(Configuration)\
- true
+ false
true
$(SolutionDir)$(Configuration)\
$(Configuration)\
@@ -93,10 +93,18 @@
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
StepMania
StepMania
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)
@@ -130,6 +138,10 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)
true
EditAndContinue
4063;4100;4127;4201;4244;4275;4355;4505;4512;4702;4786;4996;%(DisableSpecificWarnings)
+ true
+ true
+ /EHsc %(AdditionalOptions)
+ false
_DEBUG;%(PreprocessorDefinitions)
@@ -151,6 +163,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)
false
+ SendErrorReport
archutils\Win32\mapconv "$(IntDir)$(TargetName).map" "$(TargetDir)\StepMania-debug.vdi"
@@ -195,6 +208,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)
true
ProgramDatabase
4063;4100;4127;4201;4244;4275;4355;4505;4512;4702;4786;4996;%(DisableSpecificWarnings)
+ false
NDEBUG;%(PreprocessorDefinitions)
@@ -215,6 +229,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)
false
+ SendErrorReport
archutils\Win32\mapconv "$(IntDir)$(TargetName).map" "$(TargetDir)\StepMania.vdi"
@@ -234,11 +249,10 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)
../StepMania.tlb
- Disabled
+ MaxSpeed
.;..\extern\lua-5.1\src;ffmpeg\modern_working\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
MultiThreadedDebugDLL
Use
@@ -251,8 +265,13 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)
Level4
true
- EditAndContinue
+ ProgramDatabase
4063;4100;4127;4201;4244;4275;4355;4505;4512;4702;4786;4996;%(DisableSpecificWarnings)
+ true
+ AnySuitable
+ true
+ Speed
+ true
_DEBUG;%(PreprocessorDefinitions)
@@ -260,10 +279,10 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)
/MACHINE:I386 "$(IntDir)verstub.obj" %(AdditionalOptions)
- shell32.lib;gdi32.lib;user32.lib;ole32.lib;advapi32.lib;ffmpeg/modern_working/lib/avcodec.lib;ffmpeg/lib/avformat.lib;ffmpeg/lib/avutil.lib;ffmpeg/lib/swscale.lib;%(AdditionalDependencies)
+ shell32.lib;gdi32.lib;user32.lib;ole32.lib;advapi32.lib;avcodec.lib;avformat.lib;avutil.lib;swscale.lib;%(AdditionalDependencies)
../Program/StepMania-fastdebug.exe
true
- ..\extern\libpng\lib;ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;..\extern\mad-0.15.1b\msvc++\Release\%(AdditionalLibraryDirectories)
+ ..\extern\libpng\lib;ffmpeg\modern_working\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
@@ -274,6 +293,8 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)
false
+ SendErrorReport
+ UseLinkTimeCodeGeneration
archutils\Win32\mapconv "$(IntDir)$(TargetName).map" "$(TargetDir)\StepMania-fastdebug.vdi"
@@ -319,6 +340,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)
true
ProgramDatabase
4063;4100;4127;4201;4244;4275;4355;4505;4512;4702;4786;4996;%(DisableSpecificWarnings)
+ false
NDEBUG;%(PreprocessorDefinitions)
@@ -340,6 +362,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)
NotSet
+ SendErrorReport
archutils\Win32\mapconv "$(IntDir)$(TargetName)-SSE2.map" "$(TargetDir)\StepMania-SSE2.vdi"
diff --git a/src/archutils/Win32/verinc.sln b/src/archutils/Win32/verinc.sln
index fc522ddeb2..8415c10de0 100644
--- a/src/archutils/Win32/verinc.sln
+++ b/src/archutils/Win32/verinc.sln
@@ -1,21 +1,19 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapconv", "verinc.vcproj", "{46C1AA00-F02C-4E0A-8150-542C9728474C}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "verinc", "verinc.vcxproj", "{46C1AA00-F02C-4E0A-8150-542C9728474C}"
EndProject
Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Release = Release
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = 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
+ 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(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
diff --git a/src/libtomcrypt/libtomcrypt-net2010.vcxproj b/src/libtomcrypt/libtomcrypt-net2010.vcxproj
index 549b9f5dbe..e1749dcd1f 100644
--- a/src/libtomcrypt/libtomcrypt-net2010.vcxproj
+++ b/src/libtomcrypt/libtomcrypt-net2010.vcxproj
@@ -95,6 +95,7 @@
Level2
EditAndContinue
+ true
diff --git a/src/libtommath/libtommath-net2010.vcxproj b/src/libtommath/libtommath-net2010.vcxproj
index 2b3119da9b..c79329b343 100644
--- a/src/libtommath/libtommath-net2010.vcxproj
+++ b/src/libtommath/libtommath-net2010.vcxproj
@@ -95,6 +95,7 @@
Level2
EditAndContinue
+ true