summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorMaarten ter Huurne <maarten@treewalker.org>2008-09-07 21:06:55 +0000
committerMaarten ter Huurne <maarten@treewalker.org>2008-09-07 21:06:55 +0000
commited7a5a46d09c57dae4dc42e8a5603134ccadc093 (patch)
tree178b5c46fd53265dd5652efc188d81a54842b946 /Source/Core
parent64390ff77df80e5a7e5709cae2c8f132e5d6fcef (diff)
Removed time trial restriction ;)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@476 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinWX/Src/MainNoGUI.cpp19
1 files changed, 13 insertions, 6 deletions
diff --git a/Source/Core/DolphinWX/Src/MainNoGUI.cpp b/Source/Core/DolphinWX/Src/MainNoGUI.cpp
index fb28013d9e..cd4e6f66b5 100644
--- a/Source/Core/DolphinWX/Src/MainNoGUI.cpp
+++ b/Source/Core/DolphinWX/Src/MainNoGUI.cpp
@@ -9,6 +9,9 @@
#include "Common.h"
#include "ISOFile.h"
#include "CPUDetect.h"
+#include "cmdline.h"
+#include "Thread.h"
+#include "PowerPC/PowerPC.h"
#include "BootManager.h"
void* g_pCodeWindow = NULL;
@@ -36,7 +39,11 @@ void Host_UpdateLogDisplay(){}
void Host_UpdateDisasmDialog(){}
-void Host_UpdateMainFrame(){}
+Common::Event updateMainFrameEvent;
+void Host_UpdateMainFrame()
+{
+ updateMainFrameEvent.Set();
+}
void Host_UpdateBreakPointView(){}
@@ -59,7 +66,6 @@ void Host_UpdateStatusBar(const char* _pText){}
// Include SDL header so it can hijack main().
#include <SDL.h>
-#include "cmdline.h"
int main(int argc, char* argv[])
{
@@ -75,12 +81,13 @@ int main(int argc, char* argv[])
}
std::string bootFile(args_info.inputs[0]);
+ updateMainFrameEvent.Init();
DetectCPU();
BootManager::BootCore(bootFile);
- usleep(2000 * 1000 * 1000);
- //while (!getch()) {
- // usleep(20);
- //}
+ while (PowerPC::state != PowerPC::CPU_POWERDOWN)
+ {
+ updateMainFrameEvent.Wait();
+ }
cmdline_parser_free (&args_info);
return(0);