From 8d8fb44c18481e175433d88bdf5ec323c754cd2c Mon Sep 17 00:00:00 2001
From: TwinAphex51224 <twinaphex1@gmail.com>
Date: Wed, 30 Nov 2011 16:19:12 +0100
Subject: [PATCH] Use getopt replacement

---
 Makefile.ps3 | 4 ++--
 dynamic.h    | 2 +-
 general.h    | 4 +++-
 netplay.c    | 3 ++-
 netplay.h    | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Makefile.ps3 b/Makefile.ps3
index b953cf97b1..bd3a70baef 100644
--- a/Makefile.ps3
+++ b/Makefile.ps3
@@ -39,11 +39,11 @@ INCDIRS = -I. -Icommon
 MKFSELF_NPDRM = $(CELL_SDK)/$(HOST_DIR)/bin/make_fself_npdrm
 MKPKG_NPDRM = $(CELL_SDK)/$(HOST_DIR)/bin/make_package_npdrm
 
-OBJ = ssnes.o driver.o settings.o dynamic.o message.o rewind.o movie.o autosave.o gfx/gfx_common.o gfx/gl.c gfx/shader_cg.c gfx/snes_state.c ups.o bps.o strl.o screenshot.o thread.o audio/hermite.o
+OBJ = getopt.o ssnes.o driver.o settings.o dynamic.o message.o rewind.o movie.o autosave.o gfx/gfx_common.o gfx/gl.c gfx/shader_cg.c gfx/snes_state.c ups.o bps.o strl.o screenshot.o thread.o audio/hermite.o
 
 LIBS = -ldbgfont -lPSGL -lgcm_cmd -lgcm_sys_stub -lresc_stub libsnes.a -lm -lio_stub -lfs_stub -lsysutil_stub -lsysmodule_stub -laudio_stub -lnet_stub -lpthread
 
-DEFINES = -DHAVE_DYNAMIC=1 -DHAVE_DYLIB=1 -DHAVE_OPENGL=1 -DHAVE_CG=1 -DHAVE_FBO=1
+DEFINES = -DHAVE_DYNAMIC=1 -DHAVE_DYLIB=1 -DHAVE_OPENGL=1 -DHAVE_CG=1 -DHAVE_FBO=1 -D__CELLOS_LV2__
 
 # Wrap it up, son!
 #LIBS += -Wl,-wrap,fopen -Wl,-wrap,fclose -Wl,-wrap,fwrite -Wl,-wrap,fread -Wl,-wrap,fseek -Wl,-wrap,ftell -Wl,-wrap,fflush -Wl,-wrap,rewind -Wl,-wrap,fgetpos -Wl,-wrap,fsetpos -Wl,-wrap,setbuf -Wl,-wrap,setvbuf -Wl,-wrap,ungetc -Wl,-wrap,feof
diff --git a/dynamic.h b/dynamic.h
index b08e329758..bee2014c8d 100644
--- a/dynamic.h
+++ b/dynamic.h
@@ -19,7 +19,7 @@
 #define __DYNAMIC_H
 
 #include <stdbool.h>
-#include <libsnes.hpp>
+#include "libsnes.hpp"
 
 void init_dlsym(void);
 void uninit_dlsym(void);
diff --git a/general.h b/general.h
index d2da7673fb..326896e174 100644
--- a/general.h
+++ b/general.h
@@ -39,8 +39,10 @@
 
 #include "audio/hermite.h"
 
-#ifndef _WIN32
+#if !defined(_WIN32)
+#if !defined(__CELLOS_LV2__)
 #include <sys/param.h> // MAXPATHLEN
+#endif
 #else
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
diff --git a/netplay.c b/netplay.c
index 4fe2139d15..08efb53cc1 100644
--- a/netplay.c
+++ b/netplay.c
@@ -14,7 +14,7 @@
  *  You should have received a copy of the GNU General Public License along with SSNES.
  *  If not, see <http://www.gnu.org/licenses/>.
  */
-
+#ifdef HAVE_NETPLAY
 #ifdef _WIN32
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0501
@@ -747,3 +747,4 @@ void netplay_post_frame(netplay_t *handle)
    }
 }
 
+#endif
diff --git a/netplay.h b/netplay.h
index 2e439c5f9e..b5770a1fac 100644
--- a/netplay.h
+++ b/netplay.h
@@ -21,7 +21,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <libsnes.hpp>
+#include "libsnes.hpp"
 
 void input_poll_net(void);
 int16_t input_state_net(bool port, unsigned device, unsigned index, unsigned id);