diff options
Diffstat (limited to 'recipes/snes9x/snes9x')
| -rw-r--r-- | recipes/snes9x/snes9x/makefile.patch | 39 | ||||
| -rw-r--r-- | recipes/snes9x/snes9x/private.patch | 10 |
2 files changed, 49 insertions, 0 deletions
diff --git a/recipes/snes9x/snes9x/makefile.patch b/recipes/snes9x/snes9x/makefile.patch new file mode 100644 index 0000000000..dc9986453c --- /dev/null +++ b/recipes/snes9x/snes9x/makefile.patch @@ -0,0 +1,39 @@ +--- snes9x-1.43-dev-src/snes9x/Makefile.in.old 2004-10-02 17:34:58.000000000 +0100 ++++ snes9x-1.43-dev-src/snes9x/Makefile.in 2004-10-02 17:42:25.000000000 +0100 +@@ -142,7 +142,7 @@ + #INCLUDES = -I../zlib @XINCLUDES@ + INCLUDES = @XINCLUDES@ + +-OPTIMISE = @OPTIMIZE@ ++OPTIMISE = $(filter-out @OPTIMIZE@,-pedantic) + + #OPTIMISE=-g -fno-exceptions + +@@ -165,7 +165,7 @@ + $(KREEDDEFINES) \ + $(SDD1DEFINES) \ + $(JOYDEFINES) \ +--DNO_INLINE_SET_GET @SYSDEFINES@ ++-DNO_INLINE_SET_GET @SYSDEFINES@ $(OECFLAGS) + + #-DOLD_COLOUR_BLENDING + #-DSOUND +@@ -204,15 +204,15 @@ + #ggisnes9x + #xf86snes9x + +-offsets: offsets.o +- $(CCC) $(INCLUDES) -o $@ offsets.o ++offsets: offsets.cpp ++ $(BUILD_CXX) $(INCLUDES) -o $@ $< + ./offsets >i386/offsets.h + + #../zlib/libz.a: + # cd ../zlib && sh ./configure && make + + snes9x: $(OBJECTS) unix/x11.o $(AIDOOBJS) $(GUIOBJS) +- $(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(AIDOOBJS) $(GLIDEOBJS) $(OPENGLOBJS) unix/x11.o $(GUIOBJS) $(LDLIBS) $(GLIDELIBS) $(OPENGLLIBS) $(GUILIBS) @SYSLIBS@ -lXext -lX11 $(EXTRALIBS) -lm ++ $(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(AIDOOBJS) $(GLIDEOBJS) $(OPENGLOBJS) unix/x11.o $(GUIOBJS) $(OELDFLAGS) $(LDLIBS) $(GLIDELIBS) $(OPENGLLIBS) $(GUILIBS) @SYSLIBS@ -lXext -lX11 $(EXTRALIBS) -lm + + ssnes9x: $(OBJECTS) unix/svga.o + $(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(GLIDEOBJS) unix/svga.o $(LDLIBS) $(GLIDELIBS) -lvga -lvgagl $(EXTRALIBS) -lm diff --git a/recipes/snes9x/snes9x/private.patch b/recipes/snes9x/snes9x/private.patch new file mode 100644 index 0000000000..83808f4c54 --- /dev/null +++ b/recipes/snes9x/snes9x/private.patch @@ -0,0 +1,10 @@ +--- unix/x11.cpp.old 2004-10-03 21:27:10.000000000 +0100 ++++ unix/x11.cpp 2004-10-03 21:29:02.000000000 +0100 +@@ -154,6 +154,7 @@ + #if defined (__cplusplus) || defined (c_plusplus) + #define private c_private + #include <X11/extensions/xf86vmode.h> ++#undef private + #endif + + #define ALL_DEVICE_EVENTS 0 |