Merge pull request #17792 from pstef/wii-fixes

Wii fixes

Makefile.wii

@@ -265,6 +265,10 @@ ifeq ($(LOAD_WITHOUT_CORE_INFO),1)
    CFLAGS += -DLOAD_WITHOUT_CORE_INFO
 endif
 
+ifneq ($(V),1)
+   Q := @
+endif
+
 OBJOUT   = -o
 LINKOUT  = -o
 LINK = $(CXX)
@@ -278,7 +282,8 @@ $(EXT_INTER_TARGET): $(OBJ)
 	$(LINK) $(LINKOUT)$@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(PLATEXTRA) $(LIBS)
 
 %.o: %.c
-	$(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
+	@$(if $(Q), $(shell echo echo CC $<),)
+	$(Q)$(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
 
 %.o: %.cpp
 	$(CXX) $(CFLAGS) -c $(OBJOUT)$@ $<

deps/rcheevos/src/rc_compat.c

@@ -3,10 +3,6 @@
 #include <ctype.h>
 #include <stdarg.h>
 
-#if defined(_3DS) && !defined(_POSIX_THREADS)
-#include <../rthreads/ctr_pthread.h>
-#endif
-
 #ifdef RC_C89_HELPERS
 
 int rc_strncasecmp(const char* left, const char* right, size_t length)
@@ -124,22 +120,24 @@ void rc_mutex_unlock(rc_mutex_t* mutex)
 
 void rc_mutex_init(rc_mutex_t* mutex)
 {
-  LWP_MutexInit(mutex, NULL);
+  /* LWP_MutexInit has the handle passed by reference */
+  /* Other LWP_Mutex* calls have the handle passed by value */
+  LWP_MutexInit(&mutex->handle, 1);
 }
 
 void rc_mutex_destroy(rc_mutex_t* mutex)
 {
-  LWP_MutexDestroy(mutex);
+  LWP_MutexDestroy(mutex->handle);
 }
 
 void rc_mutex_lock(rc_mutex_t* mutex)
 {
-  LWP_MutexLock(mutex);
+  LWP_MutexLock(mutex->handle);
 }
 
 void rc_mutex_unlock(rc_mutex_t* mutex)
 {
-  LWP_MutexUnlock(mutex);
+  LWP_MutexUnlock(mutex->handle);
 }
 
 #elif defined(_3DS)

deps/rcheevos/src/rc_compat.h

@@ -81,6 +81,11 @@ RC_BEGIN_C_DECLS
   typedef struct rc_mutex_t {
     void* handle; /* HANDLE is defined as "void*" */
   } rc_mutex_t;
+ #elif defined(GEKKO)
+  #include <ogcsys.h>
+  typedef struct rc_mutex_t {
+    mutex_t handle;
+  } rc_mutex_t;
  #elif defined(_3DS)
   #include <3ds/synchronization.h>
   typedef RecursiveLock rc_mutex_t;

gfx/drivers/gx_gfx.c

@@ -74,6 +74,9 @@
   }
 #endif
 
+void VIDEO_SetTrapFilter(bool enable);
+void VIDEO_SetGamma(int gamma);
+
 enum
 {
    GX_RESOLUTIONS_DEFAULT = 0,

input/drivers_hid/wiiusb_hid.c

@@ -15,6 +15,8 @@
  */
 
 #include <stdlib.h>
+#include <unistd.h>
+#include <malloc.h>
 
 #include <gccore.h>
 #include <rthreads/rthreads.h>