r3944 - packages/trunk/a7xpg/debian/patches

[Miriam Ruiz]

Author: baby-guest
Date: 2007-08-29 16:22:52 +0000 (Wed, 29 Aug 2007)
New Revision: 3944

Modified:
   packages/trunk/a7xpg/debian/patches/makefile.patch
Log:
Almost compiles with the makefile now



Modified: packages/trunk/a7xpg/debian/patches/makefile.patch
===================================================================
--- packages/trunk/a7xpg/debian/patches/makefile.patch	2007-08-29 15:41:47 UTC (rev 3943)
+++ packages/trunk/a7xpg/debian/patches/makefile.patch	2007-08-29 16:22:52 UTC (rev 3944)
@@ -1,32 +1,37 @@
 Index: a7xpg-0.11.dfsg1/Makefile
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ a7xpg-0.11.dfsg1/Makefile	2007-08-29 15:41:02.000000000 +0000
-@@ -0,0 +1,27 @@
++++ a7xpg-0.11.dfsg1/Makefile	2007-08-29 16:20:52.000000000 +0000
+@@ -0,0 +1,32 @@
 +DSRC=$(shell find src -name "*.d")
 +SOURCES=$(DSRC) import/SDL_video.d import/SDL_mixer.d
 +OBJS=$(SOURCES:.d=.o)
-+CFLAGS=
-+DFLAGS=-O -release -Iimport -Isrc -I/usr/X11R6/include/
++COBJS=$(SOURCES:.c=.o)
++LDFLAGS=
++CFLAGS=-O2 -Wall
++DFLAGS=-O -release
++CC=gcc
++DMD=gdmd
++LIBS=-L/usr/local/lib -L/usr/lib -lgphobos -lpthread -lGLU -lGL -lglut -lm -lstdc++ `sdl-config --libs` -lSDL_mixer
 +EXE=a7xpg
-+COBJS=src/dirent_d.o
 +
 +all: $(EXE)
 +
-+$(EXE): import/SDL_Keysym.d $(OBJS) $(COBJS)
-+	gcc $(CFLAGS) -o $@ $(OBJS) $(COBJS) -L/usr/local/lib -L/usr/lib -lgphobos -lpthread -lGLU -lGL -lglut -lm -lstdc++ -lSDL -lSDL_mixer
++$(EXE): $(OBJS) $(COBJS)
++	$(CC) $(LDFLAGS) -o $@ $+ $(LIBS)
 +
 +$(OBJS): %.o: %.d
-+	gdmd -d -c -of$@ $(DFLAGS) $<
++	$(DMD) -d -c -of$@ $(DFLAGS) -Iimport -Isrc -I/usr/X11R6/include/ $<
 +
++$(COBJS): %.o: %.c
++	$(CC) -c -o $@ $(CFLAGS) `sdl-config --cflags` $<
++
 +src/dirent_d.o: src/dirent_d.c
 +	gcc -c $< -o $@
 +
-+import/SDL_Keysym.d:
-+	mv import/SDL_keysym.d import/SDL_Keysym.d
-+
-+clean: 	rm src/*.o
-+	rm src/abagames/a7xpg/*.o
-+	rm src/abagames/util/*.o
-+	rm src/abagames/util/sdl/*.o
-+	rm -r import/*.o
++clean:
++	$(RM) -f src/*.o
++	$(RM) -f src/abagames/a7xpg/*.o
++	$(RM) -f src/abagames/util/*.o
++	$(RM) -f src/abagames/util/sdl/*.o
++	$(RM) -f import/*.o