diff --git a/Makefile.ps3 b/Makefile.ps3 index 52939d2bdd..6b941f24e7 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -75,14 +75,16 @@ else PPU_OPTIMIZE_LV := -O3 -g endif -PPU_CFLAGS = $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES) -PPU_CXXFLAGS = $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES) - ifeq ($(HAVE_LOGGER), 1) -PPU_CFLAGS += -DHAVE_LOGGER +DEFINES += -DHAVE_LOGGER PPU_SRCS += console/logger/logger.c +INCDIRS += -Iconsole/logger endif +PPU_CFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES) +PPU_CXXFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES) + + EXIST_EBOOT_WILDCARD := $(wildcard $(EBOOT_PATH)) EXIST_CORE_WILDCARD := $(wildcard $(CORE_PATH)) diff --git a/msvc/RetroArch-PS3.sln b/msvc/RetroArch-PS3.sln deleted file mode 100644 index 618b3e4c85..0000000000 --- a/msvc/RetroArch-PS3.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RetroArch-PS3", "RetroArch-PS3/RetroArch-PS3.vcxproj", "{EAC43BA5-5C6A-4FE4-8E50-CD9B5BD3E0F9}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|PS3 = Debug|PS3 - Release|PS3 = Release|PS3 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EAC43BA5-5C6A-4FE4-8E50-CD9B5BD3E0F9}.Debug|PS3.ActiveCfg = Debug|PS3 - {EAC43BA5-5C6A-4FE4-8E50-CD9B5BD3E0F9}.Debug|PS3.Build.0 = Debug|PS3 - {EAC43BA5-5C6A-4FE4-8E50-CD9B5BD3E0F9}.Release|PS3.ActiveCfg = Release|PS3 - {EAC43BA5-5C6A-4FE4-8E50-CD9B5BD3E0F9}.Release|PS3.Build.0 = Release|PS3 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/msvc/RetroArch-PS3/RetroArch-PS3.vcxproj b/msvc/RetroArch-PS3/RetroArch-PS3.vcxproj deleted file mode 100644 index 8d703908a8..0000000000 --- a/msvc/RetroArch-PS3/RetroArch-PS3.vcxproj +++ /dev/null @@ -1,77 +0,0 @@ - - - - - Debug - PS3 - - - Release - PS3 - - - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - - {EAC43BA5-5C6A-4FE4-8E50-CD9B5BD3E0F9} - RetroArch-PS3 SNC - - - - Application - true - SNC - - - Application - false - SNC - - - - - - - - - - - - - - - _DEBUG;__CELL_ASSERT__;HAVE_OPENGL=1;RARCH_CONSOLE;HAVE_CG=1;HAVE_CONFIGFILE=1;HAVE_NETPLAY=1;HAVE_SOCKET_LEGACY=1;PACKAGE_VERSION="0.9.6";HAVE_SCREENSHOTS_BUILTIN=1;main=rarch_main;%(UserPreprocessorDefinitions);HAVE_RARCH_MAIN_WRAP;HAVE_RSOUND;HAVE_RARCH_EXEC;HAVE_ZLIB=1;HAVE_LIBRETRO_MANAGEMENT - true - %(UserPreprocessorDefinitions);$(BuiltInDefines);__INTELLISENSE__;%(PreprocessorDefinitions); - NotUsing - $(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_ps3.a;libnet_stub.a;%(AdditionalDependencies) - - - - - NDEBUG;HAVE_OPENGL=1;RARCH_CONSOLE;HAVE_CG=1;HAVE_CONFIGFILE=1;HAVE_NETPLAY=1;HAVE_SOCKET_LEGACY=1;PACKAGE_VERSION="0.9.6";HAVE_SCREENSHOTS_BUILTIN=1;main="rarch_main";%(UserPreprocessorDefinitions);HAVE_RARCH_MAIN_WRAP;HAVE_RSOUND;HAVE_RARCH_EXEC;HAVE_ZLIB=1;HAVE_LIBRETRO_MANAGEMENT - Level2 - %(UserPreprocessorDefinitions);$(BuiltInDefines);__INTELLISENSE__;%(PreprocessorDefinitions); - NotUsing - $(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_ps3.a;libnet_stub.a;%(AdditionalDependencies) - - - - - - - diff --git a/msvc/RetroArch-PS3/RetroArch-PS3.vcxproj.filters b/msvc/RetroArch-PS3/RetroArch-PS3.vcxproj.filters deleted file mode 100644 index 8000860aaa..0000000000 --- a/msvc/RetroArch-PS3/RetroArch-PS3.vcxproj.filters +++ /dev/null @@ -1,30 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;cc;s;asm - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp - - - {1e6c0cd0-6066-4209-82b4-2be77bf07d0a} - - - {5b516a7d-b155-4e31-b42a-140d883fde84} - - - {fac58d49-76df-48f6-bead-170b6b2117b3} - - - - - Source Files\console\griffin - - - Source Files\console\rzlib - - - \ No newline at end of file