3ds: adjust for newer toolchain

diff --git a/Makefile.libretro b/Makefile.libretro
index 0c38aba..7639520 100644 (file)
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -338,7 +338,8 @@ else ifeq ($(platform), ctr)
        $(error "CTRULIB env var is not set")
        endif
        TARGET := $(TARGET_NAME)_libretro_ctr.a
-       CFLAGS += -DARM11 -D_3DS -DNO_DYLIB -DGPU_UNAI_USE_FLOATMATH -DGPU_UNAI_USE_FLOAT_DIV_MULTINV
+       CFLAGS += -DARM11 -D_3DS -D__3DS__
+       CFLAGS += -DNO_DYLIB -DGPU_UNAI_USE_FLOATMATH -DGPU_UNAI_USE_FLOAT_DIV_MULTINV
        CFLAGS += -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp -mtp=soft
        CFLAGS += -Wall -mword-relocations
        CFLAGS += -fomit-frame-pointer

diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
index 887fe8a..9ff295e 100644 (file)
--- a/libpcsxcore/psxcounters.c
+++ b/libpcsxcore/psxcounters.c
@@ -71,8 +71,8 @@ static const u32 HSyncTotal[]     = { 263, 314 };
 #ifdef DRC_DISABLE
 Rcnt rcnts[ CounterQuantity ];
 #endif
-u32 hSyncCount = 0;
-u32 frame_counter = 0;
+unsigned int hSyncCount = 0;
+unsigned int frame_counter = 0;
 static u32 hsync_steps = 0;
 
 u32 psxNextCounter = 0, psxNextsCounter = 0;

diff --git a/libpcsxcore/psxcounters.h b/libpcsxcore/psxcounters.h
index 77025a6..618d74d 100644 (file)
--- a/libpcsxcore/psxcounters.h
+++ b/libpcsxcore/psxcounters.h
@@ -31,7 +31,7 @@ extern "C" {
 
 extern u32 psxNextCounter, psxNextsCounter;
 
-extern u32 hSyncCount, frame_counter;
+extern unsigned int hSyncCount, frame_counter;
 
 typedef struct Rcnt
 {