Right ANSI Common Lisp compilation

diff --git a/Makefile b/Makefile
index c0b0ebae5cbcceadbc83199f564aa18a744b1527..f38a6d766ae7a24dacbb135e77382ff2cdeac51c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ GCL_OBJ = $(OBJ:%.o=\"%.o\")
        $(LISP) -eval "(progn (load \"gacela_make.lisp\") (compile-gfile \"$<\" :include \"$(INC)\"))" -batch
 
 all: $(OBJ)
-       $(LISP) -eval "(progn (make-package 'gacela :nicknames '(gg) :use '(lisp)) (compiler::link '($(GCL_OBJ)) \"gacela\" \"\" \"$(LIBS)\"))" -batch
+       $(LISP) -eval "(compiler::link '($(GCL_OBJ)) \"gacela\" \"\" \"$(LIBS)\")" -batch
 
 clean:
        rm -f $(OBJ) gacela

diff --git a/gacela.lisp b/gacela.lisp
index 36817cf427ea21f349065d70a12ff77e271ea57a..7a054bb1d7a96235122327402244f8668bdfa284 100644 (file)
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -15,19 +15,12 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-(eval-when (compile)
-          (make-package 'gacela :nicknames '(gg) :use '(lisp))
-          (in-package 'gacela :nicknames '(gg) :use '(lisp)))
-
-;(eval-when (load)
-;         (make-package 'gacela :nicknames '(gg) :use '(lisp))
-;         (in-package 'gacela :nicknames '(gg) :use '(lisp)))
+(eval-when (compile load) (make-package 'gacela :nicknames '(gg) :use '(lisp)))
 
-(when (not (find-package 'gacela))
-  (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+(eval-when (compile load eval)
+          (when (not (find-package 'gacela)) (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+          (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
-;(eval-when (compile) (make-package 'gacela :nicknames '(gg) :use '(lisp)))
-(eval-when (eval load) (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
 ;;; Default values for Gacela
 (defvar *width-screen* 640)

diff --git a/gacela_FTGL.lisp b/gacela_FTGL.lisp
index fa40fa9e1f9f01639623621ef9f2f784e4daab9d..1d78fe9bfb8eca0aa574730008826f51d2cfec3d 100644 (file)
--- a/gacela_FTGL.lisp
+++ b/gacela_FTGL.lisp
@@ -15,10 +15,10 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-(when (not (find-package 'gacela))
-  (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+(eval-when (compile load eval)
+          (when (not (find-package 'gacela)) (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+          (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
-(eval-when (eval) (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
 (defmacro mapcconst (type c-type name)
   (let ((c-header (concatenate 'string c-type " gacela_" name " (void)"))

diff --git a/gacela_GL.lisp b/gacela_GL.lisp
index 3548a710e483a7b4a04a73d1f70a5d1ded1bf0fb..b890c25a2f96058e13903a372bb97ac25d3c7910 100644 (file)
--- a/gacela_GL.lisp
+++ b/gacela_GL.lisp
@@ -15,10 +15,10 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-(when (not (find-package 'gacela))
-  (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+(eval-when (compile load eval)
+          (when (not (find-package 'gacela)) (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+          (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
-(eval-when (eval) (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
 (defmacro mapcconst (type c-type name)
   (let ((c-header (concatenate 'string c-type " gacela_" name " (void)"))

diff --git a/gacela_SDL.lisp b/gacela_SDL.lisp
index 502c03a102dff9270436e877ad0a45e30bced6e4..47a8a27f01570fe2075788ffcc9967207fafb248 100644 (file)
--- a/gacela_SDL.lisp
+++ b/gacela_SDL.lisp
@@ -15,10 +15,10 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-(when (not (find-package 'gacela))
-  (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+(eval-when (compile load eval)
+          (when (not (find-package 'gacela)) (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+          (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
-(eval-when (eval) (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
 (defmacro mapcconst (type c-type name)
   (let ((c-header (concatenate 'string c-type " gacela_" name " (void)"))

diff --git a/gacela_draw.lisp b/gacela_draw.lisp
index 85540b68a5e74347d277e5d004498821af2f99cd..a23c735d98947e58c1a6660030708adf420a7959 100644 (file)
--- a/gacela_draw.lisp
+++ b/gacela_draw.lisp
@@ -15,10 +15,10 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-(when (not (find-package 'gacela))
-  (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+(eval-when (compile load eval)
+          (when (not (find-package 'gacela)) (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+          (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
-(eval-when (eval) (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
 (defmacro with-color (color &body code)
   (cond (color

diff --git a/gacela_events.lisp b/gacela_events.lisp
index 7fe320b5d81b62191ebe4977a6dd0e55eac3c3a0..5e54fc7f473ad79403818accf36160a7bd9065f9 100644 (file)
--- a/gacela_events.lisp
+++ b/gacela_events.lisp
@@ -15,10 +15,10 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-(when (not (find-package 'gacela))
-  (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+(eval-when (compile load eval)
+          (when (not (find-package 'gacela)) (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+          (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
-(eval-when (eval) (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
 ;;; SDL Events
 (defconstant SDL_NOEVENT          0)

diff --git a/gacela_misc.lisp b/gacela_misc.lisp
index 6e3e4ff0da07e867afb9baf31a1a64ecd866ad08..e19f3a2fe5e4aa0213ee8fd9e7710ff312109244 100755 (executable)
--- a/gacela_misc.lisp
+++ b/gacela_misc.lisp
@@ -14,10 +14,11 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-(when (not (find-package 'gacela))
-  (make-package 'gacela :nicknames '(gg) :use '(lisp)))
 
-(eval-when (eval) (in-package 'gacela :nicknames '(gg) :use '(lisp)))
+(eval-when (compile load eval)
+          (when (not (find-package 'gacela)) (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+          (in-package 'gacela :nicknames '(gg) :use '(lisp)))
+
 
 (defconstant INFINITY MOST-POSITIVE-LONG-FLOAT)
 

diff --git a/gacela_mobs.lisp b/gacela_mobs.lisp
index 1f499ac4c85687509c2c8866b001f23c4a6f1155..8f3d903120c6af184f7c5847c3006c112b60982e 100755 (executable)
--- a/gacela_mobs.lisp
+++ b/gacela_mobs.lisp
@@ -15,12 +15,12 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-;;; Mob Factory
+(eval-when (compile load eval)
+          (when (not (find-package 'gacela)) (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+          (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
-(when (not (find-package 'gacela))
-  (make-package 'gacela :nicknames '(gg) :use '(lisp)))
 
-(eval-when (eval) (in-package 'gacela :nicknames '(gg) :use '(lisp)))
+;;; Mob Factory
 
 (defmacro makemob (name &rest methods)
   `(defun ,name (&rest args &aux (option (car args)))

diff --git a/gacela_ttf.lisp b/gacela_ttf.lisp
index e29076a1772731749aff9b1937845a1bdbe756cb..1d9aec72239cea4d9cd28e26deeae48fd8a9cb91 100644 (file)
--- a/gacela_ttf.lisp
+++ b/gacela_ttf.lisp
@@ -15,10 +15,10 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-(when (not (find-package 'gacela))
-  (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+(eval-when (compile load eval)
+          (when (not (find-package 'gacela)) (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+          (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
-(eval-when (eval) (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
 (defun load-font (font-file &key (size 40) (encoding ft_encoding_unicode) static)
   (let* ((key (make-resource-font :filename font-file :encoding encoding))

diff --git a/gacela_widgets.lisp b/gacela_widgets.lisp
index b6d78e91b718c59b81c2c43913d13941183669e1..8ff79ec5c240e4bfdab72cf15081ba31b7c3ea99 100755 (executable)
--- a/gacela_widgets.lisp
+++ b/gacela_widgets.lisp
@@ -15,10 +15,10 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-(when (not (find-package 'gacela))
-  (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+(eval-when (compile load eval)
+          (when (not (find-package 'gacela)) (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+          (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
-(eval-when (eval) (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
 ;;; Timers