diff --git a/Makefile.ps3 b/Makefile.ps3 index abe5f00609..6607b45374 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -65,7 +65,7 @@ else endif -PPU_LDLIBS = -ldbgfont $(GL_LIBS) -lretroarch -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 +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 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.wii b/Makefile.wii index 0512da41a0..26c4f3ce64 100644 --- a/Makefile.wii +++ b/Makefile.wii @@ -24,7 +24,7 @@ MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE) CXXFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE) LDFLAGS := $(MACHDEP) -LIBS := -lfat -lretro -lwiiuse -logc -lbte +LIBS := -lfat -lretro_wii -lwiiuse -logc -lbte OBJ = console/griffin/griffin.o console/font.bmpobj console/rzlib/rzlib.o diff --git a/Makefile.xenon b/Makefile.xenon index 60664d7e38..b28b211132 100644 --- a/Makefile.xenon +++ b/Makefile.xenon @@ -20,7 +20,7 @@ INCDIRS = -I. -I$(DEVKITXENON)/usr/include 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 360/frontend-xenon/main.o 360/xenon360_audio.o 360/xenon360_input.o 360/xenon360_video.o -LIBS = -lretro -lxenon -lm -lc +LIBS = -lretro_xenon360 -lxenon -lm -lc DEFINES = -std=gnu99 -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"0.9.6\" -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 diff --git a/msvc/RetroArch-360/RetroArch-360.vcxproj b/msvc/RetroArch-360/RetroArch-360.vcxproj index d0378d0f15..0450d17356 100644 --- a/msvc/RetroArch-360/RetroArch-360.vcxproj +++ b/msvc/RetroArch-360/RetroArch-360.vcxproj @@ -119,7 +119,7 @@ true $(OutDir)$(ProjectName).pdb - xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;xuirun.lib;xuirender.lib;$(TargetDir)libretro.lib;%(AdditionalDependencies) + xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;xuirun.lib;xuirender.lib;$(TargetDir)libretro_xdk360.lib;%(AdditionalDependencies) 524288 @@ -200,7 +200,7 @@ true $(OutDir)$(ProjectName).pdb true - xapilibi.lib;d3d9i.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3i.lib;x3daudioi.lib;xmcorei.lib;xbdm.lib;vcomp.lib;$(TargetDir)libretro.lib;%(AdditionalDependencies) + xapilibi.lib;d3d9i.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3i.lib;x3daudioi.lib;xmcorei.lib;xbdm.lib;vcomp.lib;$(TargetDir)libretro_xdk360.lib;%(AdditionalDependencies) 524288 @@ -283,7 +283,7 @@ true $(OutDir)$(ProjectName).pdb true - xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;xbdm.lib;xuirun.lib;xuirender.lib;$(TargetDir)libretro.lib;%(AdditionalDependencies) + xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;xbdm.lib;xuirun.lib;xuirender.lib;$(TargetDir)libretro_xdk360.lib;%(AdditionalDependencies) 524288 @@ -324,7 +324,7 @@ true $(OutDir)$(ProjectName).pdb true - xapilib.lib;d3d9ltcg.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3ltcg.lib;x3daudioltcg.lib;xmcoreltcg.lib;vcomp.lib;xuirun.lib;xuirender.lib;$(TargetDir)libretro.lib;%(AdditionalDependencies) + xapilib.lib;d3d9ltcg.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3ltcg.lib;x3daudioltcg.lib;xmcoreltcg.lib;vcomp.lib;xuirun.lib;xuirender.lib;$(TargetDir)libretro_xdk360.lib;%(AdditionalDependencies) 524288 diff --git a/msvc/RetroArch-PS3/RetroArch-PS3.vcxproj b/msvc/RetroArch-PS3/RetroArch-PS3.vcxproj index 7cb44aa56e..8d703908a8 100644 --- a/msvc/RetroArch-PS3/RetroArch-PS3.vcxproj +++ b/msvc/RetroArch-PS3/RetroArch-PS3.vcxproj @@ -55,7 +55,7 @@ $(SolutionDir)\..\..\;%(AdditionalIncludeDirectories) - "$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\debug\libPSGL.a";"$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\debug\libPSGLcgc.a";libcgc.a;libdbgfont.a;libgcm_cmd.a;libgcm_sys_stub.a;libresc_stub.a;libio_stub.a;libfs_stub.a;libsysutil_stub.a;libsysutil_game_stub.a;libsysutil_screenshot_stub.a;libjpgdec_stub.a;libpngdec_stub.a;libpthread.a;libsysmodule_stub.a;libaudio_stub.a;$(TargetDir)libretro.a;libnet_stub.a;%(AdditionalDependencies) + "$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\debug\libPSGL.a";"$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\debug\libPSGLcgc.a";libcgc.a;libdbgfont.a;libgcm_cmd.a;libgcm_sys_stub.a;libresc_stub.a;libio_stub.a;libfs_stub.a;libsysutil_stub.a;libsysutil_game_stub.a;libsysutil_screenshot_stub.a;libjpgdec_stub.a;libpngdec_stub.a;libpthread.a;libsysmodule_stub.a;libaudio_stub.a;$(TargetDir)libretro_ps3.a;libnet_stub.a;%(AdditionalDependencies) @@ -67,11 +67,11 @@ $(SolutionDir)\..\..\;%(AdditionalIncludeDirectories) - "$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\ultra-opt\libPSGL.a";"$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\ultra-opt\libPSGLcgc.a";libdbgfont.a;libgcm_cmd.a;libgcm_sys_stub.a;libresc_stub.a;libio_stub.a;libfs_stub.a;libsysutil_stub.a;libsysutil_game_stub.a;libsysutil_screenshot_stub.a;libjpgdec_stub.a;libpngdec_stub.a;libpthread.a;libsysmodule_stub.a;libaudio_stub.a;$(TargetDir)libretro.a;libnet_stub.a;%(AdditionalDependencies) + "$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\ultra-opt\libPSGL.a";"$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\ultra-opt\libPSGLcgc.a";libdbgfont.a;libgcm_cmd.a;libgcm_sys_stub.a;libresc_stub.a;libio_stub.a;libfs_stub.a;libsysutil_stub.a;libsysutil_game_stub.a;libsysutil_screenshot_stub.a;libjpgdec_stub.a;libpngdec_stub.a;libpthread.a;libsysmodule_stub.a;libaudio_stub.a;$(TargetDir)libretro_ps3.a;libnet_stub.a;%(AdditionalDependencies) - \ No newline at end of file + diff --git a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj index 00f9440056..be8aaeb7a1 100644 --- a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj +++ b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj @@ -32,7 +32,7 @@ Name="VCCustomBuildTool"/> @@ -80,7 +80,7 @@ Name="VCCustomBuildTool"/> + AdditionalDependencies="$(ProjectDir)\$(IntDir)\libretro_xdk1.lib "$(VSInstallDir)..\Microsoft Xbox SDK\xbox\lib\xperf.lib" "$(VSInstallDir)..\Microsoft Xbox SDK\xbox\lib\xbdm.lib" "$(VSInstallDir)..\Microsoft Xbox SDK\xbox\lib\d3d8d.lib" "$(VSInstallDir)..\Microsoft Xbox SDK\xbox\lib\d3dx8d.lib" "$(VSInstallDir)..\Microsoft Xbox SDK\xbox\lib\xgraphicsd.lib" "$(VSInstallDir)..\Microsoft Xbox SDK\xbox\lib\dsoundd.lib" "$(VSInstallDir)..\Microsoft Xbox SDK\xbox\lib\xboxkrnl.lib""/> + AdditionalDependencies="$(ProjectDir)\$(IntDir)\libretro_xdk1.lib "$(VSInstallDir)..\Microsoft Xbox SDK\xbox\lib\xperf.lib" "$(VSInstallDir)..\Microsoft Xbox SDK\xbox\lib\xbdm.lib" "$(VSInstallDir)..\Microsoft Xbox SDK\xbox\lib\d3d8d.lib" "$(VSInstallDir)..\Microsoft Xbox SDK\xbox\lib\d3dx8d.lib" "$(VSInstallDir)..\Microsoft Xbox SDK\xbox\lib\xgraphicsd.lib" "$(VSInstallDir)..\Microsoft Xbox SDK\xbox\lib\dsoundd.lib" "$(VSInstallDir)..\Microsoft Xbox SDK\xbox\lib\xboxkrnl.lib""/> + AdditionalDependencies="$(ProjectDir)\$(IntDir)\libretro_xdk1.lib "$(VSInstallDir)..\Microsoft Xbox SDK\xbox\lib\xperf.lib" "$(VSInstallDir)..\Microsoft Xbox SDK\xbox\lib\xbdm.lib" "$(VSInstallDir)..\Microsoft Xbox SDK\xbox\lib\d3d8d.lib" "$(VSInstallDir)..\Microsoft Xbox SDK\xbox\lib\d3dx8d.lib" "$(VSInstallDir)..\Microsoft Xbox SDK\xbox\lib\xgraphicsd.lib" "$(VSInstallDir)..\Microsoft Xbox SDK\xbox\lib\dsoundd.lib" "$(VSInstallDir)..\Microsoft Xbox SDK\xbox\lib\xboxkrnl.lib""/>