Do archive name case conversion for wxMac and wxMotif

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

diff --git a/build/msw/wx_wxregex.dsp b/build/msw/wx_wxregex.dsp
index 4b806448461727737f23ca497794b1b19602ae6d..a851f65ec261be5b897fb19f934f5181581b34b3 100644 (file)
--- a/build/msw/wx_wxregex.dsp
+++ b/build/msw/wx_wxregex.dsp
@@ -21,18 +21,18 @@ CFG=wxregex - Win32 DLL Release
 !MESSAGE "wxregex - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "wxregex - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE "wxregex - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "wxregex - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "wxregex - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE "wxregex - Win32 Unicode Release" (based on "Win32 (x86) Static Library")

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

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

-!MESSAGE "wxregex - Win32 DLL wxUniv Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL wxUniv Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL wxUniv Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL wxUniv Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Universal 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 Unicode Release" (based on "Win32 (x86) Static Library")

 !MESSAGE 
 
 # Begin Project
 !MESSAGE 
 
 # Begin Project


@@ -46,369 +46,369 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "..\..\lib\vc_mswd"
+# 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 BASE Intermediate_Dir "vc_mswd\wxregex"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\lib\vc_mswd"
+# PROP Output_Dir "..\..\lib\vc_lib"

 # PROP Intermediate_Dir "vc_mswd\wxregex"
 # PROP Target_Dir ""
 # PROP Intermediate_Dir "vc_mswd\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_mswd\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_mswd\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_mswd\wxregexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_mswd\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 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 !ELSEIF  "$(CFG)" == "wxregex - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "..\..\lib\vc_msw"
+# 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 BASE Intermediate_Dir "vc_msw\wxregex"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\lib\vc_msw"
+# PROP Output_Dir "..\..\lib\vc_lib"

 # PROP Intermediate_Dir "vc_msw\wxregex"
 # PROP Target_Dir ""
 # PROP Intermediate_Dir "vc_msw\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\..\lib\vc_msw\wxregex.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\..\lib\vc_msw\wxregex.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_msw\wxregex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_msw\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 Unicode Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 !ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "..\..\lib\vc_mswud"
+# 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 BASE Intermediate_Dir "vc_mswud\wxregex"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\lib\vc_mswud"
+# PROP Output_Dir "..\..\lib\vc_lib"

 # PROP Intermediate_Dir "vc_mswud\wxregex"
 # PROP Target_Dir ""
 # PROP Intermediate_Dir "vc_mswud\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_mswud\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_mswud\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_mswud\wxregexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_mswud\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"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 !ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "..\..\lib\vc_mswu"
+# 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 BASE Intermediate_Dir "vc_mswu\wxregex"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\lib\vc_mswu"
+# PROP Output_Dir "..\..\lib\vc_lib"

 # PROP Intermediate_Dir "vc_mswu\wxregex"
 # PROP Target_Dir ""
 # PROP Intermediate_Dir "vc_mswu\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\..\lib\vc_mswu\wxregex.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\..\lib\vc_mswu\wxregex.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_mswu\wxregex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_mswu\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 wxUniv Debug"
+!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

-# PROP BASE Output_Dir "..\..\lib\vc_mswunivd"
+# 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 BASE Intermediate_Dir "vc_mswunivd\wxregex"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\lib\vc_mswunivd"
+# PROP Output_Dir "..\..\lib\vc_lib"

 # PROP Intermediate_Dir "vc_mswunivd\wxregex"
 # PROP Target_Dir ""
 # PROP Intermediate_Dir "vc_mswunivd\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivd\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivd\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_mswunivd\wxregexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_mswunivd\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 wxUniv Release"
+!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

-# PROP BASE Output_Dir "..\..\lib\vc_mswuniv"
+# 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 BASE Intermediate_Dir "vc_mswuniv\wxregex"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\lib\vc_mswuniv"
+# PROP Output_Dir "..\..\lib\vc_lib"

 # PROP Intermediate_Dir "vc_mswuniv\wxregex"
 # PROP Target_Dir ""
 # PROP Intermediate_Dir "vc_mswuniv\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\..\lib\vc_mswuniv\wxregex.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\..\lib\vc_mswuniv\wxregex.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_mswuniv\wxregex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_mswuniv\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 wxUniv Unicode Debug"
+!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

-# PROP BASE Output_Dir "..\..\lib\vc_mswunivud"
+# 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 BASE Intermediate_Dir "vc_mswunivud\wxregex"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\lib\vc_mswunivud"
+# PROP Output_Dir "..\..\lib\vc_lib"

 # PROP Intermediate_Dir "vc_mswunivud\wxregex"
 # PROP Target_Dir ""
 # PROP Intermediate_Dir "vc_mswunivud\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivud\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivud\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_mswunivud\wxregexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_mswunivud\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 wxUniv Unicode Release"
+!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

-# PROP BASE Output_Dir "..\..\lib\vc_mswunivu"
+# 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 BASE Intermediate_Dir "vc_mswunivu\wxregex"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\lib\vc_mswunivu"
+# PROP Output_Dir "..\..\lib\vc_lib"

 # PROP Intermediate_Dir "vc_mswunivu\wxregex"
 # PROP Target_Dir ""
 # PROP Intermediate_Dir "vc_mswunivu\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\..\lib\vc_mswunivu\wxregex.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\..\lib\vc_mswunivu\wxregex.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_mswunivu\wxregex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_mswunivu\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 DLL Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 !ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "..\..\lib\vc_mswddll"
+# 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 BASE Intermediate_Dir "vc_mswddll\wxregex"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\lib\vc_mswddll"
+# PROP Output_Dir "..\..\lib\vc_dll"

 # PROP Intermediate_Dir "vc_mswddll\wxregex"
 # PROP Target_Dir ""
 # PROP Intermediate_Dir "vc_mswddll\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_mswddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_mswddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_mswddll\wxregexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_mswddll\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 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 !ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "..\..\lib\vc_mswdll"
+# 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 BASE Intermediate_Dir "vc_mswdll\wxregex"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\lib\vc_mswdll"
+# PROP Output_Dir "..\..\lib\vc_dll"

 # PROP Intermediate_Dir "vc_mswdll\wxregex"
 # PROP Target_Dir ""
 # PROP Intermediate_Dir "vc_mswdll\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\..\lib\vc_mswdll\wxregex.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\..\lib\vc_mswdll\wxregex.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_mswdll\wxregex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_mswdll\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 Unicode Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 !ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "..\..\lib\vc_mswuddll"
+# 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 BASE Intermediate_Dir "vc_mswuddll\wxregex"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\lib\vc_mswuddll"
+# PROP Output_Dir "..\..\lib\vc_dll"

 # PROP Intermediate_Dir "vc_mswuddll\wxregex"
 # PROP Target_Dir ""
 # PROP Intermediate_Dir "vc_mswuddll\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_mswuddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_mswuddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_mswuddll\wxregexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_mswuddll\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"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 !ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "..\..\lib\vc_mswudll"
+# 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 BASE Intermediate_Dir "vc_mswudll\wxregex"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\lib\vc_mswudll"
+# PROP Output_Dir "..\..\lib\vc_dll"

 # PROP Intermediate_Dir "vc_mswudll\wxregex"
 # PROP Target_Dir ""
 # PROP Intermediate_Dir "vc_mswudll\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\..\lib\vc_mswudll\wxregex.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\..\lib\vc_mswudll\wxregex.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_mswudll\wxregex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_mswudll\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 wxUniv Debug"
+!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

-# PROP BASE Output_Dir "..\..\lib\vc_mswunivddll"
+# 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 BASE Intermediate_Dir "vc_mswunivddll\wxregex"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\lib\vc_mswunivddll"
+# PROP Output_Dir "..\..\lib\vc_dll"

 # PROP Intermediate_Dir "vc_mswunivddll\wxregex"
 # PROP Target_Dir ""
 # PROP Intermediate_Dir "vc_mswunivddll\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_mswunivddll\wxregexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_mswunivddll\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 wxUniv Release"
+!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

-# PROP BASE Output_Dir "..\..\lib\vc_mswunivdll"
+# 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 BASE Intermediate_Dir "vc_mswunivdll\wxregex"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\lib\vc_mswunivdll"
+# PROP Output_Dir "..\..\lib\vc_dll"

 # PROP Intermediate_Dir "vc_mswunivdll\wxregex"
 # PROP Target_Dir ""
 # PROP Intermediate_Dir "vc_mswunivdll\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\..\lib\vc_mswunivdll\wxregex.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\..\lib\vc_mswunivdll\wxregex.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_mswunivdll\wxregex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_mswunivdll\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 wxUniv Unicode Debug"
+!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

-# PROP BASE Output_Dir "..\..\lib\vc_mswunivuddll"
+# 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 BASE Intermediate_Dir "vc_mswunivuddll\wxregex"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\lib\vc_mswunivuddll"
+# PROP Output_Dir "..\..\lib\vc_dll"

 # PROP Intermediate_Dir "vc_mswunivuddll\wxregex"
 # PROP Target_Dir ""
 # PROP Intermediate_Dir "vc_mswunivuddll\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivuddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivuddll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_mswunivuddll\wxregexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_mswunivuddll\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 wxUniv Unicode Release"
+!ELSEIF  "$(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

-# PROP BASE Output_Dir "..\..\lib\vc_mswunivudll"
+# 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 BASE Intermediate_Dir "vc_mswunivudll\wxregex"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\lib\vc_mswunivudll"
+# PROP Output_Dir "..\..\lib\vc_dll"

 # PROP Intermediate_Dir "vc_mswunivudll\wxregex"
 # PROP Target_Dir ""
 # PROP Intermediate_Dir "vc_mswunivudll\wxregex"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\..\lib\vc_mswunivudll\wxregex.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\..\lib\vc_mswunivudll\wxregex.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_mswunivudll\wxregex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_mswunivudll\wxregex.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"

 
 !ENDIF
 
 
 !ENDIF
 


@@ -418,18 +418,18 @@ LIB32=link.exe -lib
 # Name "wxregex - Win32 Release"
 # Name "wxregex - Win32 Unicode Debug"
 # Name "wxregex - Win32 Unicode Release"
 # Name "wxregex - Win32 Release"
 # Name "wxregex - Win32 Unicode Debug"
 # Name "wxregex - Win32 Unicode Release"

-# Name "wxregex - Win32 wxUniv Debug"
-# Name "wxregex - Win32 wxUniv Release"
-# Name "wxregex - Win32 wxUniv Unicode Debug"
-# Name "wxregex - Win32 wxUniv Unicode Release"
+# Name "wxregex - Win32 Universal Debug"
+# Name "wxregex - Win32 Universal Release"
+# Name "wxregex - Win32 Universal Unicode Debug"
+# Name "wxregex - Win32 Universal Unicode Release"

 # Name "wxregex - Win32 DLL Debug"
 # Name "wxregex - Win32 DLL Release"
 # Name "wxregex - Win32 DLL Unicode Debug"
 # Name "wxregex - Win32 DLL Unicode Release"
 # Name "wxregex - Win32 DLL Debug"
 # Name "wxregex - Win32 DLL Release"
 # Name "wxregex - Win32 DLL Unicode Debug"
 # Name "wxregex - Win32 DLL Unicode Release"

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

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