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

diff --git a/Makefile b/Makefile
index 06f3666..a6d98a0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,20 @@
 LISP = gcl
-LIBS = "-lSDL -lSDL_image -lSDL_ttf -lSDL_mixer -lSDL_gfx -lGL -lGLU -lftgl"
+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_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"
+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_objects.o \
+      gacela_widgets.o gacela_sound.o
 
-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"
+GCL_OBJ = $(OBJ:%.o=\"%.o\")
 
 %.o: %.lisp
-	$(LISP) -compile $< -system-p
+	$(LISP) -eval "(progn (load \"gacela_make.lisp\") (compile-gfile \"$<\" :include \"$(INC)\"))" -batch
 
 all: $(OBJ)
-	$(LISP) -eval "(compiler::link '($(OBJ)) \"gacela\" \"\" $(LIBS))"
+	$(LISP) -eval "(compiler::link '($(GCL_OBJ)) \"gacela\" \"\" \"$(LIBS)\")" -batch
 
 clean:
-	rm $(OBJ) gacela
+	rm -f $(OBJ) gacela