-netplay updates / netplay now possible

ivanovic · Sep 29, 2010 · e5c2b8a · e5c2b8a
1 parent d019ee8
commit e5c2b8a
Show file tree

Hide file tree

Showing 9 changed files with 1,664 additions and 1,111 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 #ZSNES_FX=1
 #ASMCPU=1
 #SPC700ASM=1
-#NETPLAY=1
+NETPLAY=1
 UNZIP=1
 #GLIDE=1
 #OPENGL=1

diff --git a/Makefile_cygwin.caanoo b/Makefile_cygwin.caanoo
@@ -1,11 +1,11 @@
 #ZSNES_FX=1
 #ASMCPU=1
 #SPC700ASM=1
-#NETPLAY=1
+NETPLAY=1
 UNZIP=1
 #GLIDE=1
 #OPENGL=1
-#THREAD_SOUND=1
+THREAD_SOUND=1
 CHEATS=1
 #ASMKREED=1
 #ZSNESC4=1
@@ -119,15 +119,14 @@ STRIP	:= ${BINPATH}/$(ARCH)-strip
 AS		:= ${BINPATH}/$(ARCH)-as
 GASM	:= ${BINPATH}/$(ARCH)-g++
 
-OPTIMISE = -mcpu=arm926ej-s -mtune=arm926ej-s -I. -I$(TOOLCHAINDIR)/$(ARCH)/include -O3 -D_ZAURUS -DCAANOO -DUSE_SA1
-OPTIMISE += -ffast-math -fexpensive-optimizations -finline -finline-functions -falign-functions=32 -falign-loops -falign-labels -falign-jumps -fomit-frame-pointer -fprofile-use
+OPTIMISE = -O3 -mcpu=arm926ej-s -mtune=arm926ej-s -D_ZAURUS -DCAANOO -DUSE_SA1 -DIS_LITTLE_ENDIAN
+OPTIMISE += -ffast-math -fexpensive-optimizations -finline -finline-functions -falign-functions=32 -falign-loops -falign-labels -falign-jumps -fomit-frame-pointer
 #-fprofile-generate
 #-fprofile-use
 
 CCFLAGS = $(OPTIMISE) \
 -I. \
 -Iunzip \
--Isdl \
 -D__linux \
 -DZLIB \
 -DVAR_CYCLES \
@@ -145,12 +144,12 @@ $(GUIDEFINES) \
 $(KREEDDEFINES) \
 $(CHEATDEFINES) \
 
-CFLAGS	= $(CCFLAGS)
+CCFLAGS  += -I. -I$(TOOLCHAINDIR)/$(ARCH)/include
 LDLIBS	= -L$(TOOLCHAINDIR)/$(ARCH)/lib
 
 # SDL
-CFLAGS  += $(shell $(BINPATH)/sdl-config --cflags) -I$(TOOLCHAINDIR)/$(ARCH)/include/SDL
-LDLIBS  += $(shell $(BINPATH)/sdl-config --libs) -lSDL
+CCFLAGS  += $(shell $(TOOLCHAINDIR)/$(ARCH)/sys-root/usr/bin/sdl-config --cflags)
+LDLIBS  += $(shell $(TOOLCHAINDIR)/$(ARCH)/sys-root/usr/bin/sdl-config --libs)
 
 #-------------------------------------------------------------------------------------------
 
@@ -182,8 +181,8 @@ $(OPENGLDEPENDS):
 	touch $(OPENGLDEPENDS)
 	$(RM) $(OPENGLNO_DEPENDS)
 
-Snes9x4C.gpe: $(OBJECTS) 
-	$(CC) -o $@ $(OBJECTS) $(EXTRALIBS) $(LDLIBS) -lstdc++ -lz -lpthread -lm -lgcov
+Snes9x4C.gpe: $(OBJECTS)
+	$(CCC) -o $@ $(OBJECTS) $(EXTRALIBS) $(LDLIBS) -lstdc++ -lz -lpthread -lm -lgcov
 	$(STRIP) Snes9x4C.gpe
 
 .cpp.o:

diff --git a/Makefile_cygwin.win32 b/Makefile_cygwin.win32
@@ -115,10 +115,8 @@ STRIP	= strip
 NASM	=
 GASM	= g++
 
-DEFAULT_CFLAGS = `sdl-config --cflags`
-LDLIBS         = `sdl-config --libs` -lSDL
-
-INCLUDES=
+DEFAULT_CFLAGS = -I/usr/local/include #`sdl-config --cflags`
+LDLIBS         = -l/usr/local/lib -lSDL #`sdl-config --libs`
 
 OPTIMISE= -D_ZAURUS -O2 -ffast-math -fstrict-aliasing -fomit-frame-pointer -funroll-all-loops -fpeel-loops -ftracer -funswitch-loops -finline-functions
 #-G 0 -ftree-vectorize

diff --git a/display.h b/display.h
@@ -68,7 +68,7 @@ bool8 S9xLoadROMImage (const char *string);
 const char *S9xSelectFilename (const char *def, const char *dir,
 			       const char *ext, const char *title);
 
-const char *S9xChooseFilename (bool8 read_only);
+//const char *S9xChooseFilename (bool8 read_only);
 bool8 S9xOpenSnapshotFile (const char *base, bool8 read_only, STREAM *file);
 void S9xCloseSnapshotFile (STREAM file);
 

diff --git a/globals.cpp b/globals.cpp
@@ -52,7 +52,11 @@
 #include "soundux.h"
 #include "cheats.h"
 #include "sa1.h"
-//#include "netplay.h"
+
+#ifdef NETPLAY_SUPPORT
+	#include "netplay.h"
+#endif
+
 
 START_EXTERN_C
 char String[513];