diff options
| author | Ralph Giles <ralph.giles@artifex.com> | 2006-09-07 00:37:18 +0000 |
|---|---|---|
| committer | Ralph Giles <ralph.giles@artifex.com> | 2006-09-07 00:37:18 +0000 |
| commit | b71fa6e82d9df223f8aa9ef6ef7807b1a45fee76 (patch) | |
| tree | 014ef529f92d95605913fb66b52483b6bf9ab8bd /common/msvcdefs.mak | |
| parent | 71f00fabef54048d9bc0d6ef725e5884098eabac (diff) | |
Merge the gs853merge branch down into the trunk. This ports ghostpcl and
ghostxps to build against a branch of ghostscript close it its current
mainline (around r7000) between Ghostscript 8.54 and 8.55.
This mostly consists of removing the memory pointers from many calls as
well as a few other api changes, as well as some makefile updates, which
were skewed between the branches.
Nevertheless this is a big merge and there are likely to be a few
mistakes. The previous trunk is tagged as /tags/ghostpcl-pre855merge
for comparision.
Both pcl6 and pspcl6 build and run with the Artifex font scaler (the
native gs one). pcl6 compiles but does not link with ufst. pspcl6 does
not compile with ufst, but that's not too different from what was
happening in the branch. Fixing this will of course come next.
git-svn-id: http://svn.ghostscript.com/ghostpcl/trunk/ghostpcl@2566 06663e23-700e-0410-b217-a244a6096597
Diffstat (limited to 'common/msvcdefs.mak')
| -rw-r--r-- | common/msvcdefs.mak | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/common/msvcdefs.mak b/common/msvcdefs.mak index ebee6c7f8..ec96bb197 100644 --- a/common/msvcdefs.mak +++ b/common/msvcdefs.mak @@ -66,6 +66,27 @@ SHAREDBASE=$(DEVSTUDIO)\Vc7\ !endif !endif +!if $(MSVC_VERSION) == 8 +! ifndef DEVSTUDIO +!ifdef WIN64 +DEVSTUDIO=C:\Program Files (x86)\Microsoft Visual Studio 8 +!else +DEVSTUDIO=C:\Program Files\Microsoft Visual Studio 8 +!endif +! endif +!if "$(DEVSTUDIO)"=="" +COMPBASE= +SHAREDBASE= +!else +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 |