From 40e57c6edc686ccbc2cc5ff37393d5883818dd71 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 18 Jan 2013 13:32:57 +0100 Subject: [PATCH] (Wii) Add way to compile RetroArch and link with oiginal wiiuse - verified that right analog stick is broken on original wiiuse too --- Makefile.wii | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile.wii b/Makefile.wii index 7eaf7ec46b..1942591f2f 100644 --- a/Makefile.wii +++ b/Makefile.wii @@ -7,6 +7,7 @@ DEBUG = 0 HAVE_LOGGER = 0 HAVE_FILE_LOGGER = 0 PERF_TEST = 0 +HAVE_WIIUSE_MOD = 1 PC_DEVELOPMENT_IP_ADDRESS = "192.168.1.100" PC_DEVELOPMENT_UDP_PORT = 3490 @@ -22,6 +23,12 @@ else ifneq ($(findstring MINGW,$(shell uname -a)),) system_platform = win endif +ifeq ($(HAVE_WIIUSE_MOD), 1) +CFLAGS += -DHAVE_WIIUSE +else +LDFLAGS_WIIUSE := -lwiiuse +endif + CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT) CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT) LD = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT) @@ -36,8 +43,7 @@ LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L. MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE) LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map,-wrap,malloc,-wrap,free,-wrap,memalign,-wrap,calloc,-wrap,realloc,-wrap,strdup,-wrap,strndup,-wrap,malloc_usable_size -T gx/ld/rvl.ld -LIBS := -lfat -lretro_wii -logc -lbte - +LIBS := -lfat -lretro_wii -logc $(LDFLAGS_WIIUSE) -lbte APP_BOOTER_DIR = wii/app_booter OBJ = console/griffin/griffin.o $(APP_BOOTER_DIR)/app_booter.binobj @@ -57,7 +63,8 @@ CFLAGS += -DHAVE_FILE_LOGGER CFLAGS += -Iconsole/logger endif -CFLAGS += -std=gnu99 -DHAVE_DEFAULT_RETROPAD_INPUT -DHAVE_WIIUSE -DHAVE_RGUI -DHAVE_THREAD -DRARCH_CONSOLE -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RARCH_EXEC -DHAVE_RMENU -DGEKKO -DHAVE_ZLIB -DWANT_RZLIB -DHAVE_RARCH_MAIN_WRAP -DHAVE_GRIFFIN=1 -DHAVE_SCREENSHOTS -DPACKAGE_VERSION=\"0.9.8-beta3\" -Dmain=rarch_main -Wno-char-subscripts + +CFLAGS += -std=gnu99 -DHAVE_DEFAULT_RETROPAD_INPUT -DHAVE_RGUI -DHAVE_THREAD -DRARCH_CONSOLE -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RARCH_EXEC -DHAVE_RMENU -DGEKKO -DHAVE_ZLIB -DWANT_RZLIB -DHAVE_RARCH_MAIN_WRAP -DHAVE_GRIFFIN=1 -DHAVE_SCREENSHOTS -DPACKAGE_VERSION=\"0.9.8-beta3\" -Dmain=rarch_main -Wno-char-subscripts ifeq ($(DEBUG), 1) CFLAGS += -O0 -g -DDEBUG