Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[4246] trunk/OpenMPT
|
From: <man...@us...> - 2014-09-07 06:28:00
|
Revision: 4246
http://sourceforge.net/p/modplug/code/4246
Author: manxorist
Date: 2014-09-07 06:27:42 +0000 (Sun, 07 Sep 2014)
Log Message:
-----------
[Ref] build: Cleanup the svn_version.h mess:
[Ref] build: For MSVC projects, add a batch file that gets called in each project that needs svn_version.h in order to avoid duplicating the exact commandline.
[Ref] build: For MSVC projects, move svn_version.h to the intermediate build directory for all projects.
[Ref] build: Move default svn_version.h to buil/dsvn_version/svn_version.h .
[Ref] build: Adjust tarball generation.
[Ref] build: Related cleanups and refactoring.
Modified Paths:
--------------
trunk/OpenMPT/Makefile
trunk/OpenMPT/build/android_ndk/Android.mk
trunk/OpenMPT/build/vs2008/libopenmpt/libopenmpt.vcproj
trunk/OpenMPT/common/version.cpp
trunk/OpenMPT/libopenmpt/in_openmpt.cpp
trunk/OpenMPT/libopenmpt/in_openmpt.vcxproj
trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj
trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters
trunk/OpenMPT/libopenmpt/libopenmptDLL.vcxproj
trunk/OpenMPT/libopenmpt/libopenmptDLL.vcxproj.filters
trunk/OpenMPT/libopenmpt/libopenmpt_modplug.vcxproj
trunk/OpenMPT/libopenmpt/libopenmpt_test.vcxproj
trunk/OpenMPT/libopenmpt/libopenmpt_test.vcxproj.filters
trunk/OpenMPT/libopenmpt/xmp-openmpt.cpp
trunk/OpenMPT/libopenmpt/xmp-openmpt.vcxproj
trunk/OpenMPT/mptrack/mptrack_08.vcproj
trunk/OpenMPT/mptrack/mptrack_10.vcxproj
trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters
Added Paths:
-----------
trunk/OpenMPT/build/svn_version/
trunk/OpenMPT/build/svn_version/svn_version.h
trunk/OpenMPT/build/svn_version/svn_version.template.subwcrev.h
trunk/OpenMPT/build/svn_version/update_svn_version_vs.cmd
Removed Paths:
-------------
trunk/OpenMPT/common/svn_version_default/
trunk/OpenMPT/common/svn_version_subwcrev/
trunk/OpenMPT/common/svn_version_svnversion/
trunk/OpenMPT/mptrack/svn_version/
Modified: trunk/OpenMPT/Makefile
===================================================================
--- trunk/OpenMPT/Makefile 2014-09-07 06:11:46 UTC (rev 4245)
+++ trunk/OpenMPT/Makefile 2014-09-07 06:27:42 UTC (rev 4246)
@@ -375,25 +375,24 @@
-include build/dist.mk
-ifeq ($(BUILD_SVNVERSION),)
+CPPFLAGS += -Ibuild/svn_version
+ifeq ($(MPT_SVNVERSION),)
SVN_INFO:=$(shell svn info . > /dev/null 2>&1 ; echo $$? )
ifeq ($(SVN_INFO),0)
# in svn checkout
-BUILD_SVNVERSION := $(shell svnversion -n . | tr ':' '-' )
-CPPFLAGS += -Icommon/svn_version_svnversion -D BUILD_SVNVERSION=\"$(BUILD_SVNVERSION)\"
-DIST_OPENMPT_VERSION:=r$(BUILD_SVNVERSION)
-DIST_LIBOPENMPT_VERSION:=$(LIBOPENMPT_VERSION_MAJOR).$(LIBOPENMPT_VERSION_MINOR).$(BUILD_SVNVERSION)
+MPT_SVNVERSION := $(shell svnversion -n . | tr ':' '-' )
+CPPFLAGS += -D MPT_SVNVERSION=\"$(MPT_SVNVERSION)\"
+DIST_OPENMPT_VERSION:=r$(MPT_SVNVERSION)
+DIST_LIBOPENMPT_VERSION:=$(LIBOPENMPT_VERSION_MAJOR).$(LIBOPENMPT_VERSION_MINOR).$(MPT_SVNVERSION)
else
# not in svn checkout
-CPPFLAGS += -Icommon/svn_version_default
DIST_OPENMPT_VERSION:=rUNKNOWN
DIST_LIBOPENMPT_VERSION:=$(LIBOPENMPT_VERSION_MAJOR).$(LIBOPENMPT_VERSION_MINOR)
endif
else
# in dist package
-CPPFLAGS += -Icommon/svn_version_default
-DIST_OPENMPT_VERSION:=r$(BUILD_SVNVERSION)
-DIST_LIBOPENMPT_VERSION:=$(LIBOPENMPT_VERSION_MAJOR).$(LIBOPENMPT_VERSION_MINOR).$(BUILD_SVNVERSION)
+DIST_OPENMPT_VERSION:=r$(MPT_SVNVERSION)
+DIST_LIBOPENMPT_VERSION:=$(LIBOPENMPT_VERSION_MAJOR).$(LIBOPENMPT_VERSION_MINOR).$(MPT_SVNVERSION)
endif
@@ -690,7 +689,7 @@
.PHONY: bin/dist.mk
bin/dist.mk:
rm -rf $@
- echo 'BUILD_SVNVERSION=$(BUILD_SVNVERSION)' > $@.tmp
+ echo 'MPT_SVNVERSION=$(MPT_SVNVERSION)' > $@.tmp
mv $@.tmp $@
.PHONY: bin/svn_version_dist.h
@@ -698,9 +697,9 @@
rm -rf $@
echo > $@.tmp
echo '#pragma once' >> $@.tmp
- echo '#define BUILD_SVNVERSION "$(BUILD_SVNVERSION)"' >> $@.tmp
- echo '#define BUILD_PACKAGE true' >> $@.tmp
- echo '#include "../svn_version_svnversion/svn_version.h"' >> $@.tmp
+ echo '#define OPENMPT_VERSION_SVNVERSION "$(MPT_SVNVERSION)"' >> $@.tmp
+ echo '#define OPENMPT_VERSION_IS_PACKAGE true' >> $@.tmp
+ echo >> $@.tmp
mv $@.tmp $@
.PHONY: bin/dist-doc/libopenmpt-doc-$(DIST_LIBOPENMPT_VERSION).tar
@@ -731,7 +730,7 @@
svn export ./include/miniz bin/dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/miniz
svn export ./include/modplug bin/dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/modplug
cp bin/dist.mk bin/dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/dist.mk
- cp bin/svn_version_dist.h bin/dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/common/svn_version_default/svn_version.h
+ cp bin/svn_version_dist.h bin/dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/svn_version/svn_version.h
cd bin/dist-tar/ && tar cv libopenmpt-$(DIST_LIBOPENMPT_VERSION) > libopenmpt-$(DIST_LIBOPENMPT_VERSION).tar
.PHONY: bin/dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)-windows.zip
@@ -760,7 +759,7 @@
svn export ./include/xmplay bin/dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/xmplay --native-eol CRLF
svn export ./include/msinttypes bin/dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/msinttypes --native-eol CRLF
cp bin/dist.mk bin/dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/dist.mk
- cp bin/svn_version_dist.h bin/dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/common/svn_version_default/svn_version.h
+ cp bin/svn_version_dist.h bin/dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/svn_version/svn_version.h
cd bin/dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/ && zip -r ../libopenmpt-$(DIST_LIBOPENMPT_VERSION)-windows.zip --compression-method deflate -9 *
.PHONY: bin/dist-zip/OpenMPT-src-$(DIST_OPENMPT_VERSION).zip
Modified: trunk/OpenMPT/build/android_ndk/Android.mk
===================================================================
--- trunk/OpenMPT/build/android_ndk/Android.mk 2014-09-07 06:11:46 UTC (rev 4245)
+++ trunk/OpenMPT/build/android_ndk/Android.mk 2014-09-07 06:27:42 UTC (rev 4246)
@@ -8,7 +8,7 @@
LOCAL_CPP_FEATURES += exceptions
LOCAL_CPP_FEATURES += rtti
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/common $(LOCAL_PATH)/common/svn_version_default
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/common $(LOCAL_PATH)/build/svn_version
LOCAL_CFLAGS := -fvisibility=hidden -DLIBOPENMPT_BUILD -DMPT_WITH_ZLIB
LOCAL_CPPFLAGS := -std=c++11 -fvisibility=hidden -DLIBOPENMPT_BUILD -DMPT_WITH_ZLIB
Index: trunk/OpenMPT/build/svn_version
===================================================================
--- trunk/OpenMPT/build/svn_version 2014-09-07 06:11:46 UTC (rev 4245)
+++ trunk/OpenMPT/build/svn_version 2014-09-07 06:27:42 UTC (rev 4246)
Property changes on: trunk/OpenMPT/build/svn_version
___________________________________________________________________
Added: tsvn:logminsize
## -0,0 +1 ##
+10
\ No newline at end of property
Copied: trunk/OpenMPT/build/svn_version/svn_version.h (from rev 4111, trunk/OpenMPT/common/svn_version_svnversion/svn_version.h)
===================================================================
--- trunk/OpenMPT/build/svn_version/svn_version.h (rev 0)
+++ trunk/OpenMPT/build/svn_version/svn_version.h 2014-09-07 06:27:42 UTC (rev 4246)
@@ -0,0 +1,12 @@
+
+#pragma once
+
+#if defined(MPT_PACKAGE)
+#define OPENMPT_VERSION_IS_PACKAGE true
+#else
+#define OPENMPT_VERSION_IS_PACKAGE false
+#endif
+
+#if defined(MPT_SVNVERSION)
+#define OPENMPT_VERSION_SVNVERSION MPT_SVNVERSION
+#endif
Copied: trunk/OpenMPT/build/svn_version/svn_version.template.subwcrev.h (from rev 4245, trunk/OpenMPT/common/svn_version_subwcrev/svn_version.template.h)
===================================================================
--- trunk/OpenMPT/build/svn_version/svn_version.template.subwcrev.h (rev 0)
+++ trunk/OpenMPT/build/svn_version/svn_version.template.subwcrev.h 2014-09-07 06:27:42 UTC (rev 4246)
@@ -0,0 +1,12 @@
+
+#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_IS_PACKAGE false
+
+#define OPENMPT_VERSION_DATE "$WCNOW=%Y-%m-%d %H:%M:%S$"
Added: trunk/OpenMPT/build/svn_version/update_svn_version_vs.cmd
===================================================================
--- trunk/OpenMPT/build/svn_version/update_svn_version_vs.cmd (rev 0)
+++ trunk/OpenMPT/build/svn_version/update_svn_version_vs.cmd 2014-09-07 06:27:42 UTC (rev 4246)
@@ -0,0 +1,5 @@
+@echo off
+set INTDIR=%1%
+mkdir %INTDIR%svn_version
+subwcrev .. ..\build\svn_version\svn_version.template.subwcrev.h %INTDIR%svn_version\svn_version.h || del %INTDIR%svn_version\svn_version.h || exit 0
+exit 0
Property changes on: trunk/OpenMPT/build/svn_version/update_svn_version_vs.cmd
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/x-cmd
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+CRLF
\ No newline at end of property
Modified: trunk/OpenMPT/build/vs2008/libopenmpt/libopenmpt.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008/libopenmpt/libopenmpt.vcproj 2014-09-07 06:11:46 UTC (rev 4245)
+++ trunk/OpenMPT/build/vs2008/libopenmpt/libopenmpt.vcproj 2014-09-07 06:27:42 UTC (rev 4246)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;../../..;../../../common;../../../include/msinttypes/inttypes;../../../include/msinttypes/stdint;../../../common/svn_version_default;../../../include"
+ AdditionalIncludeDirectories=".;../../..;../../../common;../../../include/msinttypes/inttypes;../../../include/msinttypes/stdint;../../../build/svn_version;../../../include"
PreprocessorDefinitions="LIBOPENMPT_BUILD"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -103,7 +103,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=".;../../..;../../../common;../../../include/msinttypes/inttypes;../../../include/msinttypes/stdint;../../../common/svn_version_default;../../../include"
+ AdditionalIncludeDirectories=".;../../..;../../../common;../../../include/msinttypes/inttypes;../../../include/msinttypes/stdint;../../../build/svn_version;../../../include"
PreprocessorDefinitions="LIBOPENMPT_BUILD"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
Modified: trunk/OpenMPT/common/version.cpp
===================================================================
--- trunk/OpenMPT/common/version.cpp 2014-09-07 06:11:46 UTC (rev 4245)
+++ trunk/OpenMPT/common/version.cpp 2014-09-07 06:27:42 UTC (rev 4246)
@@ -13,6 +13,7 @@
#include <iomanip>
#include <locale>
#include <sstream>
+#include <string>
#include "versionNumber.h"
#include "svn_version.h"
@@ -117,6 +118,37 @@
{
#if defined(OPENMPT_VERSION_REVISION)
return OPENMPT_VERSION_REVISION;
+ #elif defined(OPENMPT_VERSION_SVNVERSION)
+ std::string svnversion = OPENMPT_VERSION_SVNVERSION;
+ if(svnversion.length() == 0)
+ {
+ return 0;
+ }
+ if(svnversion.find(":") != std::string::npos)
+ {
+ svnversion = svnversion.substr(svnversion.find(":") + 1);
+ }
+ if(svnversion.find("-") != std::string::npos)
+ {
+ svnversion = svnversion.substr(svnversion.find("-") + 1);
+ }
+ if(svnversion.find("M") != std::string::npos)
+ {
+ svnversion = svnversion.substr(0, svnversion.find("M"));
+ }
+ if(svnversion.find("S") != std::string::npos)
+ {
+ svnversion = svnversion.substr(0, svnversion.find("S"));
+ }
+ if(svnversion.find("P") != std::string::npos)
+ {
+ svnversion = svnversion.substr(0, svnversion.find("P"));
+ }
+ int revision = 0;
+ std::istringstream s( svnversion );
+ s.imbue(std::locale::classic());
+ s >> revision;
+ return revision;
#else
return 0;
#endif
@@ -126,6 +158,17 @@
{
#if defined(OPENMPT_VERSION_DIRTY)
return OPENMPT_VERSION_DIRTY;
+ #elif defined(OPENMPT_VERSION_SVNVERSION)
+ std::string svnversion = OPENMPT_VERSION_SVNVERSION;
+ if(svnversion.length() == 0)
+ {
+ return false;
+ }
+ if(svnversion.find("M") != std::string::npos)
+ {
+ return true;
+ }
+ return false;
#else
return false;
#endif
@@ -135,6 +178,29 @@
{
#if defined(OPENMPT_VERSION_MIXEDREVISIONS)
return OPENMPT_VERSION_MIXEDREVISIONS;
+ #elif defined(OPENMPT_VERSION_SVNVERSION)
+ std::string svnversion = OPENMPT_VERSION_SVNVERSION;
+ if(svnversion.length() == 0)
+ {
+ return false;
+ }
+ if(svnversion.find(":") != std::string::npos)
+ {
+ return true;
+ }
+ if(svnversion.find("-") != std::string::npos)
+ {
+ return true;
+ }
+ if(svnversion.find("S") != std::string::npos)
+ {
+ return true;
+ }
+ if(svnversion.find("P") != std::string::npos)
+ {
+ return true;
+ }
+ return false;
#else
return false;
#endif
@@ -169,7 +235,11 @@
std::string GetBuildDateString()
{
- return OPENMPT_VERSION_DATE;
+ #if defined(OPENMPT_VERSION_DATE)
+ return OPENMPT_VERSION_DATE;
+ #else
+ return __DATE__ " " __TIME__ ;
+ #endif
}
std::string GetBuildFlagsString()
Modified: trunk/OpenMPT/libopenmpt/in_openmpt.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/in_openmpt.cpp 2014-09-07 06:11:46 UTC (rev 4245)
+++ trunk/OpenMPT/libopenmpt/in_openmpt.cpp 2014-09-07 06:27:42 UTC (rev 4246)
@@ -24,7 +24,11 @@
#include "libopenmpt_settings.hpp"
#include "svn_version.h"
+#if defined(OPENMPT_VERSION_REVISION)
static char * in_openmpt_string = "in_openmpt " OPENMPT_API_VERSION_STRING "." OPENMPT_API_VERSION_STRINGIZE(OPENMPT_VERSION_REVISION);
+#else
+static char * in_openmpt_string = "in_openmpt " OPENMPT_API_VERSION_STRING;
+#endif
#define NOMINMAX
#include <windows.h>
Modified: trunk/OpenMPT/libopenmpt/in_openmpt.vcxproj
===================================================================
--- trunk/OpenMPT/libopenmpt/in_openmpt.vcxproj 2014-09-07 06:11:46 UTC (rev 4245)
+++ trunk/OpenMPT/libopenmpt/in_openmpt.vcxproj 2014-09-07 06:27:42 UTC (rev 4246)
@@ -48,14 +48,14 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(IntDir);../common/svn_version_default;../include</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>..\include\foobar2000sdk\foobar2000\shared\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -67,7 +67,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <AdditionalIncludeDirectories>$(IntDir);../common/svn_version_default;../include</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -76,7 +76,7 @@
<AdditionalDependencies>..\include\foobar2000sdk\foobar2000\shared\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
Modified: trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj 2014-09-07 06:11:46 UTC (rev 4245)
+++ trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj 2014-09-07 06:27:42 UTC (rev 4246)
@@ -89,7 +89,7 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..;../common;$(IntDir);../common/svn_version_default;../include</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;../common;../include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories>
<PreprocessorDefinitions>LIBOPENMPT_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
@@ -97,7 +97,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
<Lib>
<AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
@@ -107,7 +107,7 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..;../common;$(IntDir);../common/svn_version_default;../include</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;../common;../include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories>
<PreprocessorDefinitions>LIBOPENMPT_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
@@ -115,7 +115,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
<Lib>
<AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
@@ -130,7 +130,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<FloatingPointModel>Fast</FloatingPointModel>
<PreprocessorDefinitions>LIBOPENMPT_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..;../common;$(IntDir);../common/svn_version_default;../include</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;../common;../include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -142,7 +142,7 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
<Lib>
<AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
@@ -157,7 +157,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<FloatingPointModel>Fast</FloatingPointModel>
<PreprocessorDefinitions>LIBOPENMPT_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..;../common;$(IntDir);../common/svn_version_default;../include</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;../common;../include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -169,7 +169,7 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
<Lib>
<AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
@@ -191,8 +191,6 @@
<ClInclude Include="..\common\serialization_utils.h" />
<ClInclude Include="..\common\stdafx.h" />
<ClInclude Include="..\common\StringFixer.h" />
- <ClInclude Include="..\common\svn_version_default\svn_version.h" />
- <ClInclude Include="..\common\svn_version_subwcrev\svn_version.template.h" />
<ClInclude Include="..\common\thread.h" />
<ClInclude Include="..\common\typedefs.h" />
<ClInclude Include="..\common\version.h" />
Modified: trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters 2014-09-07 06:11:46 UTC (rev 4245)
+++ trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters 2014-09-07 06:27:42 UTC (rev 4246)
@@ -179,9 +179,6 @@
<ClInclude Include="libopenmpt_version.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\common\svn_version_default\svn_version.h">
- <Filter>Header Files\common</Filter>
- </ClInclude>
<ClInclude Include="..\common\version.h">
<Filter>Header Files\common</Filter>
</ClInclude>
@@ -206,9 +203,6 @@
<ClInclude Include="..\soundlib\S3MTools.h">
<Filter>Header Files\soundlib</Filter>
</ClInclude>
- <ClInclude Include="..\common\svn_version_subwcrev\svn_version.template.h">
- <Filter>Header Files\common</Filter>
- </ClInclude>
<ClInclude Include="..\soundlib\Dither.h">
<Filter>Header Files\soundlib</Filter>
</ClInclude>
Modified: trunk/OpenMPT/libopenmpt/libopenmptDLL.vcxproj
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmptDLL.vcxproj 2014-09-07 06:11:46 UTC (rev 4245)
+++ trunk/OpenMPT/libopenmpt/libopenmptDLL.vcxproj 2014-09-07 06:27:42 UTC (rev 4246)
@@ -89,7 +89,7 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..;../common;$(IntDir);../common/svn_version_default;../include</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;../common;../include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDLL;LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
@@ -99,7 +99,7 @@
</DelayLoadDLLs>
</Link>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
<PostBuildEvent>
<Command>
@@ -110,7 +110,7 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..;../common;$(IntDir);../common/svn_version_default;../include</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;../common;../include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDLL;LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
@@ -120,7 +120,7 @@
</DelayLoadDLLs>
</Link>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
<PostBuildEvent>
<Command>
@@ -136,7 +136,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<FloatingPointModel>Fast</FloatingPointModel>
<PreprocessorDefinitions>_WINDLL;LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..;../common;$(IntDir);../common/svn_version_default;../include</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;../common;../include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -151,7 +151,7 @@
</DelayLoadDLLs>
</Link>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
<PostBuildEvent />
</ItemDefinitionGroup>
@@ -164,7 +164,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<FloatingPointModel>Fast</FloatingPointModel>
<PreprocessorDefinitions>_WINDLL;LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..;../common;$(IntDir);../common/svn_version_default;../include</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;../common;../include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -179,7 +179,7 @@
</DelayLoadDLLs>
</Link>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
<PostBuildEvent />
</ItemDefinitionGroup>
@@ -199,8 +199,6 @@
<ClInclude Include="..\common\serialization_utils.h" />
<ClInclude Include="..\common\stdafx.h" />
<ClInclude Include="..\common\StringFixer.h" />
- <ClInclude Include="..\common\svn_version_default\svn_version.h" />
- <ClInclude Include="..\common\svn_version_subwcrev\svn_version.template.h" />
<ClInclude Include="..\common\thread.h" />
<ClInclude Include="..\common\typedefs.h" />
<ClInclude Include="..\common\version.h" />
Modified: trunk/OpenMPT/libopenmpt/libopenmptDLL.vcxproj.filters
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmptDLL.vcxproj.filters 2014-09-07 06:11:46 UTC (rev 4245)
+++ trunk/OpenMPT/libopenmpt/libopenmptDLL.vcxproj.filters 2014-09-07 06:27:42 UTC (rev 4246)
@@ -179,9 +179,6 @@
<ClInclude Include="libopenmpt_version.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\common\svn_version_default\svn_version.h">
- <Filter>Header Files\common</Filter>
- </ClInclude>
<ClInclude Include="..\common\version.h">
<Filter>Header Files\common</Filter>
</ClInclude>
@@ -206,9 +203,6 @@
<ClInclude Include="..\soundlib\S3MTools.h">
<Filter>Header Files\soundlib</Filter>
</ClInclude>
- <ClInclude Include="..\common\svn_version_subwcrev\svn_version.template.h">
- <Filter>Header Files\common</Filter>
- </ClInclude>
<ClInclude Include="..\soundlib\Dither.h">
<Filter>Header Files\soundlib</Filter>
</ClInclude>
Modified: trunk/OpenMPT/libopenmpt/libopenmpt_modplug.vcxproj
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_modplug.vcxproj 2014-09-07 06:11:46 UTC (rev 4245)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_modplug.vcxproj 2014-09-07 06:27:42 UTC (rev 4246)
@@ -89,7 +89,7 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..;$(IntDir);../common/svn_version_default;../include/modplug/include</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;../include/modplug/include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDLL;LIBOPENMPT_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
@@ -99,7 +99,7 @@
</DelayLoadDLLs>
</Link>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
<PostBuildEvent>
<Command>
@@ -110,7 +110,7 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..;../common;$(IntDir);../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;../include/modplug/include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDLL;LIBOPENMPT_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
@@ -120,7 +120,7 @@
</DelayLoadDLLs>
</Link>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
<PostBuildEvent>
<Command>
@@ -136,7 +136,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<FloatingPointModel>Fast</FloatingPointModel>
<PreprocessorDefinitions>_WINDLL;LIBOPENMPT_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..;$(IntDir);../common/svn_version_default;../include/modplug/include</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;../include/modplug/include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -151,7 +151,7 @@
</DelayLoadDLLs>
</Link>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
<PostBuildEvent />
</ItemDefinitionGroup>
@@ -164,7 +164,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<FloatingPointModel>Fast</FloatingPointModel>
<PreprocessorDefinitions>_WINDLL;LIBOPENMPT_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..;../common;$(IntDir);../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;../include/modplug/include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -179,7 +179,7 @@
</DelayLoadDLLs>
</Link>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
<PostBuildEvent />
</ItemDefinitionGroup>
Modified: trunk/OpenMPT/libopenmpt/libopenmpt_test.vcxproj
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_test.vcxproj 2014-09-07 06:11:46 UTC (rev 4245)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_test.vcxproj 2014-09-07 06:27:42 UTC (rev 4246)
@@ -85,7 +85,7 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..;../common;$(IntDir);../common/svn_version_default;../include</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;../common;../include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories>
<PreprocessorDefinitions>LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
@@ -95,7 +95,7 @@
</DelayLoadDLLs>
</Link>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
<PostBuildEvent>
<Command>
@@ -106,7 +106,7 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..;../common;$(IntDir);../common/svn_version_default;../include</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;../common;../include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories>
<PreprocessorDefinitions>LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
@@ -116,7 +116,7 @@
</DelayLoadDLLs>
</Link>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
<PostBuildEvent>
<Command>
@@ -132,7 +132,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<FloatingPointModel>Fast</FloatingPointModel>
<PreprocessorDefinitions>LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..;../common;$(IntDir);../common/svn_version_default;../include</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;../common;../include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -147,7 +147,7 @@
</DelayLoadDLLs>
</Link>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
<PostBuildEvent />
</ItemDefinitionGroup>
@@ -160,7 +160,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<FloatingPointModel>Fast</FloatingPointModel>
<PreprocessorDefinitions>LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..;../common;$(IntDir);../common/svn_version_default;../include</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;../common;../include;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -175,7 +175,7 @@
</DelayLoadDLLs>
</Link>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
<PostBuildEvent />
</ItemDefinitionGroup>
@@ -195,8 +195,6 @@
<ClInclude Include="..\common\serialization_utils.h" />
<ClInclude Include="..\common\stdafx.h" />
<ClInclude Include="..\common\StringFixer.h" />
- <ClInclude Include="..\common\svn_version_default\svn_version.h" />
- <ClInclude Include="..\common\svn_version_subwcrev\svn_version.template.h" />
<ClInclude Include="..\common\thread.h" />
<ClInclude Include="..\common\typedefs.h" />
<ClInclude Include="..\common\version.h" />
Modified: trunk/OpenMPT/libopenmpt/libopenmpt_test.vcxproj.filters
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_test.vcxproj.filters 2014-09-07 06:11:46 UTC (rev 4245)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_test.vcxproj.filters 2014-09-07 06:27:42 UTC (rev 4246)
@@ -179,9 +179,6 @@
<ClInclude Include="libopenmpt_version.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\common\svn_version_default\svn_version.h">
- <Filter>Header Files\common</Filter>
- </ClInclude>
<ClInclude Include="..\common\version.h">
<Filter>Header Files\common</Filter>
</ClInclude>
@@ -206,9 +203,6 @@
<ClInclude Include="..\soundlib\S3MTools.h">
<Filter>Header Files\soundlib</Filter>
</ClInclude>
- <ClInclude Include="..\common\svn_version_subwcrev\svn_version.template.h">
- <Filter>Header Files\common</Filter>
- </ClInclude>
<ClInclude Include="..\soundlib\Dither.h">
<Filter>Header Files\soundlib</Filter>
</ClInclude>
Modified: trunk/OpenMPT/libopenmpt/xmp-openmpt.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/xmp-openmpt.cpp 2014-09-07 06:11:46 UTC (rev 4245)
+++ trunk/OpenMPT/libopenmpt/xmp-openmpt.cpp 2014-09-07 06:27:42 UTC (rev 4246)
@@ -27,7 +27,11 @@
#include "libopenmpt_settings.hpp"
#include "svn_version.h"
+#if defined(OPENMPT_VERSION_REVISION)
static const char * xmp_openmpt_string = "OpenMPT (" OPENMPT_API_VERSION_STRING "." OPENMPT_API_VERSION_STRINGIZE(OPENMPT_VERSION_REVISION) ")";
+#else
+static const char * xmp_openmpt_string = "OpenMPT (" OPENMPT_API_VERSION_STRING ")";
+#endif
#define EXPERIMENTAL_VIS
Modified: trunk/OpenMPT/libopenmpt/xmp-openmpt.vcxproj
===================================================================
--- trunk/OpenMPT/libopenmpt/xmp-openmpt.vcxproj 2014-09-07 06:11:46 UTC (rev 4245)
+++ trunk/OpenMPT/libopenmpt/xmp-openmpt.vcxproj 2014-09-07 06:27:42 UTC (rev 4246)
@@ -48,14 +48,14 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(IntDir);../common/svn_version_default;../include;../include/pugixml/src</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../include;../include/pugixml/src;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>..\include\foobar2000sdk\foobar2000\shared\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -67,7 +67,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <AdditionalIncludeDirectories>$(IntDir);../common/svn_version_default;../include;../include/pugixml/src</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../include;../include/pugixml/src;$(IntDir)svn_version;../build/svn_version</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -76,7 +76,7 @@
<AdditionalDependencies>..\include\foobar2000sdk\foobar2000\shared\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
Modified: trunk/OpenMPT/mptrack/mptrack_08.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_08.vcproj 2014-09-07 06:11:46 UTC (rev 4245)
+++ trunk/OpenMPT/mptrack/mptrack_08.vcproj 2014-09-07 06:27:42 UTC (rev 4246)
@@ -30,7 +30,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\mptrack\svn_version\svn_version.h || del ..\mptrack\svn_version\svn_version.h || true"
+ CommandLine="..\build\svn_version\update_svn_version_vs.cmd $(IntDir)\"
/>
<Tool
Name="VCCustomBuildTool"
@@ -52,7 +52,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\mptrack\svn_version;..\common\svn_version_default"
+ AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;"$(IntDir)\svn_version";..\build\svn_version"
PreprocessorDefinitions="_DEBUG,WIN32,_WINDOWS,MODPLUG_TRACKER"
StringPooling="true"
ExceptionHandling="2"
@@ -130,7 +130,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\mptrack\svn_version\svn_version.h || del ..\mptrack\svn_version\svn_version.h || true"
+ CommandLine="..\build\svn_version\update_svn_version_vs.cmd $(IntDir)\"
/>
<Tool
Name="VCCustomBuildTool"
@@ -152,7 +152,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\mptrack\svn_version;..\common\svn_version_default"
+ AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;"$(IntDir)\svn_version";..\build\svn_version"
PreprocessorDefinitions="_DEBUG,WIN32,_WINDOWS,MODPLUG_TRACKER"
StringPooling="true"
ExceptionHandling="2"
@@ -231,7 +231,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\mptrack\svn_version\svn_version.h || del ..\mptrack\svn_version\svn_version.h || true"
+ CommandLine="..\build\svn_version\update_svn_version_vs.cmd $(IntDir)\"
/>
<Tool
Name="VCCustomBuildTool"
@@ -254,7 +254,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\mptrack\svn_version;..\common\svn_version_default"
+ AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;"$(IntDir)\svn_version";..\build\svn_version"
PreprocessorDefinitions="NDEBUG,WIN32,_WINDOWS,MODPLUG_TRACKER"
StringPooling="true"
ExceptionHandling="2"
@@ -331,7 +331,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\mptrack\svn_version\svn_version.h || del ..\mptrack\svn_version\svn_version.h || true"
+ CommandLine="..\build\svn_version\update_svn_version_vs.cmd $(IntDir)\"
/>
<Tool
Name="VCCustomBuildTool"
@@ -354,7 +354,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\mptrack\svn_version;..\common\svn_version_default"
+ AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;"$(IntDir)\svn_version";..\build\svn_version"
PreprocessorDefinitions="NDEBUG,WIN32,_WINDOWS,MODPLUG_TRACKER"
StringPooling="true"
ExceptionHandling="2"
@@ -1514,14 +1514,6 @@
>
</File>
<File
- RelativePath="..\common\svn_version_default\svn_version.h"
- >
- </File>
- <File
- RelativePath=".\svn_version\svn_version.h"
- >
- </File>
- <File
RelativePath=".\Tables.h"
>
</File>
Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2014-09-07 06:11:46 UTC (rev 4245)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2014-09-07 06:27:42 UTC (rev 4246)
@@ -124,7 +124,7 @@
<ClCompile>
<AdditionalOptions>/EHsc %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\mptrack\svn_version;..\common\svn_version_default;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;$(IntDir)svn_version;..\build\svn_version;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;MODPLUG_TRACKER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -163,7 +163,7 @@
<AdditionalManifestFiles>$(ProjectDir)res/rt_manif.bin;%(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\mptrack\svn_version\svn_version.h || del ..\mptrack\svn_version\svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -175,7 +175,7 @@
<ClCompile>
<AdditionalOptions>/EHsc %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\mptrack\svn_version;..\common\svn_version_default;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;$(IntDir)svn_version;..\build\svn_version;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;MODPLUG_TRACKER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -214,7 +214,7 @@
<AdditionalManifestFiles>$(ProjectDir)res/rt_manif.bin;%(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\mptrack\svn_version\svn_version.h || del ..\mptrack\svn_version\svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -227,7 +227,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\mptrack\svn_version;..\common\svn_version_default;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;$(IntDir)svn_version;..\build\svn_version;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;MODPLUG_TRACKER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -271,7 +271,7 @@
<AdditionalManifestFiles>$(ProjectDir)res/rt_manif.bin;%(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\mptrack\svn_version\svn_version.h || del ..\mptrack\svn_version\svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -283,7 +283,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\mptrack\svn_version;..\common\svn_version_default;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;$(IntDir)svn_version;..\build\svn_version;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;MODPLUG_TRACKER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -327,7 +327,7 @@
<AdditionalManifestFiles>$(ProjectDir)res/rt_manif.bin;%(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\mptrack\svn_version\svn_version.h || del ..\mptrack\svn_version\svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">
@@ -340,7 +340,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\mptrack\svn_version;..\common\svn_version_default;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;$(IntDir)svn_version;..\build\svn_version;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;MODPLUG_TRACKER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -384,7 +384,7 @@
<AdditionalManifestFiles>$(ProjectDir)res/rt_manif.bin;%(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\mptrack\svn_version\svn_version.h || del ..\mptrack\svn_version\svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">
@@ -396,7 +396,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\mptrack\svn_version;..\common\svn_version_default;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;$(IntDir)svn_version;..\build\svn_version;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;MODPLUG_TRACKER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -440,7 +440,7 @@
<AdditionalManifestFiles>$(ProjectDir)res/rt_manif.bin;%(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
<PreBuildEvent>
- <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\mptrack\svn_version\svn_version.h || del ..\mptrack\svn_version\svn_version.h || true</Command>
+ <Command>..\build\svn_version\update_svn_version_vs.cmd $(IntDir)</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
@@ -653,7 +653,6 @@
<ClInclude Include="..\common\Profiler.h" />
<ClInclude Include="..\common\serialization_utils.h" />
<ClInclude Include="..\common\StringFixer.h" />
- <ClInclude Include="..\common\svn_version_default\svn_version.h" />
<ClInclude Include="..\common\thread.h" />
<ClInclude Include="..\common\typedefs.h" />
<ClInclude Include="..\common\version.h" />
@@ -789,7 +788,6 @@
<ClInclude Include="StreamEncoderOpus.h" />
<ClInclude Include="StreamEncoderVorbis.h" />
<ClInclude Include="StreamEncoderWAV.h" />
- <ClInclude Include="svn_version\svn_version.h" />
<ClInclude Include="TrackerSettings.h" />
<ClInclude Include="TuningDialog.h" />
<ClInclude Include="tuningRatioMapWnd.h" />
Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters 2014-09-07 06:11:46 UTC (rev 4245)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters 2014-09-07 06:27:42 UTC (rev 4246)
@@ -864,9 +864,6 @@
<ClInclude Include="Reporting.h">
<Filter>Header Files\mptrack</Filter>
</ClInclude>
- <ClInclude Include="..\common\svn_version_default\svn_version.h">
- <Filter>Header Files\common</Filter>
- </ClInclude>
<ClInclude Include="resource.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -957,9 +954,6 @@
<ClInclude Include="Settings.h">
<Filter>Header Files\mptrack</Filter>
</ClInclude>
- <ClInclude Include="svn_version\svn_version.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\common\mptFstream.h">
<Filter>Header Files\common</Filter>
</ClInclude>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
