r3948 - packages/trunk/gunroar/debian/patches

[Miriam Ruiz]

Author: baby-guest
Date: 2007-08-29 17:06:55 +0000 (Wed, 29 Aug 2007)
New Revision: 3948

Modified:
   packages/trunk/gunroar/debian/patches/makefile.patch
   packages/trunk/gunroar/debian/patches/series
Log:
Fixed makefile



Modified: packages/trunk/gunroar/debian/patches/makefile.patch
===================================================================
--- packages/trunk/gunroar/debian/patches/makefile.patch	2007-08-29 16:36:10 UTC (rev 3947)
+++ packages/trunk/gunroar/debian/patches/makefile.patch	2007-08-29 17:06:55 UTC (rev 3948)
@@ -1,30 +1,39 @@
 Index: gunroar-0.15.dfsg1/Makefile
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gunroar-0.15.dfsg1/Makefile	2007-08-29 15:38:18.000000000 +0000
-@@ -0,0 +1,25 @@
-+DC=gdmd
-+#DC=gdc
-+ifeq ($(DC), gdmd)
-+DFLAGS=-O -d -release -Iimport -Isrc
-+#DFLAGS=-g -debug -Iimport -Isrc
-+DOUT=-of
-+else
-+DFLAGS=-O -frelease -Iimport -Isrc
-+#DFLAGS=-g -fdebug -Iimport -Isrc
-+DOUT=-o
-+endif
-+
-+DSRC=$(shell find src/abagames -name "*.d")
++++ gunroar-0.15.dfsg1/Makefile	2007-08-29 16:57:24.000000000 +0000
+@@ -0,0 +1,34 @@
++DSRC=$(shell find src -name "*.d")
 +SOURCES=$(DSRC) import/SDL_video.d import/SDL_mixer.d
 +OBJS=$(SOURCES:.d=.o)
++CSOURCES=$(shell find src -name "*.c")
++COBJS=$(CSOURCES:.c=.o)
++LDFLAGS=
++CFLAGS=-O2 -Wall
++DFLAGS=-O -release
++#DFLAGS=-g -debug
++CC=gcc
++DC=gdmd
++LIBS=-lgphobos -lpthread -lGLU -lGL -lm -lstdc++ `sdl-config --libs` -lSDL_mixer
 +EXE=gunroar
 +
 +all: $(EXE)
 +
-+$(EXE): $(OBJS)
-+	gcc -o $@ $(OBJS) -lgphobos -lpthread -lm -lSDL -lGL -lGLU -lSDL_mixer
++$(EXE): $(OBJS) $(COBJS)
++	$(CC) $(LDFLAGS) -o $@ $+ $(LIBS)
 +
 +$(OBJS): %.o: %.d
-+	$(DC) -c $(DOUT)$@ $(DFLAGS) $<
++	$(DC) -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 $@
++
++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

Modified: packages/trunk/gunroar/debian/patches/series
===================================================================
--- packages/trunk/gunroar/debian/patches/series	2007-08-29 16:36:10 UTC (rev 3947)
+++ packages/trunk/gunroar/debian/patches/series	2007-08-29 17:06:55 UTC (rev 3948)
@@ -4,3 +4,4 @@
 04_adapt_build_file_to_linux.diff
 directories.patch
 windowed.patch
+makefile.patch