ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some cleanups

This commit is contained in:
twinaphex 2015-09-01 11:03:55 +02:00
parent 2daf5c076e
commit d58771cbb1
1 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Makefile.griffin
View File

@ -44,9 +44,9 @@ SHADER_CG_DIR := media/shaders_cg
OVERLAY_DIR := media/overlays OVERLAY_DIR := media/overlays
SHADER_GLSL_DIR := media/shaders_glsl SHADER_GLSL_DIR := media/shaders_glsl
PYTHON2 = python2$(EXE_EXT) PYTHON2 := python2$(EXE_EXT)
PYTHON3 = python3$(EXE_EXT) PYTHON3 := python3$(EXE_EXT)
GIT = git$(EXE_EXT) GIT := git$(EXE_EXT)
ifeq ($(WHOLE_ARCHIVE_LINK), 1) ifeq ($(WHOLE_ARCHIVE_LINK), 1)
WHOLE_START := -Wl,--whole-archive WHOLE_START := -Wl,--whole-archive
@ -58,20 +58,22 @@ LIBS := $(WHOLE_START) -lretro_$(platform) $(WHOLE_END)
libogc_platform := libogc_platform :=
ifeq ($(platform), ngc) ifeq ($(platform), ngc)
libogc_platform = 1 libogc_platform := 1
else ifeq ($(platform), wii) else ifeq ($(platform), wii)
libogc_platform = 1 libogc_platform := 1
endif endif
# PS3 # PS3
ifeq ($(platform), ps3) ifeq ($(platform), ps3)
#TODO #TODO
MEDIA_SHADER_DIR := pkg/ps3/USRDIR/cores/shaders MEDIA_SHADER_DIR := pkg/ps3/USRDIR/cores/shaders
RARCH_CONSOLE := 1
# PS3 - Cobra # PS3 - Cobra
else ifeq ($(platform), ps3-cobra) else ifeq ($(platform), ps3-cobra)
#TODO #TODO
MEDIA_SHADER_DIR := ps3/iso/PS3_GAME/USRDIR/cores/shaders MEDIA_SHADER_DIR := ps3/iso/PS3_GAME/USRDIR/cores/shaders
RARCH_CONSOLE := 1
# NGC/Wii - libogc # NGC/Wii - libogc
else ifeq ($(libogc_platform), 1) else ifeq ($(libogc_platform), 1)
@ -129,6 +131,7 @@ endif
HAVE_BUILTIN_AUTOCONFIG := 1 HAVE_BUILTIN_AUTOCONFIG := 1
HAVE_ZLIB := 1 HAVE_ZLIB := 1
HAVE_7ZIP := 1 HAVE_7ZIP := 1
RARCH_CONSOLE := 1
ifeq ($(platform), wii) ifeq ($(platform), wii)
HAVE_WIIUSB_HID := 1 HAVE_WIIUSB_HID := 1
@ -163,8 +166,9 @@ else ifeq ($(platform), xenon360)
PLATCFLAGS := -DHAVE_GETOPT_LONG=1 PLATCFLAGS := -DHAVE_GETOPT_LONG=1
PLATCFLAGS += -maltivec -mhard-float -m32 -mpowerpc64 -mcpu=cell -mtune=cell -fno-pic -g -Wall -DXENON $(INCDIRS) -Wno-char-subscripts PLATCFLAGS += -maltivec -mhard-float -m32 -mpowerpc64 -mcpu=cell -mtune=cell -fno-pic -g -Wall -DXENON $(INCDIRS) -Wno-char-subscripts
PLATCFLAGS += -u read -u _start -u exc_base PLATCFLAGS += -u read -u _start -u exc_base
HAVE_THREADS = 1 HAVE_THREADS := 1
HAVE_GETOPT_LONG = 1 HAVE_GETOPT_LONG := 1
RARCH_CONSOLE := 1
# PSP # PSP
else ifeq ($(platform), psp1) else ifeq ($(platform), psp1)
@ -185,6 +189,7 @@ else ifeq ($(platform), psp1)
HAVE_LIBRETRO_MANAGEMENT := 1 HAVE_LIBRETRO_MANAGEMENT := 1
HAVE_RPNG := 1 HAVE_RPNG := 1
HAVE_KERNEL_PRX := 1 HAVE_KERNEL_PRX := 1
RARCH_CONSOLE := 1 # Maybe switch to RARCH_MOBILE ?
ifeq ($(BUILD_PRX), 1) ifeq ($(BUILD_PRX), 1)
LDFLAGS += $(addprefix -L,$(PSPSDK)/lib) -specs=$(PSPSDK)/lib/prxspecs -Wl,-q,-T$(PSPSDK)/lib/linkfile.prx $(LDFLAGS) LDFLAGS += $(addprefix -L,$(PSPSDK)/lib) -specs=$(PSPSDK)/lib/prxspecs -Wl,-q,-T$(PSPSDK)/lib/linkfile.prx $(LDFLAGS)
@ -214,6 +219,7 @@ else ifeq ($(platform), vita)
HAVE_RPNG := 1 HAVE_RPNG := 1
HAVE_ZLIB := 1 HAVE_ZLIB := 1
HAVE_VITA2D := 1 HAVE_VITA2D := 1
RARCH_CONSOLE := 1 # Maybe switch to RARCH_MOBILE ?
endif endif
@ -306,7 +312,15 @@ ifeq ($(HAVE_NETPLAY), 1)
CFLAGS += -DHAVE_NETPLAY CFLAGS += -DHAVE_NETPLAY
endif endif
CFLAGS += -std=gnu99 -DSINC_LOWER_QUALITY -DHAVE_RGUI -DHAVE_MENU -DRARCH_CONSOLE -DHAVE_GRIFFIN=1 -Wno-char-subscripts -DRARCH_INTERNAL ifeq ($(RARCH_CONSOLE), 1)
CFLAGS += -DRARCH_CONSOLE
endif
ifeq ($(RARCH_MOBILE), 1)
CFLAGS += -DRARCH_MOBILE
endif
CFLAGS += -std=gnu99 -DSINC_LOWER_QUALITY -DHAVE_RGUI -DHAVE_MENU -DHAVE_GRIFFIN=1 -Wno-char-subscripts -DRARCH_INTERNAL
ifeq ($(HAVE_FILTERS_BUILTIN), 1) ifeq ($(HAVE_FILTERS_BUILTIN), 1)
CFLAGS += -DHAVE_FILTERS_BUILTIN CFLAGS += -DHAVE_FILTERS_BUILTIN