From 4f56d8144b0e5c4de1ab45eafe67997c8ab9fd6f Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Thu, 18 Mar 2010 23:01:04 +0000
Subject: [PATCH] same commit as r5169, but this time to trunk instead of
 stable (should fix wii homebrew (loading) on osx.) and minor changes to the
 wrtc test

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5215 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp     |  2 +-
 .../WRTC/source/dolphintest_wrtc.cpp          | 44 +++++++++----------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
index 0f40728728..4b917b5a80 100644
--- a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
+++ b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
@@ -198,7 +198,7 @@ bool CBoot::SetupWiiMemory(unsigned int _CountryCode)
 
 	default:
 		// PanicAlert("SetupWiiMem: Unknown country. Wii boot process will be switched to European settings.");
-		filename = WII_EUR_SETTING_FILE;
+		filename = File::GetSysDirectory() + WII_SYS_DIR + DIR_SEP + WII_EUR_SETTING;
 		break;
 	}
 
diff --git a/Source/TestSuite/WRTC/source/dolphintest_wrtc.cpp b/Source/TestSuite/WRTC/source/dolphintest_wrtc.cpp
index d64d7d6777..fa70d8dc62 100644
--- a/Source/TestSuite/WRTC/source/dolphintest_wrtc.cpp
+++ b/Source/TestSuite/WRTC/source/dolphintest_wrtc.cpp
@@ -5,7 +5,7 @@
 #include <ogcsys.h>
 #include <time.h>
 #include <sys/time.h>
-
+#include <ogc/lwp_watchdog.h>
 #include <iostream>
 #include <debug.h>
 #include <math.h>
@@ -15,28 +15,7 @@ static void *xfb = NULL;
 u32 first_frame = 1;
 GXRModeObj *rmode;
 
-void Initialise();
-
-
-int main()
-{
-	Initialise();
-
-	time_t wii_time;
-	wii_time = time(NULL);
-
-	srand(wii_time);
-
-	while(1)
-	{
-		wii_time = time(NULL);
-		std::cout<<"\x1b[10;0HWii RTC time is"<<ctime(&wii_time);
-
-		VIDEO_WaitVSync();
-	}
-}
-
-void Initialise()
+inline void Initialise()
 {
 	// Initialise the video system
 	VIDEO_Init();
@@ -70,3 +49,22 @@ void Initialise()
 	VIDEO_WaitVSync();
 	if(rmode->viTVMode&VI_NON_INTERLACE) VIDEO_WaitVSync();
 }
+
+int main()
+{
+	Initialise();
+
+	time_t wii_time;
+//settime(secs_to_ticks(time(NULL) - 0x386D4380));
+	wii_time = time(NULL);
+
+	std::cout << "\x1b[20;0HWii RTC time is " <<ctime(&wii_time) <<" "<< wii_time;
+
+	while(1)
+	{
+		wii_time = time(NULL);
+		std::cout << "\x1b[10;0HWii RTC time is " << ctime(&wii_time) <<" "<< wii_time;
+
+		VIDEO_WaitVSync();
+	}
+}