Added support for hover bitmap

[wxWidgets.git] / build / msw / wx_wxregex.dsp

diff --git a/build/msw/wx_wxregex.dsp b/build/msw/wx_wxregex.dsp
index 92c62ae13c4c62df5f00d24a2a0ab85e7f2fb887..142e32e003d7279c36e3f054764fc7920c3c55e7 100644 (file)
--- a/build/msw/wx_wxregex.dsp
+++ b/build/msw/wx_wxregex.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 

-CFG=wxregex - Win32 Debug USE_AUI_0
+CFG=wxregex - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 


@@ -13,42 +13,26 @@ CFG=wxregex - Win32 Debug USE_AUI_0
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 

-!MESSAGE NMAKE /f "wx_wxregex.mak" CFG="wxregex - Win32 Debug USE_AUI_0"
+!MESSAGE NMAKE /f "wx_wxregex.mak" CFG="wxregex - Win32 Debug"

 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

-!MESSAGE "wxregex - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 
 
 # Begin Project
 !MESSAGE 
 
 # Begin Project


@@ -58,7 +42,7 @@ CFG=wxregex - Win32 Debug USE_AUI_0
 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 

-!IF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -70,8 +54,8 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswunivudll\wxregex"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswunivudll\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c

 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe


@@ -81,53 +65,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -139,8 +77,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswunivuddll\wxregex"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswunivuddll\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c

 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe


@@ -150,30 +88,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -185,8 +100,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswunivdll\wxregex"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswunivdll\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c

 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe


@@ -196,30 +111,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -231,8 +123,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswunivddll\wxregex"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswunivddll\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c

 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe


@@ -242,30 +134,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Release USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -288,30 +157,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -334,30 +180,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Release USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -380,30 +203,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -426,7 +226,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -438,8 +238,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswunivu\wxregex"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswunivu\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c

 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe


@@ -449,53 +249,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivud\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -507,8 +261,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswunivud\wxregex"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswunivud\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c

 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe


@@ -518,30 +272,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Release USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -553,8 +284,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswuniv\wxregex"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswuniv\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c

 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe


@@ -564,30 +295,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -599,8 +307,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswunivd\wxregex"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswunivd\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c

 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe


@@ -610,30 +318,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -656,30 +341,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -702,30 +364,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Release USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -748,30 +387,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -798,38 +414,22 @@ LIB32=link.exe -lib
 
 # Begin Target
 
 
 # Begin Target
 

-# Name "wxregex - Win32 DLL Universal Unicode Release USE_AUI_1"
-# Name "wxregex - Win32 DLL Universal Unicode Release USE_AUI_0"
-# Name "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_1"
-# Name "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_0"
-# Name "wxregex - Win32 DLL Universal Release USE_AUI_1"
-# Name "wxregex - Win32 DLL Universal Release USE_AUI_0"
-# Name "wxregex - Win32 DLL Universal Debug USE_AUI_1"
-# Name "wxregex - Win32 DLL Universal Debug USE_AUI_0"
-# Name "wxregex - Win32 DLL Unicode Release USE_AUI_1"
-# Name "wxregex - Win32 DLL Unicode Release USE_AUI_0"
-# Name "wxregex - Win32 DLL Unicode Debug USE_AUI_1"
-# Name "wxregex - Win32 DLL Unicode Debug USE_AUI_0"
-# Name "wxregex - Win32 DLL Release USE_AUI_1"
-# Name "wxregex - Win32 DLL Release USE_AUI_0"
-# Name "wxregex - Win32 DLL Debug USE_AUI_1"
-# Name "wxregex - Win32 DLL Debug USE_AUI_0"
-# Name "wxregex - Win32 Universal Unicode Release USE_AUI_1"
-# Name "wxregex - Win32 Universal Unicode Release USE_AUI_0"
-# Name "wxregex - Win32 Universal Unicode Debug USE_AUI_1"
-# Name "wxregex - Win32 Universal Unicode Debug USE_AUI_0"
-# Name "wxregex - Win32 Universal Release USE_AUI_1"
-# Name "wxregex - Win32 Universal Release USE_AUI_0"
-# Name "wxregex - Win32 Universal Debug USE_AUI_1"
-# Name "wxregex - Win32 Universal Debug USE_AUI_0"
-# Name "wxregex - Win32 Unicode Release USE_AUI_1"
-# Name "wxregex - Win32 Unicode Release USE_AUI_0"
-# Name "wxregex - Win32 Unicode Debug USE_AUI_1"
-# Name "wxregex - Win32 Unicode Debug USE_AUI_0"
-# Name "wxregex - Win32 Release USE_AUI_1"
-# Name "wxregex - Win32 Release USE_AUI_0"
-# Name "wxregex - Win32 Debug USE_AUI_1"
-# Name "wxregex - Win32 Debug USE_AUI_0"
+# Name "wxregex - Win32 DLL Universal Unicode Release"
+# Name "wxregex - Win32 DLL Universal Unicode Debug"
+# Name "wxregex - Win32 DLL Universal Release"
+# Name "wxregex - Win32 DLL Universal Debug"
+# Name "wxregex - Win32 DLL Unicode Release"
+# Name "wxregex - Win32 DLL Unicode Debug"
+# Name "wxregex - Win32 DLL Release"
+# Name "wxregex - Win32 DLL Debug"
+# Name "wxregex - Win32 Universal Unicode Release"
+# Name "wxregex - Win32 Universal Unicode Debug"
+# Name "wxregex - Win32 Universal Release"
+# Name "wxregex - Win32 Universal Debug"
+# Name "wxregex - Win32 Unicode Release"
+# Name "wxregex - Win32 Unicode Debug"
+# Name "wxregex - Win32 Release"
+# Name "wxregex - Win32 Debug"

 # Begin Group "Source Files"
 
 # PROP Default_Filter ""
 # Begin Group "Source Files"
 
 # PROP Default_Filter ""


@@ -857,290 +457,162 @@ SOURCE=..\..\src\regex\regfree.c
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 

-!IF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h

+InputPath=..\..\include\wx\msw\genrcdefs.h

 
 

-"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"

        cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
 
        cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
-
-"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
-
-"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h

+InputPath=..\..\include\wx\msw\genrcdefs.h

 
 

-"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw"

        cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
 
        cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h

+InputPath=..\..\include\wx\msw\genrcdefs.h

 
 

-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw"

        cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
 
        cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Release USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
-
-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
-
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Debug USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
-
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
-
-"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Release USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
-
-"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
-
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
-
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
-
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Release USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
-
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
-
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
-
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Debug"

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h

 
 

-"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Release"

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h

 
 

-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug"

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h

 
 

-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Release"

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h

 
 

-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug"

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h

 
 

-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Release"

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h

 
 

-"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Debug"

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h

 
 

-"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Release"

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h

 
 

-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Debug"

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h

 
 

-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release"

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h

 
 

-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug"

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h

 
 

-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Release"

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h

 
 

-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h

+InputPath=..\..\include\wx\msw\genrcdefs.h

 
 

-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw"

        cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
        cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build


@@ -1152,257 +624,129 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 SOURCE=..\..\include\wx\univ\setup.h
 
 
 SOURCE=..\..\include\wx\univ\setup.h
 

-!IF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h

-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h

 
 "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
 
 # End Custom Build
 
 
 "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
-
-"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
-
-"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h

-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h

 
 "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
 
 # End Custom Build
 
 
 "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h

-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h

 
 "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
 
 # End Custom Build
 
 
 "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Release USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
-
-"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
-
-"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h

-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h

 
 "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
 
 # End Custom Build
 
 
 "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
-
-"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h

-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h

 
 "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
 
 # End Custom Build
 
 
 "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
-
-"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h

-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h

 
 "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
 
 # End Custom Build
 
 
 "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
-
-"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h

-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h

 
 "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
 
 # End Custom Build
 
 
 "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
-
-"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h

-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h

 
 "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
 
 # End Custom Build
 
 
 "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Debug"

 
 # Begin Custom Build - 
 
 
 # Begin Custom Build - 
 


@@ -1415,256 +759,128 @@ InputPath=..\include\wx\univ\setup.h
 
 SOURCE=..\..\include\wx\msw\setup.h
 
 
 SOURCE=..\..\include\wx\msw\setup.h
 

-!IF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Release USE_AUI_1"
+!IF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h

-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h

 
 "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
 
 # End Custom Build
 
 
 "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h

-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h

 
 "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
 
 # End Custom Build
 
 
 "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h

-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h

 
 "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
 
 # End Custom Build
 
 
 "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h

-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h

 
 "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
 
 # End Custom Build
 
 
 "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h

-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h

 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
 
 # End Custom Build
 
 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h

-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h

 
 "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
 
 # End Custom Build
 
 
 "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h

-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h

 
 "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
 
 # End Custom Build
 
 
 "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Release USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h

-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h

 
 "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
 
 "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h