diff options
| author | Robin Watts <Robin.Watts@artifex.com> | 2011-09-05 15:46:01 +0100 |
|---|---|---|
| committer | Robin Watts <Robin.Watts@artifex.com> | 2011-09-05 21:35:28 +0100 |
| commit | cb5b14133b516323694dcb99c7594337e84d5e3f (patch) | |
| tree | 5a20061e67b333514e30db848d0d7aaa9425fbff /common | |
| parent | 2fab16e3cbf8b2a18aa82c6beee76e261e530b9f (diff) | |
Add Memento configuration to Visual Studio projects (and gs makefile)
When swapping between memento and non-memento builds, a complete rebuild
is required due to the pervasive nature of the memento defines. As such
it makes sense to have it as a separate configuration in the project.
Memento directories are named 'memobj', 'memobj64', 'membin' etc in
keeping with 'debugobj', and 'profobj' etc.
Also, take the opportunity to fix a couple of small things in the visual
studio files. Firstly, the 64 bit profile build targets were incorrect
(weren't setting paths etc).
Secondly, we remove the use of nmake /A for the rebuild step, and instead
rely on an explicit clean call, then a rebuild; this means we get
consistent results for a rebuild compared to a clean then a build.
As part of this work, we add logic to the (MSVC) makefiles to detect
MEMENTO=1 and PROFILE=1. If set, these change the default DEBUG, TDEBUG
and DEBUGSYM flags as appropriate, and change the default output
directory names. This keeps the invocations from Visual Studio sane
(as I found lots of mistakes in them as I looked through).
Also fix some places where we were failing to set and pass on
BINDIR/PSOBJDIR resulting in stray directories being created.
CLUSTER_UNTESTED
Diffstat (limited to 'common')
| -rw-r--r-- | common/msvc_top.mak | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/common/msvc_top.mak b/common/msvc_top.mak index 255106d90..54b98d179 100644 --- a/common/msvc_top.mak +++ b/common/msvc_top.mak @@ -66,6 +66,9 @@ GLOBJ=$(GLOBJDIR)$(D) FTSRCDIR=$(GLSRCDIR)$(D)..$(D)freetype #**************** END PATCHES +!if "$(MEMENTO)"=="1" +CFLAGS=$(CFLAGS) -DMEMENTO +!endif !if "$(PSICFLAGS)" == "/DPSI_INCLUDED" # 1 --> Use 64 bits for gx_color_index. This is required only for @@ -102,6 +105,7 @@ $(GENDIR)/ldgs.tr: FORCE -if not exist $(GLOBJDIR) mkdir $(GLOBJDIR) -if not exist $(AUXDIR) mkdir $(AUXDIR) $(MAKE) /F $(PSSRCDIR)\msvc32.mak MSVC_VERSION="$(MSVC_VERSION)" \ + BINDIR="$(BINDIR)" PSOBJDIR="$(PSOBJDIR)"\ GLSRCDIR="$(GLSRCDIR)" DEBUG=$(DEBUG) NOPRIVATE=$(NOPRIVATE) \ DEBUGSYM=$(DEBUGSYM) TDEBUG=$(TDEBUG) AUXDIR="$(AUXDIR)" \ GLGENDIR="$(GLGENDIR)" GLOBJDIR="$(GLOBJDIR)" \ @@ -151,6 +155,7 @@ $(GENDIR)/ldgs.tr: FORCE -if not exist $(AUXDIR) mkdir $(AUXDIR) echo > $(GLOBJDIR)/gs_init.ps $(MAKE) /F $(GLSRCDIR)\msvclib.mak MSVC_VERSION="$(MSVC_VERSION)" \ + BINDIR="$(BINDIR)" PSOBJDIR="$(PSOBJDIR)"\ GLSRCDIR="$(GLSRCDIR)" DEBUG=$(DEBUG) NOPRIVATE=$(NOPRIVATE) \ DEBUGSYM=$(DEBUGSYM) TDEBUG=$(TDEBUG) AUXDIR="$(AUXDIR)" \ GLGENDIR="$(GLGENDIR)" GLOBJDIR="$(GLOBJDIR)" \ |