From ca25e51812a27ad0b00ac6f25118ad0e3d53fec4 Mon Sep 17 00:00:00 2001
From: Twinaphex <autechre1024@hotmail.com>
Date: Sat, 17 Mar 2012 22:51:06 +0100
Subject: [PATCH] (PS3) Salamander fixes - still doesn't link with GCC though

---
 Makefile.ps3.salamander | 31 +++++++++++++++++++------------
 compat/compat.c         |  2 ++
 ps3/salamander/main.c   |  5 +++--
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander
index 89c0e79687..a08b4d151d 100644
--- a/Makefile.ps3.salamander
+++ b/Makefile.ps3.salamander
@@ -1,4 +1,4 @@
-CELL_BUILD_TOOLS	= GCC
+CELL_BUILD_TOOLS	= SNC
 CELL_SDK		?= /usr/local/cell
 CELL_GPU_TYPE		= RSX
 CELL_PSGL_VERSION	= opt
@@ -7,17 +7,17 @@ HAVE_LOGGER		= 0
 CELL_MK_DIR		?= $(CELL_SDK)/samples/mk
 include $(CELL_MK_DIR)/sdk.makedef.mk
 
+MAKE_SELF_WC		= make_self_wc
 MAKE_SELF		= make_self_npdrm
+
 PKG_SCRIPT		= ps3/ps3py/pkg.py
 PKG_FINALIZE		= package_finalize
 
-STRIP			= $(CELL_HOST_PATH)/ppu/bin/ppu-lv2-strip
+STRIP			= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe
 COPY			= cp
 MOVE			= mv
-C			= $(CELL_HOST_PATH)/ppu/bin/ppu-lv2-gcc
-CC			= $(CELL_HOST_PATH)/ppu/bin/ppu-lv2-g++
 
-PPU_CFLAGS		+= -I. -O2 -g
+PPU_CFLAGS		+= -I. -D__CELLOS_LV2__
 PPU_SRCS		= ps3/salamander/main.c compat/compat.c conf/config_file.c
 
 ifeq ($(HAVE_LOGGER), 1)
@@ -28,16 +28,23 @@ endif
 PPU_TARGET		= ssnes-salamander.elf
 
 ifeq ($(CELL_BUILD_TOOLS),SNC)
-PPU_CFLAGS		+= -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 \
-			-Xunroll=1 -Xautovecreg=1 
-PPU_CXXFLAGS		+= -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 \
-			 -Xunroll=1 -Xautovecreg=1
+	PPU_CFLAGS		+= -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 -Xunroll=1 -Xautovecreg=1 
+	PPU_CXXFLAGS		+= -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 -Xunroll=1 -Xautovecreg=1
+	PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
+	PPU_CXX	= $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
+	PPU_CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
 else
-PPU_CFLAGS		+= -funroll-loops
-PPU_CXXFLAGS		+= -funroll-loops
+	PPU_CXX	= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-g++.exe
+	PPU_CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
+	PPU_CXXLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe
 endif
 
-PPU_OPTIMIZE_LV		:= -O2
 PPU_LDLIBS		+= -lpthread -lm -lnet_stub -lnetctl_stub -lm -ldbgfont_gcm -lgcm_cmd -lgcm_sys_stub -lio_stub -lsysmodule_stub -lsysutil_stub -lsysutil_game_stub -lfs_stub -lsysutil_np_stub
 
+PPU_OPTIMIZE_LV		:= -O2
+
 include $(CELL_MK_DIR)/sdk.target.mk
+
+MAKE_FSELF = $(CELL_SDK)/host-win32/bin/make_fself.exe
+MAKE_FSELF_NPDRM = $(CELL_SDK)/host-win32/bin/make_fself_npdrm.exe
+MAKE_PACKAGE_NPDRM = $(CELL_SDK)/host-win32/bin/make_package_npdrm.exe
diff --git a/compat/compat.c b/compat/compat.c
index 4063d10e6c..992f2286a4 100644
--- a/compat/compat.c
+++ b/compat/compat.c
@@ -25,7 +25,9 @@
 #include "../boolean.h"
 #include <stddef.h>
 #include <stdlib.h>
+#ifdef _MSC_VER
 #include "../msvc/msvc_compat.h"
+#endif
 #include "../general.h"
 
 char *optarg;
diff --git a/ps3/salamander/main.c b/ps3/salamander/main.c
index e42330ee88..ded5f6ecf0 100644
--- a/ps3/salamander/main.c
+++ b/ps3/salamander/main.c
@@ -16,6 +16,9 @@
  * You should have received a copy of the GNU General Public License along with SSNES.
  * If not, see <http://www.gnu.org/licenses/>.
  */
+
+#include <stdlib.h>
+#include <string.h>
 #include <cell/pad.h>
 #include <cell/sysmodule.h>
 #include <sysutil/sysutil_gamecontent.h>
@@ -24,8 +27,6 @@
 #include <np.h>
 #include <np/drm.h>
 #include <dirent.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include "../../compat/strl.h"
 #include "../../conf/config_file.h"