From 1fb3779ed608f9ea65c0a917b6ef61b2fa08819d Mon Sep 17 00:00:00 2001 From: nakeee Date: Sun, 5 Oct 2008 19:31:51 +0000 Subject: [PATCH] Found another SVN_STR git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@781 8ced0084-cf51-0410-be5f-012b33b47a6e --- SconsTests/utils.py | 1 - Source/Core/DolphinWX/Src/Main.cpp | 18 ++++++------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/SconsTests/utils.py b/SconsTests/utils.py index 1deeff5f4c..92f17aae99 100644 --- a/SconsTests/utils.py +++ b/SconsTests/utils.py @@ -45,7 +45,6 @@ def GenerateRevFile(flavour, template, output): revstr = svnrev + "-" + flavour tmpstr = open(template, "r").read().replace("$WCREV$",revstr) - template.close() outfile = open(output, 'w') outfile.write(tmpstr +"\n") diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 264a1fd4b6..dd3db422a8 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -17,9 +17,10 @@ #include #include +#include "svnrev.h" + #ifdef WIN32 #include -#include "svnrev.h" #endif #include "CPUDetect.h" #include "Globals.h" @@ -132,18 +133,11 @@ bool DolphinApp::OnInit() SConfig::GetInstance().LoadSettings(); wxInitAllImageHandlers(); // Create the main frame window -#ifdef _WIN32 - #ifdef _DEBUG - const char *title = "Dolphin Debug SVN R " SVN_REV_STR; - #else - const char *title = "Dolphin SVN R " SVN_REV_STR; - #endif + +#ifdef _DEBUG + const char *title = "Dolphin Debug SVN R " SVN_REV_STR; #else - #ifdef _DEBUG - const char *title = "Dolphin Debug SVN Linux"; - #else - const char *title = "Dolphin SVN Linux"; - #endif + const char *title = "Dolphin SVN R " SVN_REV_STR; #endif // ---------------------------------------------------------------------------------------