Fix using Wii platform code

AlisterT · Oct 26, 2023 · 39abf2b · 39abf2b
1 parent 71a931b
commit 39abf2b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 16 deletions.
diff --git a/src/io/controls.cpp b/src/io/controls.cpp
@@ -141,7 +141,7 @@
     #define DEFAULT_BUTTON_PAUSE        (11)
     #define DEFAULT_BUTTON_YES          (-1)
     #define DEFAULT_BUTTON_NO           (-1)
-#elif defined(WII)
+#elif defined(__wii__)
     #define DEFAULT_BUTTON_UP           (-1)
     #define DEFAULT_BUTTON_DOWN         (-1)
     #define DEFAULT_BUTTON_LEFT         (-1)

diff --git a/src/io/gfx/video.h b/src/io/gfx/video.h
@@ -84,7 +84,7 @@
 	#define NO_RESIZE
 
 	#define FULLSCREEN_FLAGS (SDL_SWSURFACE | SDL_TOPSCR | SDL_CONSOLEBOTTOM)
-#elif defined(WII)
+#elif defined(__wii__)
 	#define DEFAULT_SCREEN_WIDTH 640
 	#define DEFAULT_SCREEN_HEIGHT 480
 

diff --git a/src/io/network.cpp b/src/io/network.cpp
@@ -63,7 +63,7 @@
 		static u32* socBuffer = NULL;
 		#define SOC_BUFFERSIZE 0x100000 // maybe 0x80000 is enough
 	#endif
-#elif defined(WII)
+#elif defined(__wii__)
 	#include <network.h>
 #elif defined(USE_SDL_NET)
 	#include <arpa/inet.h>
@@ -86,7 +86,7 @@ Network::Network () {
 	socInit(socBuffer, SOC_BUFFERSIZE);
 	#endif
 #elif defined USE_SDL_NET
-#  ifdef WII
+#  ifdef __wii__
 	char ip[16];
 
 	// Initialize Wii networking (using dhcp)
@@ -113,7 +113,7 @@ Network::~Network () {
 	#endif
 #elif defined USE_SDL_NET
 	SDLNet_Quit();
-#  ifdef WII
+#  ifdef __wii__
 	net_deinit();
 #  endif
 #endif

diff --git a/src/platforms/platforms.h b/src/platforms/platforms.h
@@ -27,8 +27,8 @@ inline void PLATFORM_Init() {
 	PSP_Init();
 #endif
 
-#ifdef WII
-	Wii_Init();
+#ifdef __wii__
+	WII_Init();
 #endif
 
 #ifdef _3DS

diff --git a/src/platforms/wii.cpp b/src/platforms/wii.cpp
@@ -1,7 +1,7 @@
 
 /**
  *
- * @file wiz.cpp
+ * @file wii.cpp
  *
  * Part of the OpenJazz project
  *
@@ -13,7 +13,7 @@
 
 #include "wii.h"
 
-#ifdef WII
+#ifdef __wii__
 
 #include <gccore.h>
 #include <ogc/usbgecko.h>
@@ -49,14 +49,11 @@ const devoptab_t dotab_geckoout = {
 	NULL, NULL, NULL
 };
 
-void Wii_Init() {
-
+void WII_Init() {
 	// enable file system
-
 	fatInitDefault();
 
 	// set console
-
 	LWP_MutexInit(&usbgecko_mutex, false);
 	usbgecko = usb_isgeckoalive(SLOT);
 
@@ -69,7 +66,6 @@ void Wii_Init() {
 		devoptab_list[STD_OUT] = &dotab_stdnull;
 		devoptab_list[STD_ERR] = &dotab_stdnull;
 	}
-
 }
 
 #endif
diff --git a/src/platforms/wii.h b/src/platforms/wii.h
@@ -15,9 +15,9 @@
 #ifndef _WII_H
 #define _WII_H
 
-#ifdef WII
+#ifdef __wii__
 
-void Wii_Init();
+void WII_Init();
 
 #endif