diff options
| author | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-07-21 01:27:13 +0000 |
|---|---|---|
| committer | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-07-21 01:27:13 +0000 |
| commit | c33cf08a2f059069c08fc02bc41fa57a2bea942f (patch) | |
| tree | 2115da671c23acdd769f5220102ddac28fba1dbc /Source/Core/DolphinWX/src/Main.cpp | |
| parent | 36f8b9751a5de8548e6ed1f0d62035dd5f54a761 (diff) | |
Linux: Fixes a few things, Should Compile in Linux. Ran Crazy Taxi horribly
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@38 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DolphinWX/src/Main.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/src/Main.cpp | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/Source/Core/DolphinWX/src/Main.cpp b/Source/Core/DolphinWX/src/Main.cpp index ed90697efe..612614e72e 100644 --- a/Source/Core/DolphinWX/src/Main.cpp +++ b/Source/Core/DolphinWX/src/Main.cpp @@ -17,8 +17,9 @@ #include <vector>
#include <string>
-
-#include "svnrev.h"
+#ifdef WIN32
+ #include "svnrev.h"
+#endif
#include "CPUDetect.h"
#include "Globals.h"
#include "Common.h"
@@ -94,12 +95,20 @@ bool DolphinApp::OnInit() SConfig::GetInstance().LoadSettings();
wxInitAllImageHandlers();
// Create the main frame window
-#ifdef _DEBUG
- const char *title = "Dolphin Debug SVN R " SVN_REV_STR;
+#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
#else
- const char *title = "Dolphin SVN R " SVN_REV_STR;
+ #ifdef _DEBUG
+ const char *title = "Dolphin Debug SVN Linux Build"; // Do this for now
+ #else
+ const char *title = "Dolphin SVN Linux Build";
+ #endif
#endif
- main_frame = new CFrame((wxFrame*) NULL, wxID_ANY, title,
+ main_frame = new CFrame((wxFrame*) NULL, wxID_ANY, wxString::FromAscii(title),
wxPoint(100, 100), wxSize(800, 600));
// create debugger
|