CWS-TOOLING: integrate CWS graphite03_OOO330

graphite/makefile.mk

@@ -51,7 +51,8 @@ PATCH_FILES=graphite-2.3.1.patch
 
 # convert line-endings to avoid problems when patching
 CONVERTFILES=\
-    engine/makefile.vc8
+    engine/makefile.vc8 \
+    engine/test/RegressionTest/RtTextSrc.h
 
 #.IF "$(OS)"=="WNT" && "$(COM)"!="GCC"
 #CONFIGURE_DIR=win32
@@ -72,14 +73,18 @@ EXT_USE_STLPORT=TRUE
 BUILD_ACTION=nmake VERBOSE=1
 .IF "$(debug)"=="true"
 BUILD_FLAGS= "CFG=DEBUG"
+CFLAGSWITHPATH= $(CFLAGS:s!-Fd.!-Fd../../../../../!)
+.ELSE
+# Speed Optimization is really needed for Graphite
+CFLAGSWITHPATH= $(CFLAGS) /O2
 .ENDIF
 ### convert CFLAGS as cl.exe cannot handle OOO"s generic ones directly
 ### TODO: use "guw.exe" instead?
-ALLCFLAGS= $(CFLAGS) $(CFLAGSCXX) $(CFLAGSEXCEPTIONS) $(CDEFS)
+ALLCFLAGS= $(CFLAGSWITHPATH) $(CFLAGSCXX) $(CFLAGSEXCEPTIONS) $(CDEFS)
 JUSTASLASH= /
 CFLAGS2MSC= $(ALLCFLAGS:s/-Z/$(JUSTASLASH)Z/)
 CFLAGS4MSC= $(CFLAGS2MSC:s/ -/ $(JUSTASLASH)/)
-BUILD_FLAGS+= "MLIB=MD" "CFLAGS4MSC=$(CFLAGS4MSC)" /F makefile.vc$(VCNUM) dll
+BUILD_FLAGS+= "CFLAGS4MSC=$(CFLAGS4MSC)" /F makefile.vc$(VCNUM) lib_dll
 .ENDIF
 
 .IF "$(COM)"=="GCC"
@@ -138,11 +143,11 @@ OUT2LIB+=src$/.libs$/libgraphite.*.dylib
 #OUT2LIB+=engine$/src$/.libs$/libgraphite*.dll
 .IF "$(debug)"=="true"
 OUT2BIN= \
-    engine$/debug$/*.dll \
+#    engine$/debug$/*.dll \
     engine$/debug$/*.pdb
 .ELSE
-OUT2BIN= \
-    engine$/release$/*.dll
+OUT2BIN=
+#    engine$/release$/*.dll
 #    engine$/release$/*.pdb
 .ENDIF
 .ELSE