(no commit message)

diff --git a/Makefile b/Makefile
index b777b4a6ca6d91c14f333313dbbbc1b79a0851df..d0cbb68dc2c67f2b2d1380debd5b7720e47def2c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,11 +9,11 @@ OBJ = gacela.o gacela_misc.o gacela_SDL.o gacela_GL.o gacela_FTGL.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
 

diff --git a/gacela_make.lisp b/gacela_make.lisp
index 99eacf513b3275f88b3901374dfc4e9fd2dedb2b..a6950ef8ac1c6620143297e5f30f5c9433c0f134 100755 (executable)
--- a/gacela_make.lisp
+++ b/gacela_make.lisp
@@ -14,12 +14,10 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-(setq compiler::*cc* (concatenate 'string
-                                 compiler::*cc*
-                                 "-I/usr/include/FTGL -I/usr/include/freetype2"))
-
-(defmacro compile-gfile (file-name)
-  `(compile-file ,file-name :system-p t))
+(defmacro compile-gfile (file-name &key include)
+  `(progn
+     (setq compiler::*cc* (concatenate 'string compiler::*cc* ,include " "))
+     (compile-file ,file-name :system-p t)))
 
 (defun compile-gacela ()
   (compile-gfile "gacela.lisp")