X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.libretro;h=82e98f09a71590c627862c5248d8e0aa05b8ff6f;hb=2a815d86de03665a0c653f8cf1995d0dfa5b1cbd;hp=35461804b9d0fb5e6f5c396715dd49a751bf2c58;hpb=c724311022b2c172b10d67aa296801bd8fe0e71f;p=pcsx_rearmed.git

diff --git a/Makefile.libretro b/Makefile.libretro
index 35461804..82e98f09 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -210,6 +210,8 @@ else ifeq ($(platform), libnx)
    CFLAGS += -DARM -D__aarch64__=1 -march=armv8-a -mtune=cortex-a57 -mtp=soft -DHAVE_INTTYPES -DLSB_FIRST -ffast-math -mcpu=cortex-a57+crc+fp+simd -ffunction-sections
    CFLAGS += -ftree-vectorize
    CFLAGS += -Ifrontend/switch -ftree-vectorize
+   NO_POSIX_MEMALIGN := 1
+   NO_PTHREAD=1
    LIBPTHREAD :=
    STATIC_LINKING=1
    BUILTIN_GPU = neon
@@ -263,6 +265,8 @@ else ifeq ($(platform), vita)
 	DYNAREC = ari64
 	ARCH = arm
 	STATIC_LINKING = 1
+	NO_PTHREAD=1
+	NO_POSIX_MEMALIGN := 1
 
 # CTR(3DS)
 else ifeq ($(platform), ctr)
@@ -270,7 +274,7 @@ else ifeq ($(platform), ctr)
 	CC = $(DEVKITARM)/bin/arm-none-eabi-gcc$(EXE_EXT)
 	CXX = $(DEVKITARM)/bin/arm-none-eabi-g++$(EXE_EXT)
 	AR = $(DEVKITARM)/bin/arm-none-eabi-ar$(EXE_EXT)
-	CFLAGS += -DARM11 -D_3DS -DNO_OS -DNO_DYLIB -DNO_SOCKET -DTHREAD_ENABLED -DGPU_UNAI_USE_FLOATMATH -DGPU_UNAI_USE_FLOAT_DIV_MULTINV
+	CFLAGS += -DARM11 -D_3DS -DNO_OS -DNO_DYLIB -DNO_SOCKET -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 -ffast-math -funroll-loops
@@ -287,6 +291,7 @@ else ifeq ($(platform), ctr)
 	ARCH = arm
 	HAVE_NEON = 0
 	STATIC_LINKING = 1
+	NO_POSIX_MEMALIGN := 1
 
 # Xbox 360
 else ifeq ($(platform), xenon)
@@ -295,19 +300,36 @@ else ifeq ($(platform), xenon)
 	AR = xenon-ar$(EXE_EXT)
 	CFLAGS += -D__LIBXENON__ -m32 -D__ppc__
 
-# Nintendo Game Cube
-else ifeq ($(platform), ngc)
-	TARGET := $(TARGET_NAME)_libretro_ngc.a
-	CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
-	AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
-	CFLAGS += -DGEKKO -DHW_DOL -mrvl -mcpu=750 -meabi -mhard-float -DBLARGG_BIG_ENDIAN=1 -D__ppc__
-
-# Nintendo Wii
-else ifeq ($(platform), wii)
-	TARGET := libretro_$(TARGET_NAME)_wii.a
-	CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
-	AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
-	CFLAGS += -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float -DBLARGG_BIG_ENDIAN=1 -D__ppc__
+# Nintendo GC/Wii/WiiU
+else ifneq (,$(filter $(platform),ngc wii wiiu))
+	TARGET := $(TARGET_NAME)_libretro_$(platform).a
+	CC  = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
+	CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
+	AR  = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
+	ifeq ($(platform), ngc)
+		CFLAGS += -DHW_DOL -mogc
+	else ifeq ($(platform), wii)
+		CFLAGS += -DHW_RVL -mrvl
+	else ifeq ($(platform), wiiu)
+		# -mwup was removed in newer devkitPPC versions
+		CFLAGS += -DHW_WUP
+		CFLAGS += -I frontend/wiiu
+		LIGHTREC_CUSTOM_MAP := 1
+		LIGHTREC_CUSTOM_MAP_OBJ := libpcsxcore/lightrec/mem_wiiu.o
+	endif
+	ARCH = powerpc
+	BUILTIN_GPU = peops
+	CFLAGS += -D__ppc__ -D__powerpc__
+	CFLAGS += -DGEKKO -mcpu=750 -meabi -mhard-float
+	CFLAGS += -DNO_SOCKET -DNO_DYLIB
+	STATIC_LINKING := 1
+	THREAD_RENDERING := 0
+	NO_PTHREAD := 1
+	NO_MMAP := 1
+	NO_POSIX_MEMALIGN := 1
+	LIBDL :=
+	LIBPTHREAD :=
+	LIBRT :=
 
 # QNX
 else ifeq ($(platform), qnx)
@@ -511,6 +533,7 @@ ifneq ($(DEBUG),1)
 endif
 	CFLAGS += -D__WIN32__ -DNO_DYLIB
 	MMAP_WIN32=1
+	NO_PTHREAD=1
 	MAIN_LDLIBS += -lws2_32
 	LIBPTHREAD :=
 	LIBDL :=