From 160b96a7c397856a32fa50fca34c7f7a9998af46 Mon Sep 17 00:00:00 2001
From: Twinaphex <autechre1024@hotmail.com>
Date: Mon, 20 Aug 2012 15:55:13 +0200
Subject: [PATCH] (PS3) Some improvements to Makefiles

---
 Makefile.ps3           | 16 ++++++++++++++--
 Makefile.ps3.retroarch | 14 +++++++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/Makefile.ps3 b/Makefile.ps3
index 7f085d38db..87f568fa46 100644
--- a/Makefile.ps3
+++ b/Makefile.ps3
@@ -30,6 +30,17 @@ CORE_PATH		= ps3/pkg/USRDIR/cores/CORE.SELF
 LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt
 INCDIRS = -I. -Ips3 -Icommon
 
+# system platform
+system_platform = unix
+ifeq ($(shell uname -a),)
+EXE_EXT = .exe
+   system_platform = win
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+   system_platform = osx
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
+   system_platform = win
+endif
+
 PKG_SCRIPT		= ps3/ps3py/pkg.py
 ifeq ($(shell uname), Linux)
 PKG_FINALIZE         	= package_finalize
@@ -49,7 +60,7 @@ PPU_SRCS		= ps3/frontend/main.c
 
 ifeq ($(HAVE_RGL), 1)
 DEFINES			= -DHAVE_RGL
-GL_LIBS			:= -lrgl_ps3
+GL_LIBS			:= -L. -lrgl_ps3
 else
 GL_LIBS			:= -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt -lPSGL -lPSGLcgc
 endif
@@ -58,10 +69,11 @@ ifeq ($(CELL_BUILD_TOOLS), SNC)
 	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
+else ifneq($(system_platform), win)
 	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
+	PPU_CCLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe
 endif
 
 
diff --git a/Makefile.ps3.retroarch b/Makefile.ps3.retroarch
index 2870f8e5d4..b1ecb40353 100644
--- a/Makefile.ps3.retroarch
+++ b/Makefile.ps3.retroarch
@@ -16,6 +16,17 @@ PC_DEVELOPMENT_UDP_PORT		= 3490
 CELL_MK_DIR		?= $(CELL_SDK)/samples/mk
 include $(CELL_MK_DIR)/sdk.makedef.mk
 
+# system platform
+system_platform = unix
+ifeq ($(shell uname -a),)
+EXE_EXT = .exe
+   system_platform = win
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+   system_platform = osx
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
+   system_platform = win
+endif
+
 PPU_LIB_TARGET		= libretroarch_ps3.a
 
 LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt
@@ -35,10 +46,11 @@ ifeq ($(CELL_BUILD_TOOLS), SNC)
 	PPU_CXX	= $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
 	PPU_CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
 	SNC_PPU_AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe
-else
+else ifneq($(system_platform), win)
 	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
+	PPU_AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe
 endif
 
 PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe