diff options
| author | Robin Watts <robin.watts@artifex.com> | 2012-03-09 14:47:43 +0000 |
|---|---|---|
| committer | Chris Liddell <chris.liddell@artifex.com> | 2012-03-15 11:54:24 +0000 |
| commit | de2645aaa39c02907cdf735001a42be3852d7107 (patch) | |
| tree | 75eb141e7d9c8d8796cb228c3c24718a28579a74 | |
| parent | 14ef9817250b0e13bb863fe935af65b45c4e1751 (diff) | |
Fix Memento GhostPDL builds to actually build Memento on windows.
Windows makefiles were failing to pass the MEMENTO flag down due
to some makefile wackiness.
CLUSTER_UNTESTED.
| -rw-r--r-- | common/msvc_top.mak | 2 | ||||
| -rw-r--r-- | gs/base/msvclib.mak | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/common/msvc_top.mak b/common/msvc_top.mak index 0d56394e6..a17a2b6e7 100644 --- a/common/msvc_top.mak +++ b/common/msvc_top.mak @@ -126,6 +126,7 @@ $(GENDIR)/ldgs.tr: FORCE DEVSTUDIO="$(DEVSTUDIO)" \ XCFLAGS="$(XCFLAGS)" \ SBRFLAGS="$(SBRFLAGS)" \ + MEMENTO="$(MEMENTO)" \ COMPILE_INITS=$(COMPILE_INITS) PCLXL_ROMFS_ARGS="$(PCLXL_ROMFS_ARGS)" PJL_ROMFS_ARGS="$(PJL_ROMFS_ARGS)" \ UFST_ROOT=$(UFST_ROOT) UFST_BRIDGE=$(UFST_BRIDGE) UFST_LIB_EXT=$(UFST_LIB_EXT) \ UFST_ROMFS_ARGS="$(UFST_ROMFS_ARGS)" \ @@ -176,6 +177,7 @@ $(GENDIR)/ldgs.tr: FORCE DEVSTUDIO="$(DEVSTUDIO)" \ XCFLAGS="$(XCFLAGS)" \ SBRFLAGS="$(SBRFLAGS)" \ + MEMENTO="$(MEMENTO)" \ COMPILE_INITS=$(COMPILE_INITS) PCLXL_ROMFS_ARGS="$(PCLXL_ROMFS_ARGS)" PJL_ROMFS_ARGS="$(PJL_ROMFS_ARGS)" \ UFST_ROOT=$(UFST_ROOT) UFST_BRIDGE=$(UFST_BRIDGE) UFST_LIB_EXT=$(UFST_LIB_EXT) \ UFST_ROMFS_ARGS="$(UFST_ROMFS_ARGS)" \ diff --git a/gs/base/msvclib.mak b/gs/base/msvclib.mak index ffa19f087..4e9f8b5ee 100644 --- a/gs/base/msvclib.mak +++ b/gs/base/msvclib.mak @@ -80,6 +80,10 @@ DEBUG=0 TDEBUG=1 !endif +!if "$(MEMENTO)"=="1" +CFLAGS=$(CFLAGS) -DMEMENTO +!endif + # Define the name of the executable file. !ifndef GS |