From d3e16f045a1bd815699e9c509edfb4e42902c8bb Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 21 Oct 2014 08:18:45 +0200 Subject: [PATCH] Fix up Salamander --- Makefile.ps3.salamander | 4 ++-- Makefile.psp1.salamander | 4 ++-- Makefile.wii.salamander | 4 ++-- driver.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander index 9561eb3f9c..8cdfbbe25b 100644 --- a/Makefile.ps3.salamander +++ b/Makefile.ps3.salamander @@ -18,8 +18,8 @@ endif STRIP = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe -PPU_CFLAGS += -I. -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC -DRARCH_INTERNAL -PPU_SRCS = frontend/frontend_salamander.c frontend/frontend_context.c frontend/platform/platform_ps3.c frontend/platform/platform_null.c file_path.c dir_list.c string_list.c compat/compat.c conf/config_file.c +PPU_CFLAGS += -I. -Ilibretro-sdk/include -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC -DRARCH_INTERNAL +PPU_SRCS = frontend/frontend_salamander.c frontend/frontend_context.c frontend/platform/platform_ps3.c frontend/platform/platform_null.c file_path.c dir_list.c string_list.c libretro-sdk/compat/compat.c conf/config_file.c ifeq ($(HAVE_LOGGER), 1) PPU_CFLAGS += -DHAVE_LOGGER -Ilogger/netlogger diff --git a/Makefile.psp1.salamander b/Makefile.psp1.salamander index f916913471..5450930935 100644 --- a/Makefile.psp1.salamander +++ b/Makefile.psp1.salamander @@ -10,7 +10,7 @@ else OPTIMIZE_LV := -O2 -g endif -INCDIR = $(PSPPATH)/include +INCDIR = $(PSPPATH)/include libretro-sdk/include CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math ASFLAGS = $(CFLAGS) @@ -31,7 +31,7 @@ PSP_EBOOT_TITLE = RetroArch PSP_EBOOT_ICON = psp1/ICON0.PNG PSP_EBOOT_PIC1 = psp1/PIC1.PNG -OBJS = frontend/frontend_salamander.o frontend/frontend_context.o frontend/platform/platform_psp.o frontend/platform/platform_null.o file_path.o string_list.o dir_list.o compat/compat.o conf/config_file.o psp1/kernel_functions.o +OBJS = frontend/frontend_salamander.o frontend/frontend_context.o frontend/platform/platform_psp.o frontend/platform/platform_null.o file_path.o string_list.o dir_list.o libretro-sdk/compat/compat.o conf/config_file.o psp1/kernel_functions.o PSPSDK=$(shell psp-config --pspsdk-path) include $(PSPSDK)/lib/build.mak diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander index 85b8e907e9..a5d80654db 100644 --- a/Makefile.wii.salamander +++ b/Makefile.wii.salamander @@ -29,7 +29,7 @@ ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT) DOL_TARGET := retroarch-salamander_wii.dol ELF_TARGET := retroarch-salamander_wii.elf -INCLUDE := -I. -I$(DEVKITPRO)/libogc/include +INCLUDE := -I. -I$(DEVKITPRO)/libogc/include -Ilibretro-sdk/include LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L. MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float @@ -39,7 +39,7 @@ LIBS := -lfat -lwiiuse -logc -lbte APP_BOOTER_DIR = wii/app_booter -OBJ = frontend/frontend_salamander.o frontend/frontend_context.o frontend/platform/platform_gx.o frontend/platform/platform_wii.o frontend/platform/platform_null.o file_path.o string_list.o dir_list.o compat/compat.o conf/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj +OBJ = frontend/frontend_salamander.o frontend/frontend_context.o frontend/platform/platform_gx.o frontend/platform/platform_wii.o frontend/platform/platform_null.o file_path.o string_list.o dir_list.o libretro-sdk/compat/compat.o conf/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj ifeq ($(HAVE_LOGGER), 1) CFLAGS += -DHAVE_LOGGER diff --git a/driver.h b/driver.h index a75dea49d5..36d39f51eb 100644 --- a/driver.h +++ b/driver.h @@ -23,7 +23,7 @@ #include "libretro_private.h" #include #include -#include +#include #include "gfx/scaler/scaler.h" #include "gfx/image/image.h" #include "gfx/filters/softfilter.h"