From 959950d55e5d655ca791a6e46016c521a5abca68 Mon Sep 17 00:00:00 2001 From: TwinAphex51224 Date: Sat, 21 Apr 2012 23:42:20 +0200 Subject: [PATCH] Fixup some console Makefiles --- Makefile.ps3 | 24 ++++++++++++------------ Makefile.wii | 4 ++-- Makefile.xenon | 10 +++++----- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Makefile.ps3 b/Makefile.ps3 index d57d8792bc..b25072b46a 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -1,4 +1,4 @@ -SSNES_VERSION = "0.9.5" +RARCH_VERSION = "0.9.5" #which compiler to build with - GCC or SNC #set to GCC for debug builds for use with debugger @@ -9,7 +9,7 @@ CELL_PSGL_VERSION = ultra-opt DEBUG = 0 DOWNLOAD_SHADERS = 1 STRIPPING_ENABLE = 0 -HAVE_SSNES_GL = 0 +HAVE_RARCH_GL = 0 HAVE_LOGGER = 0 CONTENT_ID_FULL = UP0001-SSNE10000_00-0000000000000001 @@ -48,9 +48,9 @@ endif PPU_SRCS = console/griffin/griffin.c \ console/szlib/szlib.c -ifeq ($(HAVE_SSNES_GL), 1) -DEFINES = -DHAVE_SSNES_GL -GL_LIBS := -lSSNESGL -lSSNESGLcgc +ifeq ($(HAVE_RARCH_GL), 1) +DEFINES = -DHAVE_RARCH_GL +GL_LIBS := -lRARCHGL -lRARCHGLcgc else GL_LIBS := -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt -lPSGL -lPSGLcgc endif @@ -68,7 +68,7 @@ endif PPU_LDLIBS = -ldbgfont $(GL_LIBS) -lretro -lcgc -lgcm_cmd -lgcm_sys_stub -lresc_stub -lm -lio_stub -lfs_stub -lsysutil_stub -lsysutil_game_stub -lsysutil_screenshot_stub -lsysutil_np_stub -lpngdec_stub -ljpgdec_stub -lsysmodule_stub -laudio_stub -lnet_stub -lnetctl_stub -lpthread -DEFINES += -DSSNES_CONSOLE -DHAVE_OPENGL -DHAVE_CG -DHAVE_FBO -DHAVE_SSNES_MAIN_WRAP -DHAVE_SSNES_EXEC -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -D__CELLOS_LV2__ -DHAVE_CONFIGFILE=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(SSNES_VERSION)\" -Dmain=ssnes_main -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) +DEFINES += -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_CG -DHAVE_FBO -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_EXEC -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -D__CELLOS_LV2__ -DHAVE_CONFIGFILE=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=ssnes_main -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) ifeq ($(DEBUG), 1) PPU_OPTIMIZE_LV := -O0 -g @@ -129,20 +129,20 @@ pkg: $(PPU_TARGET) create-shaders create-npdrm-salamander create-npdrm-core $(MAKE_PACKAGE_NPDRM) ps3/pkg/package.conf ps3/pkg pkg-signed: $(PPU_TARGET) create-shaders create-salamander create-core - $(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ ssnes-ps3-cfw-$(SSNES_VERSION).pkg + $(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ ssnes-ps3-cfw-$(RARCH_VERSION).pkg pkg-signed-standalone: $(PPU_TARGET) create-shaders create-core $(MAKE_SELF) $(PPU_TARGET) $(EBOOT_PATH) $(CONTENT_ID) - $(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ ssnes-ps3-cfw-$(SSNES_VERSION).pkg + $(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ ssnes-ps3-cfw-$(RARCH_VERSION).pkg pkg-signed-cfw: $(PPU_TARGET) create-shaders create-salamander create-core - $(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ ssnes-ps3-cfw-$(SSNES_VERSION)-kmeaw.pkg - $(PKG_FINALIZE) ssnes-ps3-cfw-$(SSNES_VERSION)-kmeaw.pkg + $(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ ssnes-ps3-cfw-$(RARCH_VERSION)-kmeaw.pkg + $(PKG_FINALIZE) ssnes-ps3-cfw-$(RARCH_VERSION)-kmeaw.pkg pkg-signed-cfw-standalone: $(PPU_TARGET) create-shaders create-core $(MAKE_SELF) $(PPU_TARGET) $(EBOOT_PATH) $(CONTENT_ID) - $(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ ssnes-ps3-cfw-$(SSNES_VERSION).pkg - $(PKG_FINALIZE) ssnes-ps3-cfw-$(SSNES_VERSION)-kmeaw.pkg + $(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ ssnes-ps3-cfw-$(RARCH_VERSION).pkg + $(PKG_FINALIZE) ssnes-ps3-cfw-$(RARCH_VERSION)-kmeaw.pkg clean-selfs: ifeq ($(EBOOT_EXISTS),1) diff --git a/Makefile.wii b/Makefile.wii index d2fd59b5d8..3015230d57 100644 --- a/Makefile.wii +++ b/Makefile.wii @@ -1,6 +1,6 @@ ### ## -# Makefile for SSNES Wii. +# Makefile for RetroArch Wii. ## DEBUG = 0 @@ -37,7 +37,7 @@ ifeq ($(HAVE_FILE_LOGGER), 1) CFLAGS += -DHAVE_FILE_LOGGER endif -CFLAGS += -std=gnu99 -DSSNES_CONSOLE -DHAVE_CONFIGFILE=1 -DGEKKO -DHW_RVL -DHAVE_ZLIB -DHAVE_SSNES_MAIN_WRAP -DHAVE_FREETYPE -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"0.9.5\" -Dmain=ssnes_main -Wno-char-subscripts -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) +CFLAGS += -std=gnu99 -DRARCH_CONSOLE -DHAVE_CONFIGFILE=1 -DGEKKO -DHW_RVL -DHAVE_ZLIB -DHAVE_RARCH_MAIN_WRAP -DHAVE_FREETYPE -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"0.9.5\" -Dmain=ssnes_main -Wno-char-subscripts -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) ifeq ($(DEBUG), 1) CFLAGS += -O0 -g diff --git a/Makefile.xenon b/Makefile.xenon index aea85ad97f..5264fd99ef 100644 --- a/Makefile.xenon +++ b/Makefile.xenon @@ -1,6 +1,6 @@ ### ## -# Makefile for SSNES libxenon. +# Makefile for RetroArch libxenon. ## ### ## @@ -12,16 +12,16 @@ CXX = xenon-g++ OBJCOPY = xenon-objcopy STRIP = xenon-strip -PPU_TARGET := ssnes-libxenon.elf -PPU_TARGET_ADJUSTED := ssnes-libxenon.elf32 +PPU_TARGET := retroarch-libxenon.elf +PPU_TARGET_ADJUSTED := retroarch-libxenon.elf32 LDDIRS = -L. -L$(DEVKITXENON)/usr/lib -L$(DEVKITXENON)/xenon/lib/32 INCDIRS = -I. -I$(DEVKITXENON)/usr/include -OBJ = fifo_buffer.o ssnes.o driver.o file.o file_path.o settings.o message.o rewind.o movie.o gfx/gfx_common.o patch.o compat/compat.o screenshot.o audio/hermite.o dynamic.o audio/utils.o conf/config_file.o xenon/main.o xenon/xenon360_audio.o xenon/xenon360_input.o xenon/xenon360_video.o +OBJ = fifo_buffer.o retroarch.o driver.o file.o file_path.o settings.o message.o rewind.o movie.o gfx/gfx_common.o patch.o compat/compat.o screenshot.o audio/hermite.o dynamic.o audio/utils.o conf/config_file.o xenon/main.o xenon/xenon360_audio.o xenon/xenon360_input.o xenon/xenon360_video.o LIBS = -lretro -lxenon -lm -lc -DEFINES = -std=gnu99 -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"0.9.5\" -DSSNES_CONSOLE -DHAVE_GETOPT_LONG=1 -Dmain=ssnes_main +DEFINES = -std=gnu99 -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"0.9.5\" -DRARCH_CONSOLE -DHAVE_GETOPT_LONG=1 -Dmain=rarch_main DEFINES += -maltivec -mhard-float -m32 -mpowerpc64 -mcpu=cell -mtune=cell -fno-pic -g -Wall -DXENON $(INCDIRS) DEFINES += -u read -u _start -u exc_base