diff --git a/src/StepMania-net2013.vcxproj b/src/StepMania-net2013.vcxproj index 875090a6b3..928df0ac42 100644 --- a/src/StepMania-net2013.vcxproj +++ b/src/StepMania-net2013.vcxproj @@ -125,7 +125,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;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINDOWS;DEBUG;GLEW_STATIC;%(PreprocessorDefinitions) + WIN32;_BINARY_PNG;GLEW_STATIC;_WINDOWS;WINDOWS;DEBUG;_DEBUG;%(PreprocessorDefinitions) Sync EnableFastChecks MultiThreadedDebugDLL @@ -156,7 +156,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\;..\extern\mad-0.15.1b\msvc++\Release\%(AdditionalLibraryDirectories) + ..\extern\libpng\lib\1.2.7;..\extern\ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;archutils\Win32\ddk;..\extern\mad-0.15.1b\msvc++\Release;..\extern\vorbis\win32;%(AdditionalLibraryDirectories) wininet.lib;msimg32.lib;libci.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries) true $(IntDir)StepMania.pdb @@ -193,7 +193,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" 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;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINDOWS;RELEASE;GLEW_STATIC;%(PreprocessorDefinitions) + WIN32;_BINARY_PNG;GLEW_STATIC;_WINDOWS;WINDOWS;RELEASE;NDEBUG;%(PreprocessorDefinitions) true false Sync @@ -224,7 +224,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\;..\extern\mad-0.15.1b\msvc++\Release\%(AdditionalLibraryDirectories) + ..\extern\libpng\lib\1.2.7;..\extern\ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;archutils\Win32\ddk;..\extern\mad-0.15.1b\msvc++\Release;..\extern\vorbis\win32;%(AdditionalLibraryDirectories) wininet.lib;msimg32.lib;libci.lib;%(IgnoreSpecificDefaultLibraries) $(IntDir)StepMania.pdb true @@ -258,7 +258,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;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINDOWS;DEBUG;GLEW_STATIC;%(PreprocessorDefinitions) + WIN32;_BINARY_PNG;GLEW_STATIC;_WINDOWS;WINDOWS;DEBUG;_DEBUG;%(PreprocessorDefinitions) Sync Default MultiThreadedDebugDLL @@ -289,7 +289,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\;..\extern\mad-0.15.1b\msvc++\Release\;%(AdditionalLibraryDirectories) + ..\extern\libpng\lib\1.2.7;..\extern\ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;archutils\Win32\ddk;..\extern\mad-0.15.1b\msvc++\Release;..\extern\vorbis\win32;%(AdditionalLibraryDirectories) wininet.lib;msimg32.lib;libci.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries) true $(IntDir)StepMania.pdb @@ -327,7 +327,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" 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;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINDOWS;RELEASE;GLEW_STATIC;%(PreprocessorDefinitions) + WIN32;_BINARY_PNG;GLEW_STATIC;_WINDOWS;WINDOWS;RELEASE;NDEBUG;%(PreprocessorDefinitions) true false Sync @@ -359,7 +359,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\;..\extern\mad-0.15.1b\msvc++\Release\%(AdditionalLibraryDirectories) + ..\extern\libpng\lib\1.2.7;..\extern\ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;archutils\Win32\ddk;..\extern\mad-0.15.1b\msvc++\Release;..\extern\vorbis\win32;%(AdditionalLibraryDirectories) wininet.lib;msimg32.lib;libci.lib;%(IgnoreSpecificDefaultLibraries) $(IntDir)StepMania-SSE2.pdb true @@ -2402,4 +2402,4 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" - + \ No newline at end of file diff --git a/src/StepMania-net2013.vcxproj.filters b/src/StepMania-net2013.vcxproj.filters index 586e276f62..a88d37487d 100644 --- a/src/StepMania-net2013.vcxproj.filters +++ b/src/StepMania-net2013.vcxproj.filters @@ -630,9 +630,6 @@ StepMania - - StepMania> - StepMania @@ -1629,6 +1626,7 @@ Data Structures + @@ -3151,4 +3149,4 @@ BaseClasses - + \ No newline at end of file diff --git a/src/ver.h b/src/ver.h index 83ad8aac3e..1df651bd5f 100644 --- a/src/ver.h +++ b/src/ver.h @@ -1,7 +1,11 @@ #ifndef STEPMANIA_VER_H #define STEPMANIA_VER_H +#if !defined(CMAKE_POWERED) && ( defined(_MSC_VER) || defined(__MACOSX__) ) +#define product_version "5.0-UNKNOWN" +#else extern const char *const product_version; +#endif // XXX: These names are misnomers. This is actually the BUILD number, time and date. // NOTE: In GNU toolchain these are defined in ver.cpp. In MSVC these are defined in archutils/Win32/verinc.c I think. Why? I don't know and I don't have MSVC. --root