X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Makefile;h=a6d98a042ebd34b94feb3ec2ff11e60d9917766c;hb=d0e2cdc7308eabc4727729f9ac085f2959696b90;hp=b777b4a6ca6d91c14f333313dbbbc1b79a0851df;hpb=35c768d6dbc22d731b9f2626b783b91530ea651f;p=gacela.git

diff --git a/Makefile b/Makefile
index b777b4a..a6d98a0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,20 @@
 LISP = gcl
 INC = -I/usr/include/FTGL -I/usr/include/freetype2
-LIBS = -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer -lSDL_gfx -lGL -lGLU -lftgl
+# LIBS = -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer -lSDL_gfx -lGL -lGLU -lftgl
+LIBS = -lSDL -lSDL_image -lSDL_mixer -lSDL_gfx -lGL -lGLU -lftgl
 
 OBJ = gacela.o gacela_misc.o gacela_SDL.o gacela_GL.o gacela_FTGL.o \
-      gacela_draw.o gacela_ttf.o gacela_events.o gacela_mobs.o \
-      gacela_widgets.o
+      gacela_draw.o gacela_ttf.o gacela_events.o gacela_mobs.o gacela_objects.o \
+      gacela_widgets.o gacela_sound.o
 
 GCL_OBJ = $(OBJ:%.o=\"%.o\")
 
 %.o: %.lisp
-	$(LISP) -eval "(progn (setq compiler::*cc* (concatenate 'string compiler::*cc* \"$(INC)\")) (compile-file \"$<\" :system-p t))" -batch
+	$(LISP) -eval "(progn (load \"gacela_make.lisp\") (compile-gfile \"$<\" :include \"$(INC)\"))" -batch
 
 all: $(OBJ)
 	$(LISP) -eval "(compiler::link '($(GCL_OBJ)) \"gacela\" \"\" \"$(LIBS)\")" -batch
 
 clean:
-	rm $(OBJ) gacela
+	rm -f $(OBJ) gacela