X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cf3e587a2ec542ba1eb6e03a84c54edefae1881..4d833b7b7f86cc7a182a07b52e96705ca7c4c49f:/build/msw/wx_core.dsp?ds=inline diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 4853084825..3701568184 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -18,20 +18,12 @@ CFG=core - Win32 Debug !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "core - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "core - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "core - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "core - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "core - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "core - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "core - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "core - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "core - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library") -!MESSAGE "core - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library") !MESSAGE "core - Win32 Universal Release" (based on "Win32 (x86) Static Library") !MESSAGE "core - Win32 Universal Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "core - Win32 Unicode Release" (based on "Win32 (x86) Static Library") -!MESSAGE "core - Win32 Unicode Debug" (based on "Win32 (x86) Static Library") !MESSAGE "core - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "core - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE @@ -43,32 +35,32 @@ CFG=core - Win32 Debug CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vc_mswunivudll\core" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 +# PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivudll\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb" -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -80,95 +72,45 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivuddll\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\..\lib\vc_dll" -# PROP BASE Intermediate_Dir "vc_mswunivdll\core" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\lib\vc_dll" -# PROP Intermediate_Dir "vc_mswunivdll\core" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_core.lib" -# ADD LINK32 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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_core.lib" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb" -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\lib\vc_dll" -# PROP BASE Intermediate_Dir "vc_mswunivddll\core" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\lib\vc_dll" -# PROP Intermediate_Dir "vc_mswunivddll\core" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290d_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290d_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_core.lib" /debug -# ADD LINK32 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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_core.lib" /debug - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vc_mswudll\core" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 +# PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswudll\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 -# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -180,83 +122,33 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswuddll\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb" -!ELSEIF "$(CFG)" == "core - Win32 DLL Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\..\lib\vc_dll" -# PROP BASE Intermediate_Dir "vc_mswdll\core" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\lib\vc_dll" -# PROP Intermediate_Dir "vc_mswdll\core" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw290_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw290_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 -# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_core.lib" -# ADD LINK32 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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_core.lib" - -!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\..\lib\vc_dll" -# PROP BASE Intermediate_Dir "vc_mswddll\core" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\lib\vc_dll" -# PROP Intermediate_Dir "vc_mswddll\core" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290d_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290d_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_core.lib" /debug -# ADD LINK32 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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_core.lib" /debug - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "vc_mswunivu\core" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 +# PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswunivu\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -266,7 +158,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29u_core.lib" # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29u_core.lib" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -278,8 +170,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswunivud\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -289,66 +181,20 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29ud_core.lib" # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29ud_core.lib" -!ELSEIF "$(CFG)" == "core - Win32 Universal Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\..\lib\vc_lib" -# PROP BASE Intermediate_Dir "vc_mswuniv\core" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\lib\vc_lib" -# PROP Intermediate_Dir "vc_mswuniv\core" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D wxUSE_BASE=0 /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29_core.lib" -# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29_core.lib" - -!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" +!ELSEIF "$(CFG)" == "core - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\lib\vc_lib" -# PROP BASE Intermediate_Dir "vc_mswunivd\core" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\lib\vc_lib" -# PROP Intermediate_Dir "vc_mswunivd\core" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_BASE=0 /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29d_core.lib" -# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29d_core.lib" - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "vc_mswu\core" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 +# PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswu\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -358,7 +204,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29u_core.lib" # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29u_core.lib" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -370,8 +216,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswud\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -381,70 +227,16 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29ud_core.lib" # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29ud_core.lib" -!ELSEIF "$(CFG)" == "core - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\..\lib\vc_lib" -# PROP BASE Intermediate_Dir "vc_msw\core" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\lib\vc_lib" -# PROP Intermediate_Dir "vc_msw\core" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "WXBUILDING" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "WXBUILDING" /D wxUSE_BASE=0 /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29_core.lib" -# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29_core.lib" - -!ELSEIF "$(CFG)" == "core - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\..\lib\vc_lib" -# PROP BASE Intermediate_Dir "vc_mswd\core" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\lib\vc_lib" -# PROP Intermediate_Dir "vc_mswd\core" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_BASE=0 /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29d_core.lib" -# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29d_core.lib" - !ENDIF # Begin Target -# Name "core - Win32 DLL Universal Unicode Release" -# Name "core - Win32 DLL Universal Unicode Debug" # Name "core - Win32 DLL Universal Release" # Name "core - Win32 DLL Universal Debug" -# Name "core - Win32 DLL Unicode Release" -# Name "core - Win32 DLL Unicode Debug" # Name "core - Win32 DLL Release" # Name "core - Win32 DLL Debug" -# Name "core - Win32 Universal Unicode Release" -# Name "core - Win32 Universal Unicode Debug" # Name "core - Win32 Universal Release" # Name "core - Win32 Universal Debug" -# Name "core - Win32 Unicode Release" -# Name "core - Win32 Unicode Debug" # Name "core - Win32 Release" # Name "core - Win32 Debug" # Begin Group "Common Sources" @@ -666,6 +458,14 @@ SOURCE=..\..\src\common\graphcmn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\headercolcmn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\common\headerctrlcmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\helpbase.cpp # End Source File # Begin Source File @@ -782,6 +582,10 @@ SOURCE=..\..\src\common\radiocmn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\rearrangectrl.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\rendcmn.cpp # End Source File # Begin Source File @@ -798,6 +602,10 @@ SOURCE=..\..\src\common\sizer.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\spinctrlcmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\srchcmn.cpp # End Source File # Begin Source File @@ -822,6 +630,10 @@ SOURCE=..\..\src\common\textcmn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\textentrycmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\toplvcmn.cpp # End Source File # Begin Source File @@ -850,6 +662,14 @@ SOURCE=..\..\src\common\wincmn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\windowid.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\common\wrapsizer.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\xpmdecod.cpp # End Source File # End Group @@ -860,55 +680,62 @@ SOURCE=..\..\src\common\xpmdecod.cpp SOURCE=..\..\src\msw\accel.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" + +# PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "core - Win32 Release" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Release" +!ENDIF -!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" +# End Source File +# Begin Source File +SOURCE=..\..\src\msw\ole\access.cpp -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Release" +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" +# PROP Exclude_From_Build 1 !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -921,57 +748,68 @@ SOURCE=..\..\src\msw\accel.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\ole\access.cpp +SOURCE=..\..\src\msw\ole\activex.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" +!ELSEIF "$(CFG)" == "core - Win32 Release" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Release" +!ENDIF +# End Source File +# Begin Source File -!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" +SOURCE=..\..\src\msw\app.cpp +# End Source File +# Begin Source File +SOURCE=..\..\src\msw\artmsw.cpp -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Release" +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" +# PROP Exclude_From_Build 1 !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -984,10 +822,6 @@ SOURCE=..\..\src\msw\ole\access.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\app.cpp -# End Source File -# Begin Source File - SOURCE=..\..\src\msw\ole\automtn.cpp # End Source File # Begin Source File @@ -998,15 +832,7 @@ SOURCE=..\..\src\msw\bitmap.cpp SOURCE=..\..\src\msw\bmpbuttn.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -1014,26 +840,12 @@ SOURCE=..\..\src\msw\bmpbuttn.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -1042,12 +854,6 @@ SOURCE=..\..\src\msw\bmpbuttn.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -1065,15 +871,7 @@ SOURCE=..\..\src\msw\brush.cpp SOURCE=..\..\src\msw\button.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -1081,26 +879,12 @@ SOURCE=..\..\src\msw\button.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -1109,12 +893,6 @@ SOURCE=..\..\src\msw\button.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -1132,42 +910,20 @@ SOURCE=..\..\src\msw\caret.cpp SOURCE=..\..\src\msw\checkbox.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -1176,12 +932,6 @@ SOURCE=..\..\src\msw\checkbox.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -1195,15 +945,7 @@ SOURCE=..\..\src\msw\checkbox.cpp SOURCE=..\..\src\msw\checklst.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -1211,26 +953,12 @@ SOURCE=..\..\src\msw\checklst.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -1239,12 +967,6 @@ SOURCE=..\..\src\msw\checklst.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -1258,15 +980,7 @@ SOURCE=..\..\src\msw\checklst.cpp SOURCE=..\..\src\msw\choice.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -1274,26 +988,12 @@ SOURCE=..\..\src\msw\choice.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -1302,12 +1002,6 @@ SOURCE=..\..\src\msw\choice.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -1325,15 +1019,7 @@ SOURCE=..\..\src\msw\clipbrd.cpp SOURCE=..\..\src\msw\colordlg.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -1341,26 +1027,12 @@ SOURCE=..\..\src\msw\colordlg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -1369,12 +1041,6 @@ SOURCE=..\..\src\msw\colordlg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -1392,15 +1058,7 @@ SOURCE=..\..\src\msw\colour.cpp SOURCE=..\..\src\msw\combo.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -1408,26 +1066,12 @@ SOURCE=..\..\src\msw\combo.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -1436,12 +1080,6 @@ SOURCE=..\..\src\msw\combo.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -1455,15 +1093,7 @@ SOURCE=..\..\src\msw\combo.cpp SOURCE=..\..\src\msw\combobox.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -1471,26 +1101,12 @@ SOURCE=..\..\src\msw\combobox.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -1499,12 +1115,6 @@ SOURCE=..\..\src\msw\combobox.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -1518,15 +1128,7 @@ SOURCE=..\..\src\msw\combobox.cpp SOURCE=..\..\src\msw\control.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -1534,26 +1136,12 @@ SOURCE=..\..\src\msw\control.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -1562,12 +1150,6 @@ SOURCE=..\..\src\msw\control.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -1613,15 +1195,7 @@ SOURCE=..\..\src\msw\dcscreen.cpp SOURCE=..\..\src\msw\dialog.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -1629,26 +1203,12 @@ SOURCE=..\..\src\msw\dialog.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -1657,12 +1217,6 @@ SOURCE=..\..\src\msw\dialog.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -1684,15 +1238,7 @@ SOURCE=..\..\src\msw\dib.cpp SOURCE=..\..\src\msw\dirdlg.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -1700,26 +1246,12 @@ SOURCE=..\..\src\msw\dirdlg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -1728,12 +1260,6 @@ SOURCE=..\..\src\msw\dirdlg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -1751,15 +1277,7 @@ SOURCE=..\..\src\msw\display.cpp SOURCE=..\..\src\msw\dragimag.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -1767,26 +1285,12 @@ SOURCE=..\..\src\msw\dragimag.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -1795,12 +1299,6 @@ SOURCE=..\..\src\msw\dragimag.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -1830,15 +1328,7 @@ SOURCE=..\..\src\msw\evtloop.cpp SOURCE=..\..\src\msw\fdrepdlg.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -1846,26 +1336,12 @@ SOURCE=..\..\src\msw\fdrepdlg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -1874,12 +1350,6 @@ SOURCE=..\..\src\msw\fdrepdlg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -1893,15 +1363,7 @@ SOURCE=..\..\src\msw\fdrepdlg.cpp SOURCE=..\..\src\msw\filedlg.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -1909,26 +1371,12 @@ SOURCE=..\..\src\msw\filedlg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -1937,12 +1385,6 @@ SOURCE=..\..\src\msw\filedlg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -1960,15 +1402,7 @@ SOURCE=..\..\src\msw\font.cpp SOURCE=..\..\src\msw\fontdlg.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -1976,41 +1410,21 @@ SOURCE=..\..\src\msw\fontdlg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 Release" +!ELSEIF "$(CFG)" == "core - Win32 Release" !ELSEIF "$(CFG)" == "core - Win32 Debug" @@ -2031,15 +1445,7 @@ SOURCE=..\..\src\msw\fontutil.cpp SOURCE=..\..\src\msw\frame.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -2047,26 +1453,12 @@ SOURCE=..\..\src\msw\frame.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -2075,12 +1467,6 @@ SOURCE=..\..\src\msw\frame.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -2092,17 +1478,9 @@ SOURCE=..\..\src\msw\frame.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\gauge95.cpp - -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" +SOURCE=..\..\src\msw\gauge.cpp -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -2110,26 +1488,12 @@ SOURCE=..\..\src\msw\gauge95.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -2138,12 +1502,6 @@ SOURCE=..\..\src\msw\gauge95.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -2171,6 +1529,41 @@ SOURCE=..\..\src\msw\graphics.cpp # End Source File # Begin Source File +SOURCE=..\..\src\msw\headerctrl.cpp + +!IF "$(CFG)" == "core - Win32 DLL Universal Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Release" + + +!ELSEIF "$(CFG)" == "core - Win32 Debug" + + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=..\..\src\msw\helpchm.cpp # End Source File # Begin Source File @@ -2189,15 +1582,7 @@ SOURCE=..\..\src\msw\imaglist.cpp SOURCE=..\..\src\msw\iniconf.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -2205,26 +1590,12 @@ SOURCE=..\..\src\msw\iniconf.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -2233,12 +1604,6 @@ SOURCE=..\..\src\msw\iniconf.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -2252,15 +1617,7 @@ SOURCE=..\..\src\msw\iniconf.cpp SOURCE=..\..\src\msw\listbox.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -2268,26 +1625,12 @@ SOURCE=..\..\src\msw\listbox.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -2296,12 +1639,6 @@ SOURCE=..\..\src\msw\listbox.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -2315,15 +1652,7 @@ SOURCE=..\..\src\msw\listbox.cpp SOURCE=..\..\src\msw\listctrl.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -2331,26 +1660,12 @@ SOURCE=..\..\src\msw\listctrl.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -2359,12 +1674,6 @@ SOURCE=..\..\src\msw\listctrl.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -2382,15 +1691,7 @@ SOURCE=..\..\src\msw\main.cpp SOURCE=..\..\src\msw\mdi.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -2398,26 +1699,12 @@ SOURCE=..\..\src\msw\mdi.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -2426,12 +1713,6 @@ SOURCE=..\..\src\msw\mdi.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -2445,15 +1726,7 @@ SOURCE=..\..\src\msw\mdi.cpp SOURCE=..\..\src\msw\menu.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -2461,26 +1734,12 @@ SOURCE=..\..\src\msw\menu.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -2489,12 +1748,6 @@ SOURCE=..\..\src\msw\menu.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -2508,15 +1761,7 @@ SOURCE=..\..\src\msw\menu.cpp SOURCE=..\..\src\msw\menuitem.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -2524,26 +1769,12 @@ SOURCE=..\..\src\msw\menuitem.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -2552,12 +1783,6 @@ SOURCE=..\..\src\msw\menuitem.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -2571,15 +1796,7 @@ SOURCE=..\..\src\msw\menuitem.cpp SOURCE=..\..\src\msw\metafile.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -2587,26 +1804,12 @@ SOURCE=..\..\src\msw\metafile.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -2615,12 +1818,6 @@ SOURCE=..\..\src\msw\metafile.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -2638,15 +1835,7 @@ SOURCE=..\..\src\msw\minifram.cpp SOURCE=..\..\src\msw\msgdlg.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -2654,26 +1843,12 @@ SOURCE=..\..\src\msw\msgdlg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -2682,12 +1857,6 @@ SOURCE=..\..\src\msw\msgdlg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -2705,15 +1874,7 @@ SOURCE=..\..\src\msw\mslu.cpp SOURCE=..\..\src\msw\nativdlg.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -2721,40 +1882,20 @@ SOURCE=..\..\src\msw\nativdlg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -2766,57 +1907,64 @@ SOURCE=..\..\src\msw\nativdlg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\notebook.cpp +SOURCE=..\..\src\msw\nativewin.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" + +# PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "core - Win32 Release" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Release" +!ENDIF -!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" +# End Source File +# Begin Source File +SOURCE=..\..\src\msw\notebook.cpp -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Release" +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" +# PROP Exclude_From_Build 1 !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -2835,15 +1983,7 @@ SOURCE=..\..\src\msw\ole\oleutils.cpp SOURCE=..\..\src\msw\ownerdrw.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -2851,26 +1991,12 @@ SOURCE=..\..\src\msw\ownerdrw.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -2879,12 +2005,6 @@ SOURCE=..\..\src\msw\ownerdrw.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -2918,15 +2038,7 @@ SOURCE=..\..\src\msw\printwin.cpp SOURCE=..\..\src\msw\radiobox.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -2934,26 +2046,12 @@ SOURCE=..\..\src\msw\radiobox.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -2962,12 +2060,6 @@ SOURCE=..\..\src\msw\radiobox.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -2981,15 +2073,7 @@ SOURCE=..\..\src\msw\radiobox.cpp SOURCE=..\..\src\msw\radiobut.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -2997,26 +2081,12 @@ SOURCE=..\..\src\msw\radiobut.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -3025,12 +2095,6 @@ SOURCE=..\..\src\msw\radiobut.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -3052,15 +2116,7 @@ SOURCE=..\..\src\msw\renderer.cpp SOURCE=..\..\src\msw\scrolbar.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -3068,26 +2124,12 @@ SOURCE=..\..\src\msw\scrolbar.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -3096,12 +2138,6 @@ SOURCE=..\..\src\msw\scrolbar.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -3117,17 +2153,9 @@ SOURCE=..\..\src\msw\settings.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\slider95.cpp - -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 +SOURCE=..\..\src\msw\slider.cpp -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -3135,26 +2163,12 @@ SOURCE=..\..\src\msw\slider95.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -3163,12 +2177,6 @@ SOURCE=..\..\src\msw\slider95.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -3182,15 +2190,7 @@ SOURCE=..\..\src\msw\slider95.cpp SOURCE=..\..\src\msw\spinbutt.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -3198,26 +2198,12 @@ SOURCE=..\..\src\msw\spinbutt.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -3226,12 +2212,6 @@ SOURCE=..\..\src\msw\spinbutt.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -3245,15 +2225,7 @@ SOURCE=..\..\src\msw\spinbutt.cpp SOURCE=..\..\src\msw\spinctrl.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -3261,26 +2233,12 @@ SOURCE=..\..\src\msw\spinctrl.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -3289,12 +2247,6 @@ SOURCE=..\..\src\msw\spinctrl.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -3308,15 +2260,7 @@ SOURCE=..\..\src\msw\spinctrl.cpp SOURCE=..\..\src\msw\statbmp.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -3324,26 +2268,12 @@ SOURCE=..\..\src\msw\statbmp.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -3352,12 +2282,6 @@ SOURCE=..\..\src\msw\statbmp.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -3371,15 +2295,7 @@ SOURCE=..\..\src\msw\statbmp.cpp SOURCE=..\..\src\msw\statbox.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -3387,26 +2303,12 @@ SOURCE=..\..\src\msw\statbox.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -3415,12 +2317,6 @@ SOURCE=..\..\src\msw\statbox.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -3432,57 +2328,64 @@ SOURCE=..\..\src\msw\statbox.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\statbr95.cpp +SOURCE=..\..\src\msw\statline.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 Release" -!ELSEIF "$(CFG)" == "core - Win32 DLL Release" +!ELSEIF "$(CFG)" == "core - Win32 Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" +!ENDIF + +# End Source File +# Begin Source File +SOURCE=..\..\src\msw\stattext.cpp -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Release" +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" +# PROP Exclude_From_Build 1 !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -3495,107 +2398,22 @@ SOURCE=..\..\src\msw\statbr95.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\statline.cpp +SOURCE=..\..\src\msw\statusbar.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Debug" - - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\src\msw\stattext.cpp - -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -3604,12 +2422,6 @@ SOURCE=..\..\src\msw\stattext.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -3621,17 +2433,9 @@ SOURCE=..\..\src\msw\stattext.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\tabctrl.cpp - -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 +SOURCE=..\..\src\msw\textctrl.cpp -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -3639,26 +2443,12 @@ SOURCE=..\..\src\msw\tabctrl.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -3667,12 +2457,6 @@ SOURCE=..\..\src\msw\tabctrl.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -3684,17 +2468,9 @@ SOURCE=..\..\src\msw\tabctrl.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\tbar95.cpp +SOURCE=..\..\src\msw\textentry.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -3702,26 +2478,12 @@ SOURCE=..\..\src\msw\tbar95.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -3730,12 +2492,6 @@ SOURCE=..\..\src\msw\tbar95.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -3747,17 +2503,9 @@ SOURCE=..\..\src\msw\tbar95.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\textctrl.cpp - -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 +SOURCE=..\..\src\msw\tglbtn.cpp -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -3765,26 +2513,12 @@ SOURCE=..\..\src\msw\textctrl.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -3793,12 +2527,6 @@ SOURCE=..\..\src\msw\textctrl.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -3810,17 +2538,9 @@ SOURCE=..\..\src\msw\textctrl.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\tglbtn.cpp - -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 +SOURCE=..\..\src\msw\toolbar.cpp -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -3828,26 +2548,12 @@ SOURCE=..\..\src\msw\tglbtn.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -3856,12 +2562,6 @@ SOURCE=..\..\src\msw\tglbtn.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -3883,15 +2583,7 @@ SOURCE=..\..\src\msw\toplevel.cpp SOURCE=..\..\src\msw\treectrl.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -3899,26 +2591,12 @@ SOURCE=..\..\src\msw\treectrl.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -3927,12 +2605,6 @@ SOURCE=..\..\src\msw\treectrl.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -3958,38 +2630,18 @@ SOURCE=..\..\src\msw\uxtheme.cpp SOURCE=..\..\src\msw\version.rc -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -3998,14 +2650,6 @@ SOURCE=..\..\src\msw\version.rc # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -4033,26 +2677,12 @@ SOURCE=..\..\src\msw\window.cpp SOURCE=..\..\src\generic\accel.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -4061,26 +2691,12 @@ SOURCE=..\..\src\generic\accel.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -4120,26 +2736,12 @@ SOURCE=..\..\src\generic\collpaneg.cpp SOURCE=..\..\src\generic\colrdlgg.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -4148,26 +2750,12 @@ SOURCE=..\..\src\generic\colrdlgg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -4195,26 +2783,12 @@ SOURCE=..\..\src\generic\dirctrlg.cpp SOURCE=..\..\src\generic\dirdlgg.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -4223,31 +2797,17 @@ SOURCE=..\..\src\generic\dirdlgg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" +!ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Debug" +!ELSEIF "$(CFG)" == "core - Win32 Debug" # PROP Exclude_From_Build 1 @@ -4262,26 +2822,12 @@ SOURCE=..\..\src\generic\dragimgg.cpp SOURCE=..\..\src\generic\fdrepdlg.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -4290,26 +2836,12 @@ SOURCE=..\..\src\generic\fdrepdlg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -4329,26 +2861,12 @@ SOURCE=..\..\src\generic\filectrlg.cpp SOURCE=..\..\src\generic\filedlgg.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -4357,26 +2875,12 @@ SOURCE=..\..\src\generic\filedlgg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -4396,26 +2900,12 @@ SOURCE=..\..\src\generic\filepickerg.cpp SOURCE=..\..\src\generic\fontdlgg.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -4424,26 +2914,12 @@ SOURCE=..\..\src\generic\fontdlgg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -4461,32 +2937,22 @@ SOURCE=..\..\src\generic\fontpickerg.cpp # End Source File # Begin Source File +SOURCE=..\..\src\generic\headerctrlg.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\generic\listbkg.cpp # End Source File # Begin Source File SOURCE=..\..\src\generic\listctrl.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -4495,26 +2961,12 @@ SOURCE=..\..\src\generic\listctrl.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -4534,26 +2986,12 @@ SOURCE=..\..\src\generic\logg.cpp SOURCE=..\..\src\generic\mdig.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -4562,26 +3000,12 @@ SOURCE=..\..\src\generic\mdig.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -4597,26 +3021,12 @@ SOURCE=..\..\src\generic\mdig.cpp SOURCE=..\..\src\generic\msgdlgg.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -4625,26 +3035,12 @@ SOURCE=..\..\src\generic\msgdlgg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -4702,126 +3098,43 @@ SOURCE=..\..\src\generic\srchctlg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\statusbr.cpp - -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Debug" - - -!ENDIF - +SOURCE=..\..\src\generic\statbmpg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\tabg.cpp - -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" +SOURCE=..\..\src\generic\stattextg.cpp +# End Source File +# Begin Source File +SOURCE=..\..\src\generic\statusbr.cpp -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" # PROP Exclude_From_Build 1 !ELSEIF "$(CFG)" == "core - Win32 DLL Release" -# PROP Exclude_From_Build 1 !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" - -!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" # PROP Exclude_From_Build 1 !ELSEIF "$(CFG)" == "core - Win32 Release" -# PROP Exclude_From_Build 1 !ELSEIF "$(CFG)" == "core - Win32 Debug" -# PROP Exclude_From_Build 1 !ENDIF @@ -4862,26 +3175,12 @@ SOURCE=..\..\src\generic\vscroll.cpp SOURCE=..\..\src\univ\bmpbuttn.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -4890,26 +3189,12 @@ SOURCE=..\..\src\univ\bmpbuttn.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -4925,26 +3210,12 @@ SOURCE=..\..\src\univ\bmpbuttn.cpp SOURCE=..\..\src\univ\button.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -4953,88 +3224,11 @@ SOURCE=..\..\src\univ\button.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" -!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\src\univ\checkbox.cpp - -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -# PROP Exclude_From_Build 1 !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -5049,28 +3243,14 @@ SOURCE=..\..\src\univ\checkbox.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\checklst.cpp - -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - +SOURCE=..\..\src\univ\checkbox.cpp -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -5079,26 +3259,12 @@ SOURCE=..\..\src\univ\checklst.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -5112,28 +3278,14 @@ SOURCE=..\..\src\univ\checklst.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\choice.cpp - -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - +SOURCE=..\..\src\univ\checklst.cpp -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -5142,26 +3294,12 @@ SOURCE=..\..\src\univ\choice.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -5175,28 +3313,14 @@ SOURCE=..\..\src\univ\choice.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\colschem.cpp - -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - +SOURCE=..\..\src\univ\choice.cpp -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -5205,26 +3329,12 @@ SOURCE=..\..\src\univ\colschem.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -5240,26 +3350,12 @@ SOURCE=..\..\src\univ\colschem.cpp SOURCE=..\..\src\univ\combobox.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -5268,26 +3364,12 @@ SOURCE=..\..\src\univ\combobox.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -5303,26 +3385,12 @@ SOURCE=..\..\src\univ\combobox.cpp SOURCE=..\..\src\univ\control.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -5331,26 +3399,12 @@ SOURCE=..\..\src\univ\control.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -5366,26 +3420,12 @@ SOURCE=..\..\src\univ\control.cpp SOURCE=..\..\src\univ\ctrlrend.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -5394,26 +3434,12 @@ SOURCE=..\..\src\univ\ctrlrend.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -5429,26 +3455,12 @@ SOURCE=..\..\src\univ\ctrlrend.cpp SOURCE=..\..\src\univ\dialog.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -5457,26 +3469,12 @@ SOURCE=..\..\src\univ\dialog.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -5492,26 +3490,12 @@ SOURCE=..\..\src\univ\dialog.cpp SOURCE=..\..\src\univ\framuniv.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -5520,26 +3504,12 @@ SOURCE=..\..\src\univ\framuniv.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -5555,26 +3525,12 @@ SOURCE=..\..\src\univ\framuniv.cpp SOURCE=..\..\src\univ\gauge.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -5583,26 +3539,12 @@ SOURCE=..\..\src\univ\gauge.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -5618,26 +3560,12 @@ SOURCE=..\..\src\univ\gauge.cpp SOURCE=..\..\src\univ\themes\gtk.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -5646,26 +3574,12 @@ SOURCE=..\..\src\univ\themes\gtk.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -5681,26 +3595,12 @@ SOURCE=..\..\src\univ\themes\gtk.cpp SOURCE=..\..\src\univ\inpcons.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -5709,26 +3609,12 @@ SOURCE=..\..\src\univ\inpcons.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -5744,26 +3630,12 @@ SOURCE=..\..\src\univ\inpcons.cpp SOURCE=..\..\src\univ\inphand.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -5772,26 +3644,12 @@ SOURCE=..\..\src\univ\inphand.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -5807,25 +3665,11 @@ SOURCE=..\..\src\univ\inphand.cpp SOURCE=..\..\src\univ\listbox.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -# PROP Exclude_From_Build 1 !ELSEIF "$(CFG)" == "core - Win32 DLL Release" @@ -5835,26 +3679,12 @@ SOURCE=..\..\src\univ\listbox.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -5870,26 +3700,12 @@ SOURCE=..\..\src\univ\listbox.cpp SOURCE=..\..\src\univ\menu.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -5898,26 +3714,12 @@ SOURCE=..\..\src\univ\menu.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -5933,26 +3735,12 @@ SOURCE=..\..\src\univ\menu.cpp SOURCE=..\..\src\univ\themes\metal.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -5961,26 +3749,12 @@ SOURCE=..\..\src\univ\themes\metal.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -5996,26 +3770,12 @@ SOURCE=..\..\src\univ\themes\metal.cpp SOURCE=..\..\src\univ\themes\mono.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -6024,26 +3784,12 @@ SOURCE=..\..\src\univ\themes\mono.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -6059,26 +3805,12 @@ SOURCE=..\..\src\univ\themes\mono.cpp SOURCE=..\..\src\univ\notebook.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -6087,26 +3819,12 @@ SOURCE=..\..\src\univ\notebook.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -6122,26 +3840,12 @@ SOURCE=..\..\src\univ\notebook.cpp SOURCE=..\..\src\univ\radiobox.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -6150,26 +3854,12 @@ SOURCE=..\..\src\univ\radiobox.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -6185,26 +3875,12 @@ SOURCE=..\..\src\univ\radiobox.cpp SOURCE=..\..\src\univ\radiobut.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -6213,26 +3889,12 @@ SOURCE=..\..\src\univ\radiobut.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -6248,26 +3910,12 @@ SOURCE=..\..\src\univ\radiobut.cpp SOURCE=..\..\src\univ\scrarrow.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -6276,26 +3924,12 @@ SOURCE=..\..\src\univ\scrarrow.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -6311,26 +3945,12 @@ SOURCE=..\..\src\univ\scrarrow.cpp SOURCE=..\..\src\univ\scrolbar.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -6339,26 +3959,12 @@ SOURCE=..\..\src\univ\scrolbar.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -6374,54 +3980,61 @@ SOURCE=..\..\src\univ\scrolbar.cpp SOURCE=..\..\src\univ\scrthumb.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Release" +!ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" +!ELSEIF "$(CFG)" == "core - Win32 Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - +!ENDIF -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" +# End Source File +# Begin Source File +SOURCE=..\..\src\univ\settingsuniv.cpp -!ELSEIF "$(CFG)" == "core - Win32 Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" -!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" + + +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" + + !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -6437,26 +4050,12 @@ SOURCE=..\..\src\univ\scrthumb.cpp SOURCE=..\..\src\univ\slider.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -6465,26 +4064,12 @@ SOURCE=..\..\src\univ\slider.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -6500,26 +4085,12 @@ SOURCE=..\..\src\univ\slider.cpp SOURCE=..\..\src\univ\spinbutt.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -6528,26 +4099,12 @@ SOURCE=..\..\src\univ\spinbutt.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -6563,26 +4120,12 @@ SOURCE=..\..\src\univ\spinbutt.cpp SOURCE=..\..\src\univ\statbmp.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -6591,26 +4134,12 @@ SOURCE=..\..\src\univ\statbmp.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -6626,26 +4155,12 @@ SOURCE=..\..\src\univ\statbmp.cpp SOURCE=..\..\src\univ\statbox.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -6654,26 +4169,12 @@ SOURCE=..\..\src\univ\statbox.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -6689,26 +4190,12 @@ SOURCE=..\..\src\univ\statbox.cpp SOURCE=..\..\src\univ\statline.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -6717,26 +4204,12 @@ SOURCE=..\..\src\univ\statline.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -6752,26 +4225,12 @@ SOURCE=..\..\src\univ\statline.cpp SOURCE=..\..\src\univ\stattext.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -6780,26 +4239,12 @@ SOURCE=..\..\src\univ\stattext.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -6815,26 +4260,12 @@ SOURCE=..\..\src\univ\stattext.cpp SOURCE=..\..\src\univ\statusbr.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -6843,26 +4274,12 @@ SOURCE=..\..\src\univ\statusbr.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -6878,26 +4295,12 @@ SOURCE=..\..\src\univ\statusbr.cpp SOURCE=..\..\src\univ\stdrend.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -6906,26 +4309,12 @@ SOURCE=..\..\src\univ\stdrend.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -6941,26 +4330,12 @@ SOURCE=..\..\src\univ\stdrend.cpp SOURCE=..\..\src\univ\textctrl.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -6969,26 +4344,12 @@ SOURCE=..\..\src\univ\textctrl.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -7004,26 +4365,12 @@ SOURCE=..\..\src\univ\textctrl.cpp SOURCE=..\..\src\univ\tglbtn.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -7032,26 +4379,12 @@ SOURCE=..\..\src\univ\tglbtn.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -7067,26 +4400,12 @@ SOURCE=..\..\src\univ\tglbtn.cpp SOURCE=..\..\src\univ\theme.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -7095,26 +4414,12 @@ SOURCE=..\..\src\univ\theme.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -7130,26 +4435,12 @@ SOURCE=..\..\src\univ\theme.cpp SOURCE=..\..\src\univ\toolbar.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -7158,26 +4449,12 @@ SOURCE=..\..\src\univ\toolbar.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -7193,26 +4470,12 @@ SOURCE=..\..\src\univ\toolbar.cpp SOURCE=..\..\src\univ\topluniv.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -7221,26 +4484,12 @@ SOURCE=..\..\src\univ\topluniv.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -7256,26 +4505,12 @@ SOURCE=..\..\src\univ\topluniv.cpp SOURCE=..\..\src\univ\themes\win32.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -7284,26 +4519,12 @@ SOURCE=..\..\src\univ\themes\win32.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -7319,26 +4540,12 @@ SOURCE=..\..\src\univ\themes\win32.cpp SOURCE=..\..\src\univ\winuniv.cpp -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # PROP Exclude_From_Build 1 @@ -7347,26 +4554,12 @@ SOURCE=..\..\src\univ\winuniv.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "core - Win32 Release" # PROP Exclude_From_Build 1 @@ -7384,21 +4577,9 @@ SOURCE=..\..\src\univ\winuniv.cpp # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\include\wx\msw\setup.h - -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# Begin Custom Build - - -# End Custom Build - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# Begin Custom Build - - -# End Custom Build +SOURCE=..\..\include\wx\msw\setup.h -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # Begin Custom Build - @@ -7410,7 +4591,7 @@ SOURCE=..\..\include\wx\msw\setup.h # End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h InputPath=..\..\include\wx\msw\setup.h @@ -7420,7 +4601,7 @@ InputPath=..\..\include\wx\msw\setup.h # End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h InputPath=..\..\include\wx\msw\setup.h @@ -7430,38 +4611,6 @@ InputPath=..\..\include\wx\msw\setup.h # End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 DLL Release" - -# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h -InputPath=..\..\include\wx\msw\setup.h - -"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" - -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h -InputPath=..\..\include\wx\msw\setup.h - -"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# Begin Custom Build - - -# End Custom Build - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# Begin Custom Build - - -# End Custom Build - !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # Begin Custom Build - @@ -7474,7 +4623,7 @@ InputPath=..\..\include\wx\msw\setup.h # End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" +!ELSEIF "$(CFG)" == "core - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h InputPath=..\..\include\wx\msw\setup.h @@ -7484,7 +4633,7 @@ InputPath=..\..\include\wx\msw\setup.h # End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h InputPath=..\..\include\wx\msw\setup.h @@ -7494,26 +4643,6 @@ InputPath=..\..\include\wx\msw\setup.h # End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 Release" - -# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h -InputPath=..\..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "core - Win32 Debug" - -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h -InputPath=..\..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h - -# End Custom Build - !ENDIF # End Source File @@ -7521,7 +4650,7 @@ InputPath=..\..\include\wx\msw\setup.h SOURCE=..\..\include\wx\univ\setup.h -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h InputPath=..\..\include\wx\univ\setup.h @@ -7531,7 +4660,7 @@ InputPath=..\..\include\wx\univ\setup.h # End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h InputPath=..\..\include\wx\univ\setup.h @@ -7541,38 +4670,6 @@ InputPath=..\..\include\wx\univ\setup.h # End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" - -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\..\include\wx\univ\setup.h - -"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" - -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\..\include\wx\univ\setup.h - -"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - -# Begin Custom Build - - -# End Custom Build - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - -# Begin Custom Build - - -# End Custom Build - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # Begin Custom Build - @@ -7585,7 +4682,7 @@ InputPath=..\..\include\wx\univ\setup.h # End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h InputPath=..\..\include\wx\univ\setup.h @@ -7595,7 +4692,7 @@ InputPath=..\..\include\wx\univ\setup.h # End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h InputPath=..\..\include\wx\univ\setup.h @@ -7605,38 +4702,6 @@ InputPath=..\..\include\wx\univ\setup.h # End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 Universal Release" - -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\..\include\wx\univ\setup.h - -"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" - -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\..\include\wx\univ\setup.h - -"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - -# Begin Custom Build - - -# End Custom Build - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# Begin Custom Build - - -# End Custom Build - !ELSEIF "$(CFG)" == "core - Win32 Release" # Begin Custom Build - @@ -7686,6 +4751,10 @@ SOURCE=..\..\include\wx\msw\bmpbuttn.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\bmpcbox.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\brush.h # End Source File # Begin Source File @@ -7694,6 +4763,10 @@ SOURCE=..\..\include\wx\msw\button.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\calctrl.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\caret.h # End Source File # Begin Source File @@ -7754,6 +4827,10 @@ SOURCE=..\..\include\wx\msw\ole\dataobj2.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\datecontrols.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\datectrl.h # End Source File # Begin Source File @@ -7830,7 +4907,7 @@ SOURCE=..\..\include\wx\msw\frame.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\gauge95.h +SOURCE=..\..\include\wx\msw\gauge.h # End Source File # Begin Source File @@ -7840,7 +4917,7 @@ SOURCE=..\..\include\wx\msw\gdiimage.h SOURCE=..\..\include\wx\msw\genrcdefs.h -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h InputPath=..\..\include\wx\msw\genrcdefs.h @@ -7850,7 +4927,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h # End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h InputPath=..\..\include\wx\msw\genrcdefs.h @@ -7860,27 +4937,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h # End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" - -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h -InputPath=..\..\include\wx\msw\genrcdefs.h - -"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw" - cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" - -# End Custom Build - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" - -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h -InputPath=..\..\include\wx\msw\genrcdefs.h - -"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw" - cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" - -# End Custom Build - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h InputPath=..\..\include\wx\msw\genrcdefs.h @@ -7890,7 +4947,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h # End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h InputPath=..\..\include\wx\msw\genrcdefs.h @@ -7900,27 +4957,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h # End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 DLL Release" - -# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h -InputPath=..\..\include\wx\msw\genrcdefs.h - -"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw" - cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" - -# End Custom Build - -!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" - -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h -InputPath=..\..\include\wx\msw\genrcdefs.h - -"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw" - cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" - -# End Custom Build - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h InputPath=..\..\include\wx\msw\genrcdefs.h @@ -7930,7 +4967,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h # End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h InputPath=..\..\include\wx\msw\genrcdefs.h @@ -7940,27 +4977,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h # End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 Universal Release" - -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h -InputPath=..\..\include\wx\msw\genrcdefs.h - -"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw" - cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" - -# End Custom Build - -!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" - -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h -InputPath=..\..\include\wx\msw\genrcdefs.h - -"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw" - cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" - -# End Custom Build - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" +!ELSEIF "$(CFG)" == "core - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h InputPath=..\..\include\wx\msw\genrcdefs.h @@ -7970,7 +4987,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h # End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h InputPath=..\..\include\wx\msw\genrcdefs.h @@ -7980,26 +4997,6 @@ InputPath=..\..\include\wx\msw\genrcdefs.h # End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 Release" - -# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h -InputPath=..\..\include\wx\msw\genrcdefs.h - -"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw" - cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" - -# End Custom Build - -!ELSEIF "$(CFG)" == "core - Win32 Debug" - -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h -InputPath=..\..\include\wx\msw\genrcdefs.h - -"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw" - cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" - -# End Custom Build - !ENDIF # End Source File @@ -8009,6 +5006,10 @@ SOURCE=..\..\include\wx\msw\glcanvas.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\headerctrl.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\helpbest.h # End Source File # Begin Source File @@ -8085,6 +5086,10 @@ SOURCE=..\..\include\wx\msw\notebook.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\notifmsg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\ole\oleutils.h # End Source File # Begin Source File @@ -8133,7 +5138,7 @@ SOURCE=..\..\include\wx\msw\setup0.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\slider95.h +SOURCE=..\..\include\wx\msw\slider.h # End Source File # Begin Source File @@ -8157,10 +5162,6 @@ SOURCE=..\..\include\wx\msw\statbox.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\statbr95.h -# End Source File -# Begin Source File - SOURCE=..\..\include\wx\msw\statline.h # End Source File # Begin Source File @@ -8169,7 +5170,7 @@ SOURCE=..\..\include\wx\msw\stattext.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\tabctrl.h +SOURCE=..\..\include\wx\msw\statusbar.h # End Source File # Begin Source File @@ -8177,11 +5178,11 @@ SOURCE=..\..\include\wx\msw\taskbar.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\tbar95.h +SOURCE=..\..\include\wx\msw\textctrl.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\textctrl.h +SOURCE=..\..\include\wx\msw\textentry.h # End Source File # Begin Source File @@ -8189,6 +5190,10 @@ SOURCE=..\..\include\wx\msw\tglbtn.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\toolbar.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\tooltip.h # End Source File # Begin Source File @@ -8245,7 +5250,7 @@ SOURCE=..\..\include\wx\generic\buttonbar.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\calctrl.h +SOURCE=..\..\include\wx\generic\calctrlg.h # End Source File # Begin Source File @@ -8329,10 +5334,18 @@ SOURCE=..\..\include\wx\generic\gridctrl.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\generic\grideditors.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\generic\gridsel.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\generic\headerctrlg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\generic\helpext.h # End Source File # Begin Source File @@ -8365,6 +5378,10 @@ SOURCE=..\..\include\wx\generic\notebook.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\generic\notifmsg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\generic\numdlgg.h # End Source File # Begin Source File @@ -8413,11 +5430,15 @@ SOURCE=..\..\include\wx\generic\srchctlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\statusbr.h +SOURCE=..\..\include\wx\generic\statbmpg.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\generic\stattextg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\tabg.h +SOURCE=..\..\include\wx\generic\statusbr.h # End Source File # Begin Source File @@ -8677,6 +5698,10 @@ SOURCE=..\..\include\wx\access.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\propgrid\advprops.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\anidecod.h # End Source File # Begin Source File @@ -8697,6 +5722,10 @@ SOURCE=..\..\include\wx\aui\aui.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\aui\auibar.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\aui\auibook.h # End Source File # Begin Source File @@ -8829,10 +5858,6 @@ SOURCE=..\..\include\wx\dateevt.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\dbgrid.h -# End Source File -# Begin Source File - SOURCE=..\..\include\wx\dc.h # End Source File # Begin Source File @@ -8925,6 +5950,10 @@ SOURCE=..\..\include\wx\editlbox.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\propgrid\editors.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\effects.h # End Source File # Begin Source File @@ -9025,6 +6054,14 @@ SOURCE=..\..\include\wx\grid.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\headercol.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\headerctrl.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\help.h # End Source File # Begin Source File @@ -9133,6 +6170,10 @@ SOURCE=..\..\include\wx\listctrl.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\propgrid\manager.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\matrix.h # End Source File # Begin Source File @@ -9165,6 +6206,10 @@ SOURCE=..\..\include\wx\msgdlg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\nativewin.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\nonownedwnd.h # End Source File # Begin Source File @@ -9173,6 +6218,10 @@ SOURCE=..\..\include\wx\notebook.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\notifmsg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\numdlg.h # End Source File # Begin Source File @@ -9237,7 +6286,27 @@ SOURCE=..\..\include\wx\propdlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\ptr_scpd.h +SOURCE=..\..\include\wx\propgrid\property.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\propgrid\propgrid.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\propgrid\propgriddefs.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\propgrid\propgridiface.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\propgrid\propgridpagestate.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\propgrid\props.h # End Source File # Begin Source File @@ -9257,6 +6326,10 @@ SOURCE=..\..\include\wx\rawbmp.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\rearrangectrl.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\region.h # End Source File # Begin Source File @@ -9381,14 +6454,6 @@ SOURCE=..\..\include\wx\stc\stc.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\tab.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\wx\tabctrl.h -# End Source File -# Begin Source File - SOURCE=..\..\include\wx\aui\tabmdi.h # End Source File # Begin Source File @@ -9409,6 +6474,10 @@ SOURCE=..\..\include\wx\textdlg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\textentry.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\tglbtn.h # End Source File # Begin Source File @@ -9481,10 +6550,18 @@ SOURCE=..\..\include\wx\window.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\windowid.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\wizard.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\wrapsizer.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\wupdlock.h # End Source File # Begin Source File @@ -9549,6 +6626,10 @@ SOURCE=..\..\include\wx\xrc\xh_combo.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\xrc\xh_comboctrl.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\xrc\xh_datectrl.h # End Source File # Begin Source File