From 7038a85bcfe890c274cf7b8faaf4462acff3ec2a Mon Sep 17 00:00:00 2001
From: jjgarcia <jjgarcia>
Date: Wed, 18 May 2005 12:16:49 +0000
Subject: [PATCH] Fixes for compiling CLX with MSVC

---
 src/bare.lsp.in    |  2 +-
 src/compile.lsp.in | 48 ++++++++++++++++++++++++----------------------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/bare.lsp.in b/src/bare.lsp.in
index a1dfd0991..4a37ba6d9 100644
--- a/src/bare.lsp.in
+++ b/src/bare.lsp.in
@@ -69,7 +69,7 @@
 
 (defun build-module (name sources &key (dir "build:") ((:prefix si::*init-function-prefix*) "EXT"))
   (proclaim '(optimize (safety 2) (speed 1)))
-  (let* ((objects (compile-if-old "build:ext;" sources :system-p t :c-file t :data-file t :h-file t))
+  (let* ((objects (compile-if-old dir sources :system-p t :c-file t :data-file t :h-file t))
 	 (name (string-downcase name)))
     #-dlopen
     (warn "~%Unable to build module ~A because dynamic linking is not available on this platform"
diff --git a/src/compile.lsp.in b/src/compile.lsp.in
index 0cebd4202..e11b8d41d 100644
--- a/src/compile.lsp.in
+++ b/src/compile.lsp.in
@@ -156,29 +156,31 @@ ar -r ../@LIBPREFIX@ecl.@LIBEXT@ *.@OBJEXT@ ../c/all_symbols2.@OBJEXT@; rm *.@OB
 ;;;
 
 #+WANTS-CLX
-(build-module "clx"
-	      '("src:clx;package.lisp"
-		"src:clx;depdefs.lisp"
-		"src:clx;clx.lisp"
-		"src:clx;dependent.lisp"
-		"src:clx;macros.lisp"
-		"src:clx;bufmac.lisp"
-		"src:clx;buffer.lisp"
-		"src:clx;display.lisp"
-		"src:clx;gcontext.lisp"
-		"src:clx;input.lisp"
-		"src:clx;requests.lisp"
-		"src:clx;fonts.lisp"
-		"src:clx;graphics.lisp"
-		"src:clx;text.lisp"
-		"src:clx;attributes.lisp"
-		"src:clx;translate.lisp"
-		"src:clx;keysyms.lisp"
-		"src:clx;manager.lisp"
-		"src:clx;image.lisp"
-		"src:clx;resource.lisp")
-	      :dir "build:clx;"
-	      :prefix "CLX")
+(let ((+clx-src-files+ '("src:clx;package.lisp"
+			 "src:clx;depdefs.lisp"
+			 "src:clx;clx.lisp"
+			 "src:clx;dependent.lisp"
+			 "src:clx;macros.lisp"
+			 "src:clx;bufmac.lisp"
+			 "src:clx;buffer.lisp"
+			 "src:clx;display.lisp"
+			 "src:clx;gcontext.lisp"
+			 "src:clx;input.lisp"
+			 "src:clx;requests.lisp"
+			 "src:clx;fonts.lisp"
+			 "src:clx;graphics.lisp"
+			 "src:clx;text.lisp"
+			 "src:clx;attributes.lisp"
+			 "src:clx;translate.lisp"
+			 "src:clx;keysyms.lisp"
+			 "src:clx;manager.lisp"
+			 "src:clx;image.lisp"
+			 "src:clx;resource.lisp"))
+      #+:msvc
+      (c::*cc-flags* (concatenate 'string c::*cc-flags* " -Zm150")))
+  (pushnew :clx-ansi-common-lisp *features*)
+  (mapcar #'load +clx-src-files+)
+  (build-module "clx" +clx-src-files+ :dir "build:clx;" :prefix "CLX"))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;