vs200x: print svn revision number in version string.

src/config.cpp

@@ -6,6 +6,7 @@
 #include <stdlib.h>
 
 #include "types.h"
+#include "version.h"
 #include "fceu.h"
 #include "driver.h"
 

src/drivers/sdl/sdl-video.cpp

@@ -29,6 +29,7 @@
 #include "sdl-opengl.h"
 #include "../common/vidblit.h"
 #include "../../fceu.h"
+#include "../../version.h"
 
 #include "sdl-icon.h"
 #include "dface.h"

src/drivers/sdl/sdl.cpp

@@ -21,6 +21,7 @@
 #include "../common/cheat.h"
 #include "../../fceu.h"
 #include "../../movie.h"
+#include "../../version.h"
 #ifdef _S9XLUA_H
 #include "../../fceulua.h"
 #endif

src/drivers/win/directories.cpp

@@ -1,3 +1,4 @@
+#include "../../version.h"
 #include "common.h"
 #include "main.h"
 #include "window.h"

src/drivers/win/input.cpp

@@ -21,6 +21,8 @@
 // For commctrl.h below
 #define _WIN32_IE	0x0300
 
+#include "../../version.h"
+
 #include "common.h"
 #include "dinput.h"
 #include <windows.h>

src/drivers/win/main.cpp

@@ -35,6 +35,7 @@
 
 #include <fstream>
 
+#include "../../version.h"
 #include "../../types.h"
 #include "../../fceu.h"
 #include "../../state.h"

src/drivers/win/palette.cpp

@@ -1,3 +1,4 @@
+#include "../../version.h"
 #include "common.h"
 #include "main.h"
 #include "window.h"

src/drivers/win/state.cpp

@@ -1,4 +1,5 @@
 #include "common.h"
+#include "../../version.h"
 #include "../../state.h"
 #include <string>
 #include <string.h>

src/drivers/win/tracer.cpp

@@ -28,6 +28,7 @@
 #include "../../file.h"
 #include "../../debug.h"
 #include "../../asm.h"
+#include "../../version.h"
 #include "cdlogger.h"
 #include "tracer.h"
 #include "memview.h"

src/drivers/win/window.cpp

@@ -24,6 +24,7 @@
 #include "../../input.h"
 #include "../../state.h"
 #include "../../cheat.h" //adelikat: For FCEU_LoadGameCheats()
+#include "../../version.h"
 #include "window.h"
 #include "main.h"
 #include "state.h"

src/movie.cpp

@@ -9,6 +9,7 @@
 #include <stdarg.h>
 
 
+#include "version.h"
 #include "types.h"
 #include "utils/endian.h"
 #include "palette.h"

src/oldmovie.cpp

@@ -1,3 +1,4 @@
+#include "version.h"
 #include "types.h"
 #include "fceu.h"
 #include "driver.h"

src/state.cpp

@@ -29,6 +29,7 @@
 #include <vector>
 #include <fstream>
 
+#include "version.h"
 #include "types.h"
 #include "x6502.h"
 #include "fceu.h"

src/types.h

@@ -22,11 +22,6 @@
 #ifndef __FCEU_TYPES
 #define __FCEU_TYPES
 
-#define FCEU_NAME "FCEUX"
-#define FCEU_VERSION_STRING "2.1.2-interim"
-#define FCEU_VERSION_NUMERIC 21020
-#define FCEU_NAME_AND_VERSION FCEU_NAME " " FCEU_VERSION_STRING
-
 ///causes the code fragment argument to be compiled in if the build includes debugging
 #ifdef FCEUDEF_DEBUGGER
 #define DEBUG(X) X;

src/version.h

@@ -0,0 +1,65 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2001 Aaron Oneal
+ *  Copyright (C) 2002 Xodnizel
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */  
+
+#ifndef __FCEU_VERSION
+#define __FCEU_VERSION
+
+//todo - everyone will want to support this eventually, i suppose
+#ifdef _MSC_VER
+#include "svnrev.h"
+#else
+#ifdef SVN_REV
+#define SVN_REV_STR SVN_REV
+#else
+#define SVN_REV_STR ""
+#endif
+#endif
+
+#define FCEU_NAME "FCEUX"
+
+#define FCEU_FEATURE_STRING ""
+
+#ifdef _DEBUG
+#define FCEU_SUBVERSION_STRING " debug"
+#elif defined(PUBLIC_RELEASE)
+#define FCEU_SUBVERSION_STRING ""
+#else
+#define FCEU_SUBVERSION_STRING "-interim svn" SVN_REV_STR
+#endif
+
+#if defined(_MSC_VER)
+#define FCEU_COMPILER ""
+#define FCEU_COMPILER_DETAIL " msvc " _Py_STRINGIZE(_MSC_VER)
+#define _Py_STRINGIZE(X) _Py_STRINGIZE1((X))
+#define _Py_STRINGIZE1(X) _Py_STRINGIZE2 ## X
+#define _Py_STRINGIZE2(X) #X
+//re: http://72.14.203.104/search?q=cache:HG-okth5NGkJ:mail.python.org/pipermail/python-checkins/2002-November/030704.html+_msc_ver+compiler+version+string&hl=en&gl=us&ct=clnk&cd=5
+#else
+// TODO: make for others compilers
+#define FCEU_COMPILER ""
+#define FCEU_COMPILER_DETAIL ""
+#endif
+
+#define FCEU_VERSION_NUMERIC 21020
+#define FCEU_VERSION_STRING "2.1.2" FCEU_SUBVERSION_STRING FCEU_FEATURE_STRING FCEU_COMPILER
+#define FCEU_NAME_AND_VERSION FCEU_NAME " " FCEU_VERSION_STRING
+
+#endif

vc/defaultconfig/SubWCRev.bat

@@ -0,0 +1,2 @@
+defaultconfig\SubWCRev.exe ..\.. ".\defaultconfig\svnrev_template.h" ".\userconfig\svnrev.h"
+exit 0

vc/defaultconfig/svnrev.h

@@ -0,0 +1,5 @@
+//this should be overridden with one generated in userconfig
+//but it is here just in case to prevent compiler errors
+
+#define SVN_REV 0
+#define SVN_REV_STR "0"

vc/defaultconfig/svnrev_template.h

@@ -0,0 +1,2 @@
+#define SVN_REV $WCREV$
+#define SVN_REV_STR "$WCREV$"

vc/userconfig/readme.txt

@@ -0,0 +1 @@
+see the defaultconfig directory for more information on what this is all about

vc/vc8_fceux.vcproj

@@ -27,6 +27,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="defaultconfig\SubWCRev.bat"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -43,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../src/drivers/win/zlib;../src/drivers/win/directx;../src;../src/drivers/win/lua/include"
+				AdditionalIncludeDirectories="../src/drivers/win/zlib;../src/drivers/win/directx;../src;../src/drivers/win/lua/include;userconfig;defaultconfig"
 				PreprocessorDefinitions="WIN32;_DEBUG;MSVC;_CRT_SECURE_NO_DEPRECATE;_WIN32_WINDOWS=0x0410;WINVER=0x0410;NETWORK;LSB_FIRST;_USE_32BIT_TIME_T;FCEUDEF_DEBUGGER;_USE_SHARED_MEMORY_;NOMINMAX;LUA_BUILD_AS_DLL;HAS_vsnprintf;_S9XLUA_H"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -195,6 +196,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="defaultconfig\SubWCRev.bat"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -215,7 +217,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../src/drivers/win/zlib;../src/drivers/win/directx;../src;../src/drivers/win/lua/include"
+				AdditionalIncludeDirectories="../src/drivers/win/zlib;../src/drivers/win/directx;../src;../src/drivers/win/lua/include;userconfig;defaultconfig"
 				PreprocessorDefinitions="WIN32;NDEBUG;MSVC;_CRT_SECURE_NO_DEPRECATE;_WIN32_WINDOWS=0x0410;WINVER=0x0410;NETWORK;LSB_FIRST;_USE_32BIT_TIME_T;FCEUDEF_DEBUGGER;_USE_SHARED_MEMORY_;NOMINMAX;LUA_BUILD_AS_DLL;HAS_vsnprintf;_S9XLUA_H"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"

vc/vc9_fceux.vcproj

@@ -28,6 +28,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="defaultconfig\SubWCRev.bat"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -44,7 +45,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../src/drivers/win/zlib;../src/drivers/win/directx;../src;../src/drivers/win/lua/include"
+				AdditionalIncludeDirectories="../src/drivers/win/zlib;../src/drivers/win/directx;../src;../src/drivers/win/lua/include;userconfig;defaultconfig"
 				PreprocessorDefinitions="WIN32;_DEBUG;MSVC;_CRT_SECURE_NO_DEPRECATE;_WIN32_WINDOWS=0x0410;WINVER=0x0410;NETWORK;LSB_FIRST;_USE_32BIT_TIME_T;FCEUDEF_DEBUGGER;_USE_SHARED_MEMORY_;NOMINMAX;LUA_BUILD_AS_DLL;HAS_vsnprintf;_S9XLUA_H"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -193,6 +194,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="defaultconfig\SubWCRev.bat"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -213,7 +215,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../src/drivers/win/zlib;../src/drivers/win/directx;../src;../src/drivers/win/lua/include"
+				AdditionalIncludeDirectories="../src/drivers/win/zlib;../src/drivers/win/directx;../src;../src/drivers/win/lua/include;userconfig;defaultconfig"
 				PreprocessorDefinitions="WIN32;NDEBUG;MSVC;_CRT_SECURE_NO_DEPRECATE;_WIN32_WINDOWS=0x0410;WINVER=0x0410;NETWORK;LSB_FIRST;_USE_32BIT_TIME_T;FCEUDEF_DEBUGGER;_USE_SHARED_MEMORY_;NOMINMAX;LUA_BUILD_AS_DLL;HAS_vsnprintf;_S9XLUA_H"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"