diff options
| author | Phil Blundell <philb@gnu.org> | 2004-10-16 18:34:17 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2004-10-16 18:34:17 +0000 |
| commit | eaef51c0d3adee9132c282f34e364d44469d3d8f (patch) | |
| tree | 6f36f3b4b11388587b8ea63becfab3142351791d | |
| parent | ed5bbe61e5728de0fbe413a8ddbc1ab905f04ad2 (diff) | |
use ${BUILD_CXX}, not ${BUILD_CC}, for offsets.cpp
BKrev: 417169a90dVfUDIkvQB8SuylvsabEg
| -rw-r--r-- | snes9x/snes9x/makefile.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/snes9x/snes9x/makefile.patch b/snes9x/snes9x/makefile.patch index e69de29bb2..dc9986453c 100644 --- a/snes9x/snes9x/makefile.patch +++ b/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 |