[Maxima-commits] CVS: maxima/src init-cl.lisp, 1.96, 1.97 maxima.bat.in, 1.16, 1.17

[Vadim V. Z. <vv...@us...>]

Update of /cvsroot/maxima/maxima/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32150/src

Modified Files:
	init-cl.lisp maxima.bat.in 
Log Message:
Patch to fix Windows Vista GCL compiler PATH problem


Index: init-cl.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/init-cl.lisp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- init-cl.lisp	14 Apr 2007 21:49:00 -0000	1.96
+++ init-cl.lisp	9 Jun 2007 18:43:20 -0000	1.97
@@ -271,6 +271,12 @@
     (if maxima-tempdir-env
 	(setq *maxima-tempdir* (maxima-parse-dirstring maxima-tempdir-env))
 	(setq *maxima-tempdir* (default-tempdir)))
+	
+    ; On Windows Vista gcc requires explicit include 
+    #+gcl (when (string= *autoconf-win32* "true")
+	      (setq compiler::*cc* 
+	          (concatenate 'string compiler::*cc* " -I\"" *maxima-prefix* "\\include\"" 
+		                                      " -I\"" *maxima-prefix* "\\lib\\gcc-lib\\mingw32\\3.3.1\\include\" ")))	    		
 
     ; Assign initial values for Maxima shadow variables
     (setq $maxima_userdir *maxima-userdir*)

Index: maxima.bat.in
===================================================================
RCS file: /cvsroot/maxima/maxima/src/maxima.bat.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- maxima.bat.in	19 Mar 2007 13:51:04 -0000	1.16
+++ maxima.bat.in	9 Jun 2007 18:43:20 -0000	1.17
@@ -11,7 +11,7 @@
 set arg8=%8
 set arg9=%9
 
-rem Uncomment line below and set required value to MAXIMA_LANG_SUBDIR 
+rem Uncomment the line below and set required value to MAXIMA_LANG_SUBDIR
 rem to get localized describe in command line Maxima
 rem set MAXIMA_LANG_SUBDIR=es
 
@@ -21,7 +21,7 @@
 set maxima_prefix=@prefix@
 set package=@PACKAGE@
 set verbose=false
-set path=%maxima_prefix%\bin;%path%
+set path=%maxima_prefix%\bin;%maxima_prefix%\lib\gcc-lib\mingw32\3.3.1;%path%
 
 if "%USERPROFILE%" == "" goto win9x
 if "%MAXIMA_USERDIR%" == "" set MAXIMA_USERDIR=%USERPROFILE%\maxima