Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1919] trunk/OpenMPT
|
From: <man...@us...> - 2013-04-20 18:48:43
|
Revision: 1919
http://sourceforge.net/p/modplug/code/1919
Author: manxorist
Date: 2013-04-20 18:48:30 +0000 (Sat, 20 Apr 2013)
Log Message:
-----------
[Imp] Show exact subversion revision and working copy state of compiled binaries in About dialog and in crash report message boxes. This depends of TortoiseSVN being installed while building. Otherwise this information is not aviablable, but compilation still works as before.
Modified Paths:
--------------
trunk/OpenMPT/common/version.h
trunk/OpenMPT/mptrack/ExceptionHandler.cpp
trunk/OpenMPT/mptrack/Mptrack.cpp
trunk/OpenMPT/mptrack/dlg_misc.cpp
trunk/OpenMPT/mptrack/mptrack_08.vcproj
trunk/OpenMPT/mptrack/mptrack_10.vcxproj
trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters
Added Paths:
-----------
trunk/OpenMPT/common/svn_version/
trunk/OpenMPT/common/svn_version/svn_version.template.h
trunk/OpenMPT/common/svn_version_default/
trunk/OpenMPT/common/svn_version_default/svn_version.h
trunk/OpenMPT/common/version.cpp
Property Changed:
----------------
trunk/OpenMPT/
Index: trunk/OpenMPT
===================================================================
--- trunk/OpenMPT 2013-04-20 13:45:16 UTC (rev 1918)
+++ trunk/OpenMPT 2013-04-20 18:48:30 UTC (rev 1919)
Property changes on: trunk/OpenMPT
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,6 ##
+Debug
+Release
+ipch
+libopenmpt.sdf
+libopenmpt.opensdf
+libopenmpt.suo
Index: trunk/OpenMPT/common/svn_version
===================================================================
--- trunk/OpenMPT/common/svn_version 2013-04-20 13:45:16 UTC (rev 1918)
+++ trunk/OpenMPT/common/svn_version 2013-04-20 18:48:30 UTC (rev 1919)
Property changes on: trunk/OpenMPT/common/svn_version
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+svn_version.h
Added: trunk/OpenMPT/common/svn_version/svn_version.template.h
===================================================================
--- trunk/OpenMPT/common/svn_version/svn_version.template.h (rev 0)
+++ trunk/OpenMPT/common/svn_version/svn_version.template.h 2013-04-20 18:48:30 UTC (rev 1919)
@@ -0,0 +1,10 @@
+
+#pragma once
+
+#define OPENMPT_VERSION_URL "$WCURL$"
+#define OPENMPT_VERSION_REVISION $WCREV$
+
+#define OPENMPT_VERSION_DIRTY $WCMODS?true:false$
+#define OPENMPT_VERSION_MIXEDREVISIONS $WCMIXED?true:false$
+
+#define OPENMPT_VERSION_DATE "$WCNOW=%Y-%m-%d %H:%M:%S$"
Property changes on: trunk/OpenMPT/common/svn_version/svn_version.template.h
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/x-chdr
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/OpenMPT/common/svn_version_default/svn_version.h
===================================================================
--- trunk/OpenMPT/common/svn_version_default/svn_version.h (rev 0)
+++ trunk/OpenMPT/common/svn_version_default/svn_version.h 2013-04-20 18:48:30 UTC (rev 1919)
@@ -0,0 +1,10 @@
+
+#pragma once
+
+#define OPENMPT_VERSION_URL ""
+#define OPENMPT_VERSION_REVISION 0
+
+#define OPENMPT_VERSION_DIRTY false
+#define OPENMPT_VERSION_MIXEDREVISIONS false
+
+#define OPENMPT_VERSION_DATE __DATE__ " " __TIME__
Property changes on: trunk/OpenMPT/common/svn_version_default/svn_version.h
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/x-chdr
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/OpenMPT/common/version.cpp
===================================================================
--- trunk/OpenMPT/common/version.cpp (rev 0)
+++ trunk/OpenMPT/common/version.cpp 2013-04-20 18:48:30 UTC (rev 1919)
@@ -0,0 +1,139 @@
+/*
+ * version.cpp
+ * -----------
+ * Purpose: OpenMPT version handling.
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+#include "stdafx.h"
+#include "version.h"
+
+#include <sstream>
+
+#include "svn_version.h"
+
+namespace MptVersion {
+
+bool IsDebugBuild()
+{
+ #ifdef _DEBUG
+ return true;
+ #else
+ return false;
+ #endif
+}
+
+std::string GetUrl()
+{
+ return OPENMPT_VERSION_URL;
+}
+
+int GetRevision()
+{
+ return OPENMPT_VERSION_REVISION;
+}
+
+bool IsDirty()
+{
+ return OPENMPT_VERSION_DIRTY;
+}
+
+bool HasMixedRevisions()
+{
+ return OPENMPT_VERSION_MIXEDREVISIONS;
+}
+
+std::string GetStateString()
+{
+ std::string retval;
+ if(OPENMPT_VERSION_MIXEDREVISIONS)
+ {
+ retval += "+mixed";
+ }
+ if(OPENMPT_VERSION_DIRTY)
+ {
+ retval += "+dirty";
+ }
+ return retval;
+}
+
+std::string GetBuildDateString()
+{
+ return OPENMPT_VERSION_DATE;
+}
+
+std::string GetBuildFlagsString()
+{
+ std::string retval;
+ if(IsTestBuild())
+ {
+ retval += " TEST";
+ }
+ if(IsDebugBuild())
+ {
+ retval += " DEBUG";
+ }
+ #ifdef MODPLUG_TRACKER
+ #ifdef NO_VST
+ retval += " NO_VST";
+ #endif
+ #ifdef NO_ASIO
+ retval += " NO_ASIO";
+ #endif
+ #ifdef NO_DSOUND
+ retval += " NO_DSOUND";
+ #endif
+ #endif
+ return retval;
+}
+
+std::string GetRevisionString()
+{
+ if(OPENMPT_VERSION_REVISION == 0)
+ {
+ return "";
+ }
+ std::ostringstream str;
+ str << "-r" << OPENMPT_VERSION_REVISION;
+ if(OPENMPT_VERSION_MIXEDREVISIONS)
+ {
+ str << "!";
+ }
+ if(OPENMPT_VERSION_DIRTY)
+ {
+ str << "+";
+ }
+ return str.str();
+}
+
+std::string GetVersionStringExtended()
+{
+ std::string retval = MPT_VERSION_STR;
+ if(IsDebugBuild() || IsTestBuild() || IsDirty() || HasMixedRevisions())
+ {
+ retval += GetRevisionString();
+ retval += GetBuildFlagsString();
+ }
+ return retval;
+}
+
+std::string GetVersionUrlString()
+{
+ if(OPENMPT_VERSION_REVISION == 0)
+ {
+ return "";
+ }
+ std::string url = OPENMPT_VERSION_URL;
+ std::string baseurl = "https://svn.code.sf.net/p/modplug/code/";
+ if(url.substr(0, baseurl.length()) == baseurl)
+ {
+ url = url.substr(baseurl.length());
+ }
+ std::ostringstream str;
+ str << url << "@" << OPENMPT_VERSION_REVISION << GetStateString();
+ return str.str();
+}
+
+} // namespace MptVersion
Property changes on: trunk/OpenMPT/common/version.cpp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/x-c++src
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/OpenMPT/common/version.h
===================================================================
--- trunk/OpenMPT/common/version.h 2013-04-20 13:45:16 UTC (rev 1918)
+++ trunk/OpenMPT/common/version.h 2013-04-20 18:48:30 UTC (rev 1919)
@@ -10,6 +10,8 @@
#pragma once
+#include <string>
+
//STRINGIZE makes a string of given argument. If used with #defined value,
//the string is made of the contents of the defined value.
#define HELPER_STRINGIZE(x) #x
@@ -44,12 +46,12 @@
int v1, v2, v3, v4;
sscanf(s, "%x.%x.%x.%x", &v1, &v2, &v3, &v4);
return ((v1 << 24) | (v2 << 16) | (v3 << 8) | v4);
- };
+ }
// Returns version string from given numerical version value.
- static CString ToStr(const VersionNum v)
+ static mpt::String ToStr(const VersionNum v)
{
- CString strVersion;
+ mpt::String strVersion;
if(v == 0)
{
// Unknown version
@@ -64,7 +66,7 @@
strVersion.Format("%X.%02X.%02X.%02X", (v >> 24) & 0xFF, (v >> 16) & 0xFF, (v >> 8) & 0xFF, (v) & 0xFF);
}
return strVersion;
- };
+ }
// Return a version without build number (the last number in the version).
// The current versioning scheme uses this number only for test builds, and it should be 00 for official builds,
@@ -72,11 +74,26 @@
static VersionNum RemoveBuildNumber(const VersionNum num)
{
return (num & 0xFFFFFF00);
- };
+ }
// Returns true if a given version number is from a test build, false if it's a release build.
- static bool IsTestBuild(const VersionNum num)
+ static bool IsTestBuild(const VersionNum num = MPT_VERSION_NUMERIC)
{
return ((num > MAKE_VERSION_NUMERIC(1,17,02,54) && num < MAKE_VERSION_NUMERIC(1,18,02,00) && num != MAKE_VERSION_NUMERIC(1,18,00,00)) || (num > MAKE_VERSION_NUMERIC(1,18,02,00) && RemoveBuildNumber(num) != num));
}
+
+ bool IsDebugBuild();
+
+ std::string GetUrl();
+ int GetRevision();
+ bool IsDirty();
+ bool HasMixedRevisions();
+ std::string GetStateString();
+ std::string GetBuildDateString();
+
+ std::string GetBuildFlagsString();
+ std::string GetRevisionString();
+ std::string GetVersionStringExtended();
+ std::string GetVersionUrlString();
+
}; //namespace MptVersion
Modified: trunk/OpenMPT/mptrack/ExceptionHandler.cpp
===================================================================
--- trunk/OpenMPT/mptrack/ExceptionHandler.cpp 2013-04-20 13:45:16 UTC (rev 1918)
+++ trunk/OpenMPT/mptrack/ExceptionHandler.cpp 2013-04-20 18:48:30 UTC (rev 1919)
@@ -15,6 +15,7 @@
#include <shlwapi.h>
#include "ExceptionHandler.h"
#include "dbghelp.h"
+#include "../common/version.h"
typedef BOOL (WINAPI *MINIDUMPWRITEDUMP)(HANDLE hProcess, DWORD dwPid, HANDLE hFile, MINIDUMP_TYPE DumpType,
@@ -108,6 +109,11 @@
errorMessage.AppendFormat("\n\n%d modified file%s been rescued, but it cannot be guaranteed that %s still intact.", numFiles, (numFiles == 1 ? " has" : "s have"), (numFiles == 1 ? "it is" : "they are"));
}
+ errorMessage.AppendFormat("\n\nOpenMPT %s %s (%s)\n",
+ MptVersion::GetVersionStringExtended().c_str(),
+ MptVersion::GetVersionUrlString()
+ );
+
Reporting::Error(errorMessage, "OpenMPT Crash", pMainFrame);
}
@@ -144,7 +150,7 @@
}
-#ifdef NDEBUG
+#ifndef _DEBUG
void AlwaysAssertHandler(const char *file, int line, const char *function, const char *expr)
//------------------------------------------------------------------------------------------
{
Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp 2013-04-20 13:45:16 UTC (rev 1918)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp 2013-04-20 18:48:30 UTC (rev 1919)
@@ -1538,16 +1538,11 @@
BOOL CAboutDlg::OnInitDialog()
//----------------------------
{
- const char * const s = "Build Date: " __DATE__ " " __TIME__;
CDialog::OnInitDialog();
m_bmp.SubclassDlgItem(IDC_BITMAP1, this);
m_bmp.LoadBitmap(MAKEINTRESOURCE(IDB_MPTRACK));
- SetDlgItemText(IDC_EDIT2, s);
- SetDlgItemText(IDC_EDIT3, CString("OpenMPT ") + MptVersion::str
-#if (MPT_VERSION_NUMERIC & 0xFF) != 0
- + CString(" (Test Build)")
-#endif
- );
+ SetDlgItemText(IDC_EDIT2, CString("Build Date: ") + MptVersion::GetBuildDateString().c_str());
+ SetDlgItemText(IDC_EDIT3, CString("OpenMPT ") + MptVersion::GetVersionStringExtended().c_str());
m_heContact.SetWindowText(
"Contact / Discussion:\r\n"
Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp 2013-04-20 13:45:16 UTC (rev 1918)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp 2013-04-20 18:48:30 UTC (rev 1919)
@@ -161,7 +161,7 @@
CString CModTypeDlg::FormatVersionNumber(DWORD version)
//-----------------------------------------------------
{
- return MptVersion::ToStr(version) + (MptVersion::IsTestBuild(version) ? " (Test Build)" : "");
+ return CString(MptVersion::ToStr(version)) + (MptVersion::IsTestBuild(version) ? " (Test Build)" : "");
}
Modified: trunk/OpenMPT/mptrack/mptrack_08.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_08.vcproj 2013-04-20 13:45:16 UTC (rev 1918)
+++ trunk/OpenMPT/mptrack/mptrack_08.vcproj 2013-04-20 18:48:30 UTC (rev 1919)
@@ -27,6 +27,7 @@
>
<Tool
Name="VCPreBuildEventTool"
+ CommandLine="subwcrev .. ..\common\svn_version\svn_version.template.h ..\common\svn_version\svn_version.h || del ..\common\svn_version\svn_version.h || true"
/>
<Tool
Name="VCCustomBuildTool"
@@ -48,7 +49,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\common;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\"
+ AdditionalIncludeDirectories="..\common;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\;..\common\svn_version;..\common\svn_version_default"
PreprocessorDefinitions="_DEBUG,WIN32,_WINDOWS,MODPLUG_TRACKER"
StringPooling="true"
ExceptionHandling="2"
@@ -134,6 +135,7 @@
>
<Tool
Name="VCPreBuildEventTool"
+ CommandLine="subwcrev .. ..\common\svn_version\svn_version.template.h ..\common\svn_version\svn_version.h || del ..\common\svn_version\svn_version.h || true"
/>
<Tool
Name="VCCustomBuildTool"
@@ -156,7 +158,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\common;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\"
+ AdditionalIncludeDirectories="..\common;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\;..\common\svn_version;..\common\svn_version_default"
PreprocessorDefinitions="NDEBUG,WIN32,_WINDOWS,MODPLUG_TRACKER"
StringPooling="true"
ExceptionHandling="2"
@@ -245,6 +247,10 @@
>
</File>
<File
+ RelativePath="..\sounddsp\AGC.cpp"
+ >
+ </File>
+ <File
RelativePath="..\common\AudioCriticalSection.cpp"
>
</File>
@@ -313,10 +319,18 @@
>
</File>
<File
+ RelativePath="..\sounddsp\DSP.cpp"
+ >
+ </File>
+ <File
RelativePath=".\EffectVis.cpp"
>
</File>
<File
+ RelativePath="..\sounddsp\EQ.cpp"
+ >
+ </File>
+ <File
RelativePath=".\ExceptionHandler.cpp"
>
</File>
@@ -381,14 +395,6 @@
>
</File>
<File
- RelativePath="..\common\mptString.cpp"
- >
- </File>
- <File
- RelativePath="..\common\typedefs.cpp"
- >
- </File>
- <File
RelativePath="..\soundlib\MixerSettings.cpp"
>
</File>
@@ -465,6 +471,10 @@
>
</File>
<File
+ RelativePath="..\common\mptString.cpp"
+ >
+ </File>
+ <File
RelativePath="..\soundlib\pattern.cpp"
>
</File>
@@ -485,6 +495,10 @@
>
</File>
<File
+ RelativePath="..\sounddsp\Reverb.cpp"
+ >
+ </File>
+ <File
RelativePath="..\soundlib\RowVisitor.cpp"
>
</File>
@@ -501,18 +515,6 @@
>
</File>
<File
- RelativePath="..\sounddsp\AGC.cpp"
- >
- </File>
- <File
- RelativePath="..\sounddsp\DSP.cpp"
- >
- </File>
- <File
- RelativePath="..\sounddsp\EQ.cpp"
- >
- </File>
- <File
RelativePath="..\soundlib\snd_flt.cpp"
>
</File>
@@ -521,22 +523,18 @@
>
</File>
<File
- RelativePath="..\sounddsp\Reverb.cpp"
+ RelativePath="..\soundlib\Sndfile.cpp"
>
</File>
<File
- RelativePath="..\sounddev\SoundDevice.cpp"
+ RelativePath="..\soundlib\Sndmix.cpp"
>
</File>
<File
- RelativePath="..\soundlib\Sndfile.cpp"
+ RelativePath="..\sounddev\SoundDevice.cpp"
>
</File>
<File
- RelativePath="..\soundlib\Sndmix.cpp"
- >
- </File>
- <File
RelativePath="..\soundlib\SoundFilePlayConfig.cpp"
>
</File>
@@ -573,6 +571,10 @@
>
</File>
<File
+ RelativePath="..\common\typedefs.cpp"
+ >
+ </File>
+ <File
RelativePath=".\Undo.cpp"
>
</File>
@@ -581,6 +583,10 @@
>
</File>
<File
+ RelativePath="..\common\version.cpp"
+ >
+ </File>
+ <File
RelativePath=".\view_com.cpp"
>
</File>
@@ -815,6 +821,10 @@
>
</File>
<File
+ RelativePath="..\sounddsp\AGC.h"
+ >
+ </File>
+ <File
RelativePath="..\common\AudioCriticalSection.h"
>
</File>
@@ -875,6 +885,10 @@
>
</File>
<File
+ RelativePath="..\sounddsp\DSP.h"
+ >
+ </File>
+ <File
RelativePath=".\EffectInfo.h"
>
</File>
@@ -883,6 +897,10 @@
>
</File>
<File
+ RelativePath="..\sounddsp\EQ.h"
+ >
+ </File>
+ <File
RelativePath=".\ExceptionHandler.h"
>
</File>
@@ -907,6 +925,10 @@
>
</File>
<File
+ RelativePath="..\common\Logging.h"
+ >
+ </File>
+ <File
RelativePath=".\mainbar.h"
>
</File>
@@ -983,6 +1005,10 @@
>
</File>
<File
+ RelativePath="..\common\mptString.h"
+ >
+ </File>
+ <File
RelativePath="..\common\mutex.h"
>
</File>
@@ -1007,10 +1033,6 @@
>
</File>
<File
- RelativePath="..\common\Profiler.h"
- >
- </File>
- <File
RelativePath=".\soundlib\plugins\PluginEventQueue.h"
>
</File>
@@ -1023,7 +1045,7 @@
>
</File>
<File
- RelativePath="..\common\Logging.h"
+ RelativePath="..\common\Profiler.h"
>
</File>
<File
@@ -1035,11 +1057,11 @@
>
</File>
<File
- RelativePath="..\sounddsp\Reverb.h"
+ RelativePath=".\Resource.h"
>
</File>
<File
- RelativePath=".\Resource.h"
+ RelativePath="..\sounddsp\Reverb.h"
>
</File>
<File
@@ -1067,42 +1089,38 @@
>
</File>
<File
- RelativePath="..\sounddev\SoundDevice.h"
+ RelativePath="..\Soundlib\Sndfile.h"
>
</File>
<File
- RelativePath="..\sounddev\SoundDevices.h"
+ RelativePath="..\sounddev\SoundDevice.h"
>
</File>
<File
- RelativePath="..\Soundlib\Sndfile.h"
+ RelativePath="..\sounddev\SoundDevices.h"
>
</File>
<File
- RelativePath="..\sounddsp\AGC.h"
+ RelativePath="..\soundlib\SoundFilePlayConfig.h"
>
</File>
<File
- RelativePath="..\sounddsp\DSP.h"
+ RelativePath="..\common\stdafx.h"
>
</File>
<File
- RelativePath="..\sounddsp\EQ.h"
+ RelativePath="..\common\StringFixer.h"
>
</File>
<File
- RelativePath="..\soundlib\SoundFilePlayConfig.h"
+ RelativePath="..\common\svn_version_default\svn_version.h"
>
</File>
<File
- RelativePath="..\common\stdafx.h"
+ RelativePath="..\common\svn_version\svn_version.template.h"
>
</File>
<File
- RelativePath="..\common\StringFixer.h"
- >
- </File>
- <File
RelativePath=".\Tables.h"
>
</File>
@@ -1119,10 +1137,6 @@
>
</File>
<File
- RelativePath="..\common\mptString.h"
- >
- </File>
- <File
RelativePath=".\Undo.h"
>
</File>
@@ -1303,10 +1317,6 @@
>
</File>
<File
- RelativePath="..\soundlib\Message.h"
- >
- </File>
- <File
RelativePath="..\soundlib\Load_669.cpp"
>
</File>
@@ -1423,6 +1433,10 @@
>
</File>
<File
+ RelativePath="..\soundlib\Message.h"
+ >
+ </File>
+ <File
RelativePath="..\soundlib\WAVTools.cpp"
>
</File>
Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2013-04-20 13:45:16 UTC (rev 1918)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2013-04-20 18:48:30 UTC (rev 1919)
@@ -77,7 +77,7 @@
<ClCompile>
<AdditionalOptions>/EHsc %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\;..\common\svn_version;..\common\svn_version_default;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;MODPLUG_TRACKER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -121,6 +121,9 @@
<Manifest>
<AdditionalManifestFiles>$(ProjectDir)res/rt_manif.bin;%(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
+ <PreBuildEvent>
+ <Command>subwcrev .. ..\common\svn_version\svn_version.template.h ..\common\svn_version\svn_version.h || del ..\common\svn_version\svn_version.h || true</Command>
+ </PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
@@ -133,7 +136,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\;..\common\svn_version;..\common\svn_version_default;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;MODPLUG_TRACKER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -181,6 +184,9 @@
<Manifest>
<AdditionalManifestFiles>$(ProjectDir)res/rt_manif.bin;%(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
+ <PreBuildEvent>
+ <Command>subwcrev .. ..\common\svn_version\svn_version.template.h ..\common\svn_version\svn_version.h || del ..\common\svn_version\svn_version.h || true</Command>
+ </PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'">
<Midl>
@@ -193,7 +199,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\;..\common\svn_version;..\common\svn_version_default;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;MODPLUG_TRACKER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -242,6 +248,9 @@
<Manifest>
<AdditionalManifestFiles>$(ProjectDir)res/rt_manif.bin;%(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
+ <PreBuildEvent>
+ <Command>subwcrev .. ..\common\svn_version\svn_version.template.h ..\common\svn_version\svn_version.h || del ..\common\svn_version\svn_version.h || true</Command>
+ </PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\common\AudioCriticalSection.cpp" />
@@ -250,6 +259,7 @@
<ClCompile Include="..\common\Profiler.cpp" />
<ClCompile Include="..\common\serialization_utils.cpp" />
<ClCompile Include="..\common\typedefs.cpp" />
+ <ClCompile Include="..\common\version.cpp" />
<ClCompile Include="..\sounddev\SoundDevice.cpp" />
<ClCompile Include="..\sounddsp\AGC.cpp" />
<ClCompile Include="..\sounddsp\DSP.cpp" />
@@ -409,6 +419,8 @@
<ClInclude Include="..\common\Profiler.h" />
<ClInclude Include="..\common\serialization_utils.h" />
<ClInclude Include="..\common\StringFixer.h" />
+ <ClInclude Include="..\common\svn_version\svn_version.template.h" />
+ <ClInclude Include="..\common\svn_version_default\svn_version.h" />
<ClInclude Include="..\common\typedefs.h" />
<ClInclude Include="..\common\version.h" />
<ClInclude Include="..\sounddev\SoundDevice.h" />
Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters 2013-04-20 13:45:16 UTC (rev 1918)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters 2013-04-20 18:48:30 UTC (rev 1919)
@@ -436,6 +436,9 @@
<ClCompile Include="Reporting.cpp">
<Filter>Source Files\mptrack</Filter>
</ClCompile>
+ <ClCompile Include="..\common\version.cpp">
+ <Filter>Source Files\common</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\soundlib\Loaders.h">
@@ -801,6 +804,12 @@
<ClInclude Include="Reporting.h">
<Filter>Header Files\mptrack</Filter>
</ClInclude>
+ <ClInclude Include="..\common\svn_version\svn_version.template.h">
+ <Filter>Header Files\common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\common\svn_version_default\svn_version.h">
+ <Filter>Header Files\common</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="res\bitmap1.bmp">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
