From 46f64f2627b91d4d95d947243c6ffcd16f456d52 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Sat, 30 Jun 2012 15:06:59 +0200 Subject: [PATCH] (PS3) The separate libs for PS3 (libretroarch.a and librgl.a) should now be named libretroarch_ps3.a and librgl_ps3.a - changed in Makefile too --- Makefile.ps3 | 4 ++-- Makefile.ps3.retroarch | 4 ++-- Makefile.ps3.rgl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.ps3 b/Makefile.ps3 index 6607b45374..7de6b66635 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -49,7 +49,7 @@ PPU_SRCS = ps3/frontend/main.c ps3/frontend/menu.c ifeq ($(HAVE_RGL), 1) DEFINES = -DHAVE_RGL -GL_LIBS := -lrgl +GL_LIBS := -lrgl_ps3 else GL_LIBS := -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt -lPSGL -lPSGLcgc endif @@ -65,7 +65,7 @@ else endif -PPU_LDLIBS = -ldbgfont $(GL_LIBS) -lretroarch -lretro_ps3 -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 +PPU_LDLIBS = -ldbgfont $(GL_LIBS) -lretroarch_ps3 -lretro_ps3 -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 += -DHAVE_DEFAULT_RETROPAD_INPUT -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OPENGL_TEXREF -DHAVE_HEADSET -DHAVE_VID_CONTEXT -DHAVE_OPENGLES -DHAVE_CG -DHAVE_CG_MENU -DHAVE_FILEBROWSER -DHAVE_HDD_CACHE_PARTITION -DHAVE_FBO -DHAVE_RARCH_MAIN_WRAP -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RGL -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -D__CELLOS_LV2__ -DHAVE_CONFIGFILE=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_OSKUTIL -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) diff --git a/Makefile.ps3.retroarch b/Makefile.ps3.retroarch index 3092c965d4..0fae2c3873 100644 --- a/Makefile.ps3.retroarch +++ b/Makefile.ps3.retroarch @@ -16,7 +16,7 @@ PC_DEVELOPMENT_UDP_PORT = 3490 CELL_MK_DIR ?= $(CELL_SDK)/samples/mk include $(CELL_MK_DIR)/sdk.makedef.mk -PPU_LIB_TARGET = libretroarch.a +PPU_LIB_TARGET = libretroarch_ps3.a LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt INCDIRS = -I. -Ips3 -Icommon @@ -25,7 +25,7 @@ PPU_SRCS = console/griffin/griffin.c console/rzlib/rzlib.c ifeq ($(HAVE_RGL), 1) DEFINES = -DHAVE_RGL -GL_LIBS := -lrgl +GL_LIBS := -lrgl_ps3 else GL_LIBS := -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt -lPSGL -lPSGLcgc endif diff --git a/Makefile.ps3.rgl b/Makefile.ps3.rgl index d48b0d621e..7fa4d70fc9 100644 --- a/Makefile.ps3.rgl +++ b/Makefile.ps3.rgl @@ -12,7 +12,7 @@ PC_DEVELOPMENT_UDP_PORT = 3490 CELL_MK_DIR ?= $(CELL_SDK)/samples/mk include $(CELL_MK_DIR)/sdk.makedef.mk -PPU_LIB_TARGET = librgl.a +PPU_LIB_TARGET = librgl_ps3.a LDDIRS = -L. INCDIRS = -I.