fixed pch warnings

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/makefile.wat b/build/makefile.wat
index 5601344ec685f558d2bf720f6a51e9397f65c6d4..2808f04ba8fc2cd452a5dad9f7a6f5136965e908 100644 (file)
--- a/build/makefile.wat
+++ b/build/makefile.wat
@@ -248,29 +248,29 @@ __xmllib___depname = ..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBU
 
 ### Variables: ###
 
-BASEDLL_CFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_basedll.pch -bd $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 -dwxUSE_GUI=0 $(CFLAGS) 
-BASEDLL_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_basedll.pch -bd $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 -dwxUSE_GUI=0 $(CXXFLAGS) 
-BASELIB_CFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_baselib.pch $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dwxUSE_BASE=1 -dwxUSE_GUI=0 $(CFLAGS)
-BASELIB_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_baselib.pch $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dwxUSE_BASE=1 -dwxUSE_GUI=0 $(CXXFLAGS)
-COREDLL_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_coredll.pch -bd $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 $(CXXFLAGS) 
-CORELIB_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_corelib.pch $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dwxUSE_BASE=0 $(CXXFLAGS)
-GLDLL_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_gldll.pch -bd $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL $(CXXFLAGS) 
-GLLIB_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_gllib.pch $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib $(CXXFLAGS)
-HTMLDLL_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_htmldll.pch -bd $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_HTML $(CXXFLAGS) 
-HTMLLIB_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_htmllib.pch $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib $(CXXFLAGS)
-MONODLL_CFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_monodll.pch -bd $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL $(CFLAGS) 
-MONODLL_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_monodll.pch -bd $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL $(CXXFLAGS) 
-MONOLIB_CFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_monolib.pch $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dwxUSE_BASE=1 $(CFLAGS)
-MONOLIB_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_monolib.pch $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dwxUSE_BASE=1 $(CXXFLAGS)
+BASEDLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 -dwxUSE_GUI=0 $(CFLAGS) 
+BASEDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 -dwxUSE_GUI=0 $(CXXFLAGS) /fh=$(OBJS)\wxprec_basedll.pch 
+BASELIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dwxUSE_BASE=1 -dwxUSE_GUI=0 $(CFLAGS)
+BASELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dwxUSE_BASE=1 -dwxUSE_GUI=0 $(CXXFLAGS) /fh=$(OBJS)\wxprec_baselib.pch
+COREDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 $(CXXFLAGS) /fh=$(OBJS)\wxprec_coredll.pch 
+CORELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dwxUSE_BASE=0 $(CXXFLAGS) /fh=$(OBJS)\wxprec_corelib.pch
+GLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL $(CXXFLAGS) /fh=$(OBJS)\wxprec_gldll.pch 
+GLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib $(CXXFLAGS) /fh=$(OBJS)\wxprec_gllib.pch
+HTMLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_HTML $(CXXFLAGS) /fh=$(OBJS)\wxprec_htmldll.pch 
+HTMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib $(CXXFLAGS) /fh=$(OBJS)\wxprec_htmllib.pch
+MONODLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL $(CFLAGS) 
+MONODLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL $(CXXFLAGS) /fh=$(OBJS)\wxprec_monodll.pch 
+MONOLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dwxUSE_BASE=1 $(CFLAGS)
+MONOLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dwxUSE_BASE=1 $(CXXFLAGS) /fh=$(OBJS)\wxprec_monolib.pch
 OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-WXEXPAT_CFLAGS = $(CPPFLAGS)  $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -dCOMPILED_FROM_DSP $(CFLAGS)
-WXJPEG_CFLAGS = $(CPPFLAGS)  $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(CFLAGS)
-WXPNG_CFLAGS = $(CPPFLAGS)  $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -i=..\src\zlib $(CFLAGS)
-WXREGEX_CFLAGS = $(CPPFLAGS)  $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  $(CFLAGS)
-WXTIFF_CFLAGS = $(CPPFLAGS)  $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  $(CFLAGS)
-WXZLIB_CFLAGS = $(CPPFLAGS)  $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  $(CFLAGS)
-XMLDLL_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_xmldll.pch -bd $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XML $(CXXFLAGS) 
-XMLLIB_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_xmllib.pch $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib $(CXXFLAGS)
+WXEXPAT_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -dCOMPILED_FROM_DSP $(CFLAGS)
+WXJPEG_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(CFLAGS)
+WXPNG_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -i=..\src\zlib $(CFLAGS)
+WXREGEX_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  $(CFLAGS)
+WXTIFF_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  $(CFLAGS)
+WXZLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  $(CFLAGS)
+XMLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XML $(CXXFLAGS) /fh=$(OBJS)\wxprec_xmldll.pch 
+XMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_19) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\include -i=..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\src\tiff -i=..\src\jpeg -i=..\src\png -i=..\src\zlib  -i=..\src\regex -i=..\src\expat\lib $(CXXFLAGS) /fh=$(OBJS)\wxprec_xmllib.pch