[gs-cvs] rev 8897 - trunk/gs/src

[ghostgum at ghostscript.com]

Author: ghostgum
Date: 2008-07-29 04:01:11 -0700 (Tue, 29 Jul 2008)
New Revision: 8897

Modified:
   trunk/gs/src/msvc32.mak
   trunk/gs/src/winint.mak
Log:
Allow compilation with Microsoft Visual Studio 2008 (VC 9.0).
Include lib files in the Windows installer when using COMPILE_INITS=1.


Modified: trunk/gs/src/msvc32.mak
===================================================================
--- trunk/gs/src/msvc32.mak	2008-07-29 04:44:05 UTC (rev 8896)
+++ trunk/gs/src/msvc32.mak	2008-07-29 11:01:11 UTC (rev 8897)
@@ -358,7 +358,10 @@
 !if "$(_NMAKE_VER)" == "8.00.50727.762"
 MSVC_VERSION=8
 !endif
+!if "$(_NMAKE_VER)" == "9.00.21022.08"
+MSVC_VERSION=9
 !endif
+!endif
 
 !ifndef MSVC_VERSION
 MSVC_VERSION=6
@@ -460,6 +463,28 @@
 !endif
 !endif
 
+!if $(MSVC_VERSION) == 9
+! ifndef DEVSTUDIO
+!ifdef WIN64
+DEVSTUDIO=C:\Program Files (x86)\Microsoft Visual Studio 9.0
+!else
+DEVSTUDIO=C:\Program Files\Microsoft Visual Studio 9.0
+!endif
+! endif
+!if "$(DEVSTUDIO)"==""
+COMPBASE=
+SHAREDBASE=
+!else
+RCDIR=C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin
+COMPBASE=$(DEVSTUDIO)\VC
+SHAREDBASE=$(DEVSTUDIO)\VC
+!ifdef WIN64
+COMPDIR64=$(COMPBASE)\bin\x86_amd64
+LINKLIBPATH=/LIBPATH:"$(COMPBASE)\lib\amd64" /LIBPATH:"$(COMPBASE)\PlatformSDK\Lib\AMD64"
+!endif
+!endif
+!endif
+
 # Some environments don't want to specify the path names for the tools at all.
 # Typical definitions for such an environment would be:
 #   MSINCDIR= LIBDIR= COMP=cl COMPAUX=cl RCOMP=rc LINK=link

Modified: trunk/gs/src/winint.mak
===================================================================
--- trunk/gs/src/winint.mak	2008-07-29 04:44:05 UTC (rev 8896)
+++ trunk/gs/src/winint.mak	2008-07-29 11:01:11 UTC (rev 8897)
@@ -226,10 +226,9 @@
 ZIPPROGFILE4=gs$(GS_DOT_VERSION)\bin\gswin32c.exe
 ZIPPROGFILE5=gs$(GS_DOT_VERSION)\doc
 ZIPPROGFILE6=gs$(GS_DOT_VERSION)\examples
+ZIPPROGFILE7=gs$(GS_DOT_VERSION)\lib
 !if $(COMPILE_INITS)
-ZIPPROGFILE7=gs$(GS_DOT_VERSION)\lib -x gs$(GS_DOT_VERSION)\lib\gs_*.ps -x $(GS_DOT_VERSION)\lib\pdf_*.ps 
 !else
-ZIPPROGFILE7=gs$(GS_DOT_VERSION)\lib
 ZIPPROGFILE8=gs$(GS_DOT_VERSION)\Resource
 !endif