regenerated makefiles

[wxWidgets.git] / contrib / samples / deprecated / resource / resource.dsp

diff --git a/contrib/samples/deprecated/resource/resource.dsp b/contrib/samples/deprecated/resource/resource.dsp
index 30d358aa5cb3f3463f5a124d354e8cab9a66c9be..3298bac49e3c753ec8cf1ba8d7ea8f0a51340763 100644 (file)
--- a/contrib/samples/deprecated/resource/resource.dsp
+++ b/contrib/samples/deprecated/resource/resource.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=resource - Win32 LIB wxUniv Debug Unicode
+CFG=resource - Win32 DLL Release
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,26 +13,26 @@ CFG=resource - Win32 LIB wxUniv Debug Unicode
 !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 "resource.mak" CFG="resource - Win32 LIB wxUniv Debug Unicode"
+!MESSAGE NMAKE /f "resource.mak" CFG="resource - Win32 DLL Release"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "resource - Win32 LIB wxUniv Debug Unicode" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 DLL Native Release Ansi" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 DLL wxUniv Debug Unicode" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 DLL wxUniv Release Unicode" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 DLL wxUniv Release Ansi" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 LIB Native Debug Unicode" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 DLL wxUniv Debug Ansi" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 LIB Native Debug Ansi" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 DLL Native Release Unicode" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 LIB wxUniv Release Ansi" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 LIB Native Release Unicode" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 LIB wxUniv Debug Ansi" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 DLL Native Debug Unicode" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 DLL Native Debug Ansi" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 LIB Native Release Ansi" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 LIB wxUniv Release Unicode" (based on "Win32 (x86) Application")
+!MESSAGE "resource - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "resource - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "resource - Win32 Unicode Debug" (based on "Win32 (x86) Application")
+!MESSAGE "resource - Win32 Unicode Release" (based on "Win32 (x86) Application")
+!MESSAGE "resource - Win32 Universal Debug" (based on "Win32 (x86) Application")
+!MESSAGE "resource - Win32 Universal Release" (based on "Win32 (x86) Application")
+!MESSAGE "resource - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
+!MESSAGE "resource - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
+!MESSAGE "resource - Win32 DLL Debug" (based on "Win32 (x86) Application")
+!MESSAGE "resource - Win32 DLL Release" (based on "Win32 (x86) Application")
+!MESSAGE "resource - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
+!MESSAGE "resource - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
+!MESSAGE "resource - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
+!MESSAGE "resource - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
+!MESSAGE "resource - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
+!MESSAGE "resource - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
 !MESSAGE 
 
 # Begin Project
@@ -43,132 +43,57 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "resource - Win32 LIB wxUniv Debug Unicode"
+!IF  "$(CFG)" == "resource - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\resource"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\resource"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv25ud_deprecated.lib wxmswuniv25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivud\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswunivud" /subsystem:windows
-# ADD LINK32 wxmswuniv25ud_deprecated.lib wxmswuniv25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivud\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswunivud" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "resource - Win32 DLL Native Release Ansi"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\resource"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\resource"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw25_deprecated.lib wxmsw25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswdll\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswdll" /subsystem:windows
-# ADD LINK32 wxmsw25_deprecated.lib wxmsw25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswdll\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswdll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "resource - Win32 DLL wxUniv Debug Unicode"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\resource"
+# PROP BASE Output_Dir "vc_mswd"
+# PROP BASE Intermediate_Dir "vc_mswd\resource"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\resource"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv25ud_deprecated.lib wxmswuniv25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswunivuddll" /subsystem:windows
-# ADD LINK32 wxmswuniv25ud_deprecated.lib wxmswuniv25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswunivuddll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "resource - Win32 DLL wxUniv Release Unicode"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\resource"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\resource"
+# PROP Output_Dir "vc_mswd"
+# PROP Intermediate_Dir "vc_mswd\resource"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv25u_deprecated.lib wxmswuniv25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivudll\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswunivudll" /subsystem:windows
-# ADD LINK32 wxmswuniv25u_deprecated.lib wxmswuniv25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivudll\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswunivudll" /subsystem:windows
+# ADD BASE LINK32 wxmsw25d_deprecated.lib wxmsw25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswd\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswd" /subsystem:windows
+# ADD LINK32 wxmsw25d_deprecated.lib wxmsw25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswd\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswd" /subsystem:windows
 
-!ELSEIF  "$(CFG)" == "resource - Win32 DLL wxUniv Release Ansi"
+!ELSEIF  "$(CFG)" == "resource - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\resource"
+# PROP BASE Output_Dir "vc_msw"
+# PROP BASE Intermediate_Dir "vc_msw\resource"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\resource"
+# PROP Output_Dir "vc_msw"
+# PROP Intermediate_Dir "vc_msw\resource"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv25_deprecated.lib wxmswuniv25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivdll\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswunivdll" /subsystem:windows
-# ADD LINK32 wxmswuniv25_deprecated.lib wxmswuniv25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivdll\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswunivdll" /subsystem:windows
+# ADD BASE LINK32 wxmsw25_deprecated.lib wxmsw25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_msw\resource.exe" /libpath:".\..\..\..\..\lib\vc_msw" /subsystem:windows
+# ADD LINK32 wxmsw25_deprecated.lib wxmsw25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_msw\resource.exe" /libpath:".\..\..\..\..\lib\vc_msw" /subsystem:windows
 
-!ELSEIF  "$(CFG)" == "resource - Win32 LIB Native Debug Unicode"
+!ELSEIF  "$(CFG)" == "resource - Win32 Unicode Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -193,82 +118,57 @@ LINK32=link.exe
 # ADD BASE LINK32 wxmsw25ud_deprecated.lib wxmsw25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswud\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswud" /subsystem:windows
 # ADD LINK32 wxmsw25ud_deprecated.lib wxmsw25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswud\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswud" /subsystem:windows
 
-!ELSEIF  "$(CFG)" == "resource - Win32 DLL wxUniv Debug Ansi"
+!ELSEIF  "$(CFG)" == "resource - Win32 Unicode Release"
 
 # PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\resource"
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "vc_mswu"
+# PROP BASE Intermediate_Dir "vc_mswu\resource"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\resource"
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "vc_mswu"
+# PROP Intermediate_Dir "vc_mswu\resource"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv25d_deprecated.lib wxmswuniv25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivddll\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswunivddll" /subsystem:windows
-# ADD LINK32 wxmswuniv25d_deprecated.lib wxmswuniv25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivddll\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswunivddll" /subsystem:windows
+# ADD BASE LINK32 wxmsw25u_deprecated.lib wxmsw25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswu\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswu" /subsystem:windows
+# ADD LINK32 wxmsw25u_deprecated.lib wxmsw25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswu\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswu" /subsystem:windows
 
-!ELSEIF  "$(CFG)" == "resource - Win32 LIB Native Debug Ansi"
+!ELSEIF  "$(CFG)" == "resource - Win32 Universal Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\resource"
+# PROP BASE Output_Dir "vc_mswunivd"
+# PROP BASE Intermediate_Dir "vc_mswunivd\resource"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\resource"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw25d_deprecated.lib wxmsw25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswd\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswd" /subsystem:windows
-# ADD LINK32 wxmsw25d_deprecated.lib wxmsw25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswd\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswd" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "resource - Win32 DLL Native Release Unicode"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\resource"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\resource"
+# PROP Output_Dir "vc_mswunivd"
+# PROP Intermediate_Dir "vc_mswunivd\resource"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxmsw25u_deprecated.lib wxmsw25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswudll\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswudll" /subsystem:windows
-# ADD LINK32 wxmsw25u_deprecated.lib wxmsw25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswudll\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswudll" /subsystem:windows
+# ADD BASE LINK32 wxmswuniv25d_deprecated.lib wxmswuniv25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivd\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswunivd" /subsystem:windows
+# ADD LINK32 wxmswuniv25d_deprecated.lib wxmswuniv25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivd\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswunivd" /subsystem:windows
 
-!ELSEIF  "$(CFG)" == "resource - Win32 LIB wxUniv Release Ansi"
+!ELSEIF  "$(CFG)" == "resource - Win32 Universal Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -293,57 +193,107 @@ LINK32=link.exe
 # ADD BASE LINK32 wxmswuniv25_deprecated.lib wxmswuniv25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswuniv\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswuniv" /subsystem:windows
 # ADD LINK32 wxmswuniv25_deprecated.lib wxmswuniv25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswuniv\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswuniv" /subsystem:windows
 
-!ELSEIF  "$(CFG)" == "resource - Win32 LIB Native Release Unicode"
+!ELSEIF  "$(CFG)" == "resource - Win32 Universal Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswunivud"
+# PROP BASE Intermediate_Dir "vc_mswunivud\resource"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswunivud"
+# PROP Intermediate_Dir "vc_mswunivud\resource"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv25ud_deprecated.lib wxmswuniv25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivud\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswunivud" /subsystem:windows
+# ADD LINK32 wxmswuniv25ud_deprecated.lib wxmswuniv25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivud\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswunivud" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "resource - Win32 Universal Unicode Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\resource"
+# PROP BASE Output_Dir "vc_mswunivu"
+# PROP BASE Intermediate_Dir "vc_mswunivu\resource"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\resource"
+# PROP Output_Dir "vc_mswunivu"
+# PROP Intermediate_Dir "vc_mswunivu\resource"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxmsw25u_deprecated.lib wxmsw25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswu\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswu" /subsystem:windows
-# ADD LINK32 wxmsw25u_deprecated.lib wxmsw25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswu\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswu" /subsystem:windows
+# ADD BASE LINK32 wxmswuniv25u_deprecated.lib wxmswuniv25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivu\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswunivu" /subsystem:windows
+# ADD LINK32 wxmswuniv25u_deprecated.lib wxmswuniv25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivu\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswunivu" /subsystem:windows
 
-!ELSEIF  "$(CFG)" == "resource - Win32 LIB wxUniv Debug Ansi"
+!ELSEIF  "$(CFG)" == "resource - Win32 DLL Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\resource"
+# PROP BASE Output_Dir "vc_mswddll"
+# PROP BASE Intermediate_Dir "vc_mswddll\resource"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\resource"
+# PROP Output_Dir "vc_mswddll"
+# PROP Intermediate_Dir "vc_mswddll\resource"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv25d_deprecated.lib wxmswuniv25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivd\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswunivd" /subsystem:windows
-# ADD LINK32 wxmswuniv25d_deprecated.lib wxmswuniv25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivd\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswunivd" /subsystem:windows
+# ADD BASE LINK32 wxmsw25d_deprecated.lib wxmsw25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswddll\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswddll" /subsystem:windows
+# ADD LINK32 wxmsw25d_deprecated.lib wxmsw25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswddll\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswddll" /subsystem:windows
 
-!ELSEIF  "$(CFG)" == "resource - Win32 DLL Native Debug Unicode"
+!ELSEIF  "$(CFG)" == "resource - Win32 DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "vc_mswdll"
+# PROP BASE Intermediate_Dir "vc_mswdll\resource"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "vc_mswdll"
+# PROP Intermediate_Dir "vc_mswdll\resource"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw25_deprecated.lib wxmsw25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswdll\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswdll" /subsystem:windows
+# ADD LINK32 wxmsw25_deprecated.lib wxmsw25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswdll\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswdll" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "resource - Win32 DLL Unicode Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -368,101 +318,151 @@ LINK32=link.exe
 # ADD BASE LINK32 wxmsw25ud_deprecated.lib wxmsw25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswuddll\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswuddll" /subsystem:windows
 # ADD LINK32 wxmsw25ud_deprecated.lib wxmsw25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswuddll\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswuddll" /subsystem:windows
 
-!ELSEIF  "$(CFG)" == "resource - Win32 DLL Native Debug Ansi"
+!ELSEIF  "$(CFG)" == "resource - Win32 DLL Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "vc_mswudll"
+# PROP BASE Intermediate_Dir "vc_mswudll\resource"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "vc_mswudll"
+# PROP Intermediate_Dir "vc_mswudll\resource"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw25u_deprecated.lib wxmsw25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswudll\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswudll" /subsystem:windows
+# ADD LINK32 wxmsw25u_deprecated.lib wxmsw25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswudll\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswudll" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "resource - Win32 DLL Universal Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\resource"
+# PROP BASE Output_Dir "vc_mswunivddll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\resource"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\resource"
+# PROP Output_Dir "vc_mswunivddll"
+# PROP Intermediate_Dir "vc_mswunivddll\resource"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxmsw25d_deprecated.lib wxmsw25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswddll\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswddll" /subsystem:windows
-# ADD LINK32 wxmsw25d_deprecated.lib wxmsw25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswddll\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswddll" /subsystem:windows
+# ADD BASE LINK32 wxmswuniv25d_deprecated.lib wxmswuniv25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivddll\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswunivddll" /subsystem:windows
+# ADD LINK32 wxmswuniv25d_deprecated.lib wxmswuniv25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivddll\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswunivddll" /subsystem:windows
 
-!ELSEIF  "$(CFG)" == "resource - Win32 LIB Native Release Ansi"
+!ELSEIF  "$(CFG)" == "resource - Win32 DLL Universal Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\resource"
+# PROP BASE Output_Dir "vc_mswunivdll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\resource"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\resource"
+# PROP Output_Dir "vc_mswunivdll"
+# PROP Intermediate_Dir "vc_mswunivdll\resource"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxmsw25_deprecated.lib wxmsw25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_msw\resource.exe" /libpath:".\..\..\..\..\lib\vc_msw" /subsystem:windows
-# ADD LINK32 wxmsw25_deprecated.lib wxmsw25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_msw\resource.exe" /libpath:".\..\..\..\..\lib\vc_msw" /subsystem:windows
+# ADD BASE LINK32 wxmswuniv25_deprecated.lib wxmswuniv25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivdll\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswunivdll" /subsystem:windows
+# ADD LINK32 wxmswuniv25_deprecated.lib wxmswuniv25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivdll\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswunivdll" /subsystem:windows
 
-!ELSEIF  "$(CFG)" == "resource - Win32 LIB wxUniv Release Unicode"
+!ELSEIF  "$(CFG)" == "resource - Win32 DLL Universal Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswunivuddll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\resource"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswunivuddll"
+# PROP Intermediate_Dir "vc_mswunivuddll\resource"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv25ud_deprecated.lib wxmswuniv25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswunivuddll" /subsystem:windows
+# ADD LINK32 wxmswuniv25ud_deprecated.lib wxmswuniv25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_mswunivuddll" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "resource - Win32 DLL Universal Unicode Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\resource"
+# PROP BASE Output_Dir "vc_mswunivudll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\resource"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\resource"
+# PROP Output_Dir "vc_mswunivudll"
+# PROP Intermediate_Dir "vc_mswunivudll\resource"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv25u_deprecated.lib wxmswuniv25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivu\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswunivu" /subsystem:windows
-# ADD LINK32 wxmswuniv25u_deprecated.lib wxmswuniv25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivu\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswunivu" /subsystem:windows
+# ADD BASE LINK32 wxmswuniv25u_deprecated.lib wxmswuniv25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivudll\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswunivudll" /subsystem:windows
+# ADD LINK32 wxmswuniv25u_deprecated.lib wxmswuniv25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivudll\resource.exe" /libpath:".\..\..\..\..\lib\vc_mswunivudll" /subsystem:windows
 
 !ENDIF
 
 # Begin Target
 
-# Name "resource - Win32 LIB wxUniv Debug Unicode"
-# Name "resource - Win32 DLL Native Release Ansi"
-# Name "resource - Win32 DLL wxUniv Debug Unicode"
-# Name "resource - Win32 DLL wxUniv Release Unicode"
-# Name "resource - Win32 DLL wxUniv Release Ansi"
-# Name "resource - Win32 LIB Native Debug Unicode"
-# Name "resource - Win32 DLL wxUniv Debug Ansi"
-# Name "resource - Win32 LIB Native Debug Ansi"
-# Name "resource - Win32 DLL Native Release Unicode"
-# Name "resource - Win32 LIB wxUniv Release Ansi"
-# Name "resource - Win32 LIB Native Release Unicode"
-# Name "resource - Win32 LIB wxUniv Debug Ansi"
-# Name "resource - Win32 DLL Native Debug Unicode"
-# Name "resource - Win32 DLL Native Debug Ansi"
-# Name "resource - Win32 LIB Native Release Ansi"
-# Name "resource - Win32 LIB wxUniv Release Unicode"
+# Name "resource - Win32 Debug"
+# Name "resource - Win32 Release"
+# Name "resource - Win32 Unicode Debug"
+# Name "resource - Win32 Unicode Release"
+# Name "resource - Win32 Universal Debug"
+# Name "resource - Win32 Universal Release"
+# Name "resource - Win32 Universal Unicode Debug"
+# Name "resource - Win32 Universal Unicode Release"
+# Name "resource - Win32 DLL Debug"
+# Name "resource - Win32 DLL Release"
+# Name "resource - Win32 DLL Unicode Debug"
+# Name "resource - Win32 DLL Unicode Release"
+# Name "resource - Win32 DLL Universal Debug"
+# Name "resource - Win32 DLL Universal Release"
+# Name "resource - Win32 DLL Universal Unicode Debug"
+# Name "resource - Win32 DLL Universal Unicode Release"
 # Begin Group "Source Files"
 
 # PROP Default_Filter ""