packages: sdlhazemd/sdlhazemd-cflags.patch (NEW), sdlhazemd/sdlhazemd-dupli...

[lisu]

Author: lisu                         Date: Fri Nov 19 13:53:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- new, from sdlmame

---- Files affected:
packages/sdlhazemd:
   sdlhazemd-cflags.patch (NONE -> 1.1)  (NEW), sdlhazemd-duplicate_options.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/sdlhazemd/sdlhazemd-cflags.patch
diff -u /dev/null packages/sdlhazemd/sdlhazemd-cflags.patch:1.1
--- /dev/null	Fri Nov 19 14:53:13 2010
+++ packages/sdlhazemd/sdlhazemd-cflags.patch	Fri Nov 19 14:53:08 2010
@@ -0,0 +1,31 @@
+--- sdlmame0133u1/makefile~	2009-06-11 06:38:13.000000000 +0200
++++ sdlmame0133u1/makefile	2009-08-12 12:29:55.000000000 +0200
+@@ -570,15 +570,15 @@
+ 
+ $(OBJ)/%.o: $(SRC)/%.c | $(OSPREBUILD)
+ 	@echo Compiling $<...
+-	$(CC) $(CDEFS) $(CFLAGS) -c $< -o $@
++	$(CC) $(CDEFS) $(OPTFLAGS) $(CFLAGS) -c $< -o $@
+ 
+ $(OBJ)/%.pp: $(SRC)/%.c | $(OSPREBUILD)
+ 	@echo Compiling $<...
+-	$(CC) $(CDEFS) $(CFLAGS) -E $< -o $@
++	$(CC) $(CDEFS) $(OPTFLAGS) $(CFLAGS) -E $< -o $@
+ 
+ $(OBJ)/%.s: $(SRC)/%.c | $(OSPREBUILD)
+ 	@echo Compiling $<...
+-	$(CC) $(CDEFS) $(CFLAGS) -S $< -o $@
++	$(CC) $(CDEFS) $(OPTFLAGS) $(CFLAGS) -S $< -o $@
+ 
+ $(OBJ)/%.lh: $(SRC)/%.lay $(FILE2STR)
+ 	@echo Converting $<...
+--- sdlhazemd014a/src/osd/sdl/sdl.mak~	2009-10-04 19:06:40.000000000 +0200
++++ sdlhazemd014a/src/osd/sdl/sdl.mak	2010-11-19 14:12:14.345852668 +0100
+@@ -282,7 +282,6 @@
+ OSDCOREOBJS += $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
+ CFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0` 
+ LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
+-CFLAGS += -DGTK_DISABLE_DEPRECATED
+ else
+ OSDCOREOBJS += $(SDLOBJ)/debugwin.o
+ endif # NO_X11

================================================================
Index: packages/sdlhazemd/sdlhazemd-duplicate_options.patch
diff -u /dev/null packages/sdlhazemd/sdlhazemd-duplicate_options.patch:1.1
--- /dev/null	Fri Nov 19 14:53:13 2010
+++ packages/sdlhazemd/sdlhazemd-duplicate_options.patch	Fri Nov 19 14:53:08 2010
@@ -0,0 +1,24 @@
+--- sdlmame0134u2/makefile~	2009-10-07 12:12:04.000000000 +0200
++++ sdlmame0134u2/makefile	2009-10-07 12:14:42.000000000 +0200
+@@ -330,19 +330,16 @@
+ CCOMFLAGS += -pg
+ endif
+ 
+-# add the optimization flag
+-CCOMFLAGS += -O$(OPTIMIZE)
+-
+ # if we are optimizing, include optimization options
+ # and make all errors into warnings
+ ifneq ($(OPTIMIZE),0)
+ ifneq ($(TARGETOS),os2)
+ ifndef IA64
+-CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS)
++CCOMFLAGS += $(ARCHOPTS)
+ else
+ endif
+ else
+-CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
++CCOMFLAGS += $(ARCHOPTS)
+ endif
+ endif
+ 
================================================================