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
This commit is contained in:
Sonicadvance1
2008-07-21 01:27:13 +00:00
parent 36f8b9751a
commit c33cf08a2f
11 changed files with 36 additions and 14 deletions

View File

@ -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