From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 4 Feb 2004 12:26:20 +0000 (+0000)
Subject: Reverted last change (use of regex) that broke eVC4 compilation
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3e27ea5908688cb1d782be82f7122af25a5f930d

Reverted last change (use of regex) that broke eVC4 compilation


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

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index d2c256e6d8..a5cd466b51 100644
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -439,7 +439,7 @@
 //
 // Recommended setting: 1 if your compiler supports it, if it doesn't please
 // contribute us a makefile for src/regex for it
-#define wxUSE_REGEX       1
+#define wxUSE_REGEX       0
 
 // wxSystemOptions class
 #define wxUSE_SYSTEM_OPTIONS 1
diff --git a/src/msw/wince/wxWindowsCE.vcp b/src/msw/wince/wxWindowsCE.vcp
index d08cdf0703..5afe33a36d 100644
--- a/src/msw/wince/wxWindowsCE.vcp
+++ b/src/msw/wince/wxWindowsCE.vcp
@@ -65,7 +65,7 @@ CFG=wxWindowsCE - Win32 (WCE x86) Debug Unicode
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
-# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\lib\wince_x86ud" /I "..\..\..\include" /I "..\..\regex" /D "DEBUG" /D "_i386_" /D "_X86_" /D "x86" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\include" /I "..\..\..\lib\wince_x86ud" /D "DEBUG" /D "_i386_" /D "_X86_" /D "x86" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /Gs8192 /GF /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_x86ud.lib"
@@ -92,8 +92,8 @@ BSC32=bscmake.exe
 # PROP Sec_ConfigureDevice 0
 # PROP Target_Dir ""
 CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /Oxs /GF /c
-# ADD CPP /nologo /W3 /I "..\..\..\lib\wince_x86u" /I "..\..\..\include" /I "..\..\regex" /D "NDEBUG" /D "_i386_" /D "_X86_" /D "x86" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /Gs8192 /Oxs /GF /c
+# ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /Oxs /I "..\..\..\include" /I "..\..\..\lib\wince_x86u" /D "NDEBUG" /D "_i386_" /D "_X86_" /D "x86" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /Gs8192 /GF /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_x86u.lib"
@@ -119,15 +119,15 @@ BSC32=bscmake.exe
 # PROP Sec_AlwaysSign 0
 # PROP Sec_ConfigureDevice 0
 # PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\lib\wince_armud" /I "..\..\..\include" /I "..\..\regex" /D "DEBUG" /D "ARM" /D "_ARM_" /D "__WXWINCE__" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /Yu"wx/wxprec.h" /M$(CECrtMTDebug) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_armud.lib"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_armud.lib"
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\include" /I "..\..\..\lib\wince_armud" /D "DEBUG" /D "ARM" /D "_ARM_" /D "__WXWINCE__" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /Yu"wx/wxprec.h" /M$(CECrtMTDebug) /c
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Release Unicode"
 
@@ -147,15 +147,15 @@ BSC32=bscmake.exe
 # PROP Sec_AlwaysSign 0
 # PROP Sec_ConfigureDevice 0
 # PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "..\..\..\lib\wince_armu" /I "..\..\..\include" /I "..\..\regex" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "__WXWINCE__" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_armu.lib"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_armu.lib"
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "..\..\..\include" /I "..\..\..\lib\wince_armu" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "__WXWINCE__" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Debug Unicode"
 
@@ -177,15 +177,15 @@ BSC32=bscmake.exe
 # PROP Sec_AlwaysSign 0
 # PROP Sec_ConfigureDevice 0
 # PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "__WXWINCE__" /Yu"wx/wxprec.h" /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\lib\wince_x86emud" /I "..\..\..\include" /I "..\..\regex" /D "DEBUG" /D "i486" /D "_X86_" /D "x86" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /Gz /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxmswce_armd.lib"
-# ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_x86emud.lib"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxmswce_armd.lib"
+# ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_x86emud.lib"
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "__WXWINCE__" /Yu"wx/wxprec.h" /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\include" /I "..\..\..\lib\wince_x86emud" /D "DEBUG" /D "i486" /D "_X86_" /D "x86" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /Gz /c
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Release Unicode"
 
@@ -207,15 +207,15 @@ BSC32=bscmake.exe
 # PROP Sec_AlwaysSign 0
 # PROP Sec_ConfigureDevice 0
 # PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "__WXWINCE__" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "..\..\..\lib\wince_x86emu" /I "..\..\..\include" /I "..\..\regex" /D "NDEBUG" /D "i486" /D "_X86_" /D "x86" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxmswce_arm.lib"
-# ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_x86emu.lib"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxmswce_arm.lib"
+# ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_x86emu.lib"
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "__WXWINCE__" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "..\..\..\include" /I "..\..\..\lib\wince_x86emu" /D "NDEBUG" /D "i486" /D "_X86_" /D "x86" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Debug Unicode"
 
@@ -237,15 +237,15 @@ BSC32=bscmake.exe
 # PROP Sec_AlwaysSign 0
 # PROP Sec_ConfigureDevice 0
 # PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /Yu"wx/wxprec.h" /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\lib\wince_mipsud" /I "..\..\..\include" /I "..\..\regex" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /M$(CECrtMTDebug) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxmswce_armd.lib"
-# ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_mipsud.lib"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxmswce_armd.lib"
+# ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_mipsud.lib"
+CPP=clmips.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /Yu"wx/wxprec.h" /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\include" /I "..\..\..\lib\wince_mipsud" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /M$(CECrtMTDebug) /c
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Release Unicode"
 
@@ -267,15 +267,15 @@ BSC32=bscmake.exe
 # PROP Sec_AlwaysSign 0
 # PROP Sec_ConfigureDevice 0
 # PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "__WXWINCE__" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "..\..\..\lib\wince_mipsu" /I "..\..\..\include" /I "..\..\regex" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxmswce_arm.lib"
-# ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_mipsu.lib"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxmswce_arm.lib"
+# ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_mipsu.lib"
+CPP=clmips.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "__WXWINCE__" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "..\..\..\include" /I "..\..\..\lib\wince_mipsu" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE SH3) Debug Unicode"
 
@@ -299,7 +299,7 @@ BSC32=bscmake.exe
 # PROP Target_Dir ""
 CPP=shcl.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /Yu"wx/wxprec.h" /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\lib\wince_sh3ud" /I "..\..\..\include" /I "..\..\regex" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\include" /I "..\..\..\lib\wince_sh3ud" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /M$(CECrtMTDebug) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxmswce_armd.lib"
 # ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_sh3ud.lib"
@@ -328,8 +328,8 @@ BSC32=bscmake.exe
 # PROP Sec_ConfigureDevice 0
 # PROP Target_Dir ""
 CPP=shcl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "__WXWINCE__" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "..\..\..\lib\wince_sh3u" /I "..\..\..\include" /I "..\..\regex" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
+# ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "__WXWINCE__" /Yu"wx/wxprec.h" /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /Oxs /I "..\..\..\include" /I "..\..\..\lib\wince_sh3u" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxmswce_arm.lib"
 # ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_sh3u.lib"
@@ -729,28 +729,16 @@ SOURCE=..\..\common\extended.c
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Debug Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Release Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Debug Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Release Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Debug Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Release Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE SH3) Debug Unicode"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -763,12 +751,24 @@ SOURCE=..\..\common\extended.c
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Debug Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Release Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Debug Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Release Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ENDIF 
 
 # End Source File
@@ -1302,28 +1302,16 @@ SOURCE=..\..\common\unzip.c
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Debug Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Release Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Debug Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Release Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Debug Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Release Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE SH3) Debug Unicode"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -1336,12 +1324,24 @@ SOURCE=..\..\common\unzip.c
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Debug Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Release Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Debug Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Release Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ENDIF 
 
 # End Source File
@@ -1803,28 +1803,16 @@ SOURCE=..\dummy.cpp
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Debug Unicode"
 
-# ADD CPP /Yc"wx/wxprec.h"
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Release Unicode"
 
-# ADD CPP /Yc"wx/wxprec.h"
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Debug Unicode"
 
-# ADD CPP /Yc"wx/wxprec.h"
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Release Unicode"
 
-# ADD CPP /Yc"wx/wxprec.h"
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Debug Unicode"
 
-# ADD CPP /Yc"wx/wxprec.h"
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Release Unicode"
 
-# ADD CPP /Yc"wx/wxprec.h"
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE SH3) Debug Unicode"
 
 # ADD BASE CPP /Yc"wx/wxprec.h"
@@ -1837,12 +1825,24 @@ SOURCE=..\dummy.cpp
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Debug Unicode"
 
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Release Unicode"
 
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Debug Unicode"
 
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Release Unicode"
 
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"
+
 !ENDIF 
 
 # End Source File
@@ -1920,28 +1920,16 @@ SOURCE=..\gsocket.c
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Debug Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Release Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Debug Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Release Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Debug Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Release Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE SH3) Debug Unicode"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -1954,12 +1942,24 @@ SOURCE=..\gsocket.c
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Debug Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Release Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Debug Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Release Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ENDIF 
 
 # End Source File
@@ -1977,28 +1977,16 @@ SOURCE=..\gsockmsw.c
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Debug Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Release Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Debug Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Release Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Debug Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Release Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE SH3) Debug Unicode"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -2011,12 +1999,24 @@ SOURCE=..\gsockmsw.c
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Debug Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Release Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Debug Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Release Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ENDIF 
 
 # End Source File
@@ -2408,28 +2408,16 @@ SOURCE=.\net.cpp
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Debug Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Release Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Debug Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Release Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Debug Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Release Unicode"
 
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE SH3) Debug Unicode"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -2442,12 +2430,24 @@ SOURCE=.\net.cpp
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Debug Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Release Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Debug Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Release Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ENDIF 
 
 # End Source File
@@ -2471,22 +2471,16 @@ SOURCE=.\time.cpp
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Debug Unicode"
 
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Release Unicode"
 
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Debug Unicode"
 
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Release Unicode"
 
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Debug Unicode"
 
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Release Unicode"
 
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE SH3) Debug Unicode"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -2499,12 +2493,24 @@ SOURCE=.\time.cpp
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Debug Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Release Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Debug Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Release Unicode"
 
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ENDIF 
 
 # End Source File
diff --git a/src/msw/wince/wxWindowsCE.vcw b/src/msw/wince/wxWindowsCE.vcw
index 9aae435bdd..8878d9a679 100644
--- a/src/msw/wince/wxWindowsCE.vcw
+++ b/src/msw/wince/wxWindowsCE.vcw
@@ -3,18 +3,6 @@ Microsoft eMbedded Visual Tools Workspace File, Format Version 3.00
 
 ###############################################################################
 
-Project: "regexCE"=..\..\regex\regexCE.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "wxWindowsCE"=.\wxWindowsCE.vcp - Package Owner=<4>
 
 Package=<5>
@@ -23,9 +11,6 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name regexCE
-    End Project Dependency
 }}}
 
 ###############################################################################