X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/541ea80f0ec8a1250981bfaa3452f370e5c42c3b..b9acd101f74b63940c7c32d7885a53c58faeb7e0:/build/msw/wx_core.dsp diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 4e06795120..c984f1a51d 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\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" /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\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 +# 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\wxmswuniv292u_core_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /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\wxmswuniv292u_core_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /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 "NDEBUG" /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 "NDEBUG" /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 "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_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 "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_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 ..\..\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 ..\..\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\wxmswuniv292u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_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\wxmswuniv292u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_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\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 /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\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\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 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 ..\..\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 ..\..\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\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 "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\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 "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\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__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290_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 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\wxmswuniv292ud_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 "_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\wxmswuniv292ud_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 "_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 "_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 "_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 "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_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 "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_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 ..\..\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 ..\..\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\wxmswuniv292ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_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\wxmswuniv292ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_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\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 "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\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 "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\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__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290d_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 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 ..\..\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 ..\..\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\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" /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\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 +# 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\wxmsw292u_core_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /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\wxmsw292u_core_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /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 "NDEBUG" /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_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 "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_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 ..\..\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 ..\..\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\wxmsw292u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_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\wxmsw292u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_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\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 /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\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\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 +# 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\wxmsw292ud_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 "_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\wxmsw292ud_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 "_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 "_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 "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_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 "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_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 ..\..\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 ..\..\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\wxmsw292ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_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\wxmsw292ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_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\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 "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\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 "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\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__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290_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 ..\..\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 ..\..\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\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 "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\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 "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\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__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290d_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 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 ..\..\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 ..\..\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\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 /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 CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_core.pdb /opt:ref /opt:icf /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 "NDEBUG" /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 /opt:ref /opt:icf /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 "NDEBUG" /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\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 /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\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 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 "_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 "_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\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 "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\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 "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\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 "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\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 "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\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 /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 CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /opt:ref /opt:icf /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 "NDEBUG" /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 /opt:ref /opt:icf /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 "NDEBUG" /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\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 /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\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 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 "_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 "_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\libtiff" /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\libtiff" /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\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 "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\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 "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" @@ -476,6 +268,10 @@ SOURCE=..\..\src\common\artstd.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\arttango.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\bmpbase.cpp # End Source File # Begin Source File @@ -606,6 +402,10 @@ SOURCE=..\..\src\common\filectrlcmn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\filehistorycmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\filepickercmn.cpp # End Source File # Begin Source File @@ -666,6 +466,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 @@ -746,6 +554,10 @@ SOURCE=..\..\src\common\menucmn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\mousemanager.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\msgout.cpp # End Source File # Begin Source File @@ -758,10 +570,18 @@ SOURCE=..\..\src\common\overlaycmn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\ownerdrwcmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\paper.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\persist.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\pickerbase.cpp # End Source File # Begin Source File @@ -782,6 +602,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 +622,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 @@ -834,6 +662,10 @@ SOURCE=..\..\src\common\treebase.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\uiactioncmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\utilscmn.cpp # End Source File # Begin Source File @@ -854,6 +686,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 @@ -864,15 +704,7 @@ SOURCE=..\..\src\common\xpmdecod.cpp SOURCE=..\..\src\msw\accel.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 @@ -880,26 +712,12 @@ SOURCE=..\..\src\msw\accel.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 @@ -908,12 +726,6 @@ SOURCE=..\..\src\msw\accel.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -927,55 +739,70 @@ SOURCE=..\..\src\msw\accel.cpp SOURCE=..\..\src\msw\ole\access.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 Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" +!ENDIF -!ELSEIF "$(CFG)" == "core - Win32 DLL Release" +# End Source File +# Begin Source File +SOURCE=..\..\src\msw\ole\activex.cpp +# 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" @@ -988,10 +815,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 @@ -1002,15 +825,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 @@ -1018,26 +833,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 @@ -1046,12 +847,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" @@ -1069,15 +864,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 @@ -1085,26 +872,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 @@ -1113,13 +886,7 @@ 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" +!ELSEIF "$(CFG)" == "core - Win32 Release" !ELSEIF "$(CFG)" == "core - Win32 Debug" @@ -1136,15 +903,7 @@ SOURCE=..\..\src\msw\caret.cpp SOURCE=..\..\src\msw\checkbox.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 @@ -1152,26 +911,12 @@ SOURCE=..\..\src\msw\checkbox.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 @@ -1180,12 +925,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" @@ -1199,15 +938,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 @@ -1215,26 +946,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 @@ -1243,12 +960,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" @@ -1262,15 +973,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 @@ -1278,26 +981,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 @@ -1306,12 +995,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" @@ -1329,15 +1012,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 @@ -1345,26 +1020,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 @@ -1373,12 +1034,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" @@ -1396,15 +1051,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 @@ -1412,26 +1059,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 @@ -1440,12 +1073,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" @@ -1459,15 +1086,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 @@ -1475,26 +1094,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 @@ -1503,12 +1108,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" @@ -1522,15 +1121,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 @@ -1538,26 +1129,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 @@ -1566,12 +1143,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" @@ -1617,15 +1188,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 @@ -1633,26 +1196,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 @@ -1661,12 +1210,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" @@ -1688,15 +1231,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 @@ -1704,26 +1239,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 @@ -1732,12 +1253,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" @@ -1755,15 +1270,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 @@ -1771,26 +1278,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 @@ -1799,12 +1292,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" @@ -1834,15 +1321,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 @@ -1850,26 +1329,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 @@ -1878,12 +1343,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" @@ -1897,15 +1356,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 @@ -1913,26 +1364,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 @@ -1941,12 +1378,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" @@ -1964,15 +1395,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 @@ -1980,27 +1403,13 @@ 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" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Release" +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" # PROP Exclude_From_Build 1 @@ -2008,12 +1417,6 @@ SOURCE=..\..\src\msw\fontdlg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -2035,15 +1438,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 @@ -2051,26 +1446,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 @@ -2079,12 +1460,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" @@ -2096,17 +1471,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 @@ -2114,26 +1481,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 @@ -2142,12 +1495,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" @@ -2175,7 +1522,38 @@ SOURCE=..\..\src\msw\graphics.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\gsockmsw.cpp +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 @@ -2197,15 +1575,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 @@ -2213,26 +1583,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 @@ -2241,12 +1597,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" @@ -2260,15 +1610,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 @@ -2276,26 +1618,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 @@ -2304,12 +1632,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" @@ -2323,15 +1645,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 @@ -2339,26 +1653,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 @@ -2367,12 +1667,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" @@ -2390,15 +1684,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 @@ -2406,26 +1692,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 @@ -2434,12 +1706,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" @@ -2453,15 +1719,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 @@ -2469,26 +1727,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 @@ -2497,12 +1741,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" @@ -2516,15 +1754,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 @@ -2532,26 +1762,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 @@ -2560,12 +1776,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" @@ -2579,15 +1789,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 @@ -2595,26 +1797,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 @@ -2623,12 +1811,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" @@ -2646,15 +1828,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 @@ -2662,26 +1836,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 @@ -2690,12 +1850,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" @@ -2713,15 +1867,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 @@ -2729,41 +1875,21 @@ 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" +!ELSEIF "$(CFG)" == "core - Win32 Release" !ELSEIF "$(CFG)" == "core - Win32 Debug" @@ -2774,57 +1900,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 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\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" @@ -2843,15 +1976,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 @@ -2859,26 +1984,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 @@ -2887,12 +1998,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" @@ -2924,57 +2029,64 @@ SOURCE=..\..\src\msw\printwin.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\radiobox.cpp +SOURCE=..\..\src\msw\progdlg.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\radiobox.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" @@ -2989,15 +2101,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 @@ -3005,26 +2109,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 @@ -3033,12 +2123,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" @@ -3058,57 +2142,64 @@ SOURCE=..\..\src\msw\renderer.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\scrolbar.cpp +SOURCE=..\..\src\msw\richmsgdlg.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 Debug" -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal 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\scrolbar.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" @@ -3125,17 +2216,9 @@ SOURCE=..\..\src\msw\settings.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\slider95.cpp +SOURCE=..\..\src\msw\slider.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 @@ -3143,26 +2226,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 @@ -3171,12 +2240,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" @@ -3190,15 +2253,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 @@ -3206,26 +2261,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 @@ -3234,12 +2275,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" @@ -3253,15 +2288,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 @@ -3269,26 +2296,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 @@ -3297,12 +2310,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" @@ -3316,15 +2323,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 @@ -3332,26 +2331,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 @@ -3360,12 +2345,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" @@ -3379,55 +2358,62 @@ SOURCE=..\..\src\msw\statbmp.cpp SOURCE=..\..\src\msw\statbox.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\statline.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" @@ -3440,44 +2426,22 @@ SOURCE=..\..\src\msw\statbox.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\statbr95.cpp +SOURCE=..\..\src\msw\stattext.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 @@ -3486,12 +2450,6 @@ SOURCE=..\..\src\msw\statbr95.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -3503,17 +2461,9 @@ SOURCE=..\..\src\msw\statbr95.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\statline.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\statusbar.cpp -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -3521,26 +2471,12 @@ SOURCE=..\..\src\msw\statline.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 @@ -3549,12 +2485,6 @@ SOURCE=..\..\src\msw\statline.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -3566,17 +2496,9 @@ SOURCE=..\..\src\msw\statline.cpp # 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 +SOURCE=..\..\src\msw\textctrl.cpp -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -3584,26 +2506,12 @@ SOURCE=..\..\src\msw\stattext.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 @@ -3612,12 +2520,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" @@ -3629,17 +2531,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\textentry.cpp -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -3647,26 +2541,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 @@ -3675,12 +2555,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" @@ -3692,17 +2566,9 @@ SOURCE=..\..\src\msw\tabctrl.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\tbar95.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 @@ -3710,26 +2576,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 @@ -3738,12 +2590,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" @@ -3755,17 +2601,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\toolbar.cpp -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -3773,26 +2611,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 @@ -3801,12 +2625,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" @@ -3818,17 +2636,17 @@ SOURCE=..\..\src\msw\textctrl.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\textentry.cpp - -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 +SOURCE=..\..\src\msw\tooltip.cpp +# End Source File +# Begin Source File -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" +SOURCE=..\..\src\msw\toplevel.cpp +# End Source File +# Begin Source File -# PROP Exclude_From_Build 1 +SOURCE=..\..\src\msw\treectrl.cpp -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -3836,26 +2654,12 @@ SOURCE=..\..\src\msw\textentry.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 @@ -3864,12 +2668,6 @@ SOURCE=..\..\src\msw\textentry.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -3881,17 +2679,9 @@ SOURCE=..\..\src\msw\textentry.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\uiaction.cpp -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # PROP Exclude_From_Build 1 @@ -3899,26 +2689,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 @@ -3927,12 +2703,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" @@ -3944,37 +2714,25 @@ SOURCE=..\..\src\msw\tglbtn.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\tooltip.cpp +SOURCE=..\..\src\msw\utilsgui.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\toplevel.cpp +SOURCE=..\..\src\msw\ole\uuid.cpp # End Source File # Begin Source File -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" +SOURCE=..\..\src\msw\uxtheme.cpp +# End Source File +# Begin Source File -# PROP Exclude_From_Build 1 +SOURCE=..\..\src\msw\version.rc -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!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 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - !ELSEIF "$(CFG)" == "core - Win32 DLL Release" @@ -3982,14 +2740,6 @@ SOURCE=..\..\src\msw\treectrl.cpp !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,84 +2748,52 @@ 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" +# PROP Exclude_From_Build 1 !ELSEIF "$(CFG)" == "core - Win32 Debug" +# PROP Exclude_From_Build 1 !ENDIF # End Source File # Begin Source File -SOURCE=..\..\src\msw\utilsgui.cpp +SOURCE=..\..\src\msw\volume.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\ole\uuid.cpp +SOURCE=..\..\src\msw\window.cpp # End Source File -# Begin Source File +# End Group +# Begin Group "Generic Sources" -SOURCE=..\..\src\msw\uxtheme.cpp -# End Source File +# PROP Default_Filter "" # Begin Source File -SOURCE=..\..\src\msw\version.rc - -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - +SOURCE=..\..\src\generic\accel.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" - - -!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" +!ELSEIF "$(CFG)" == "core - Win32 DLL 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" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - -# PROP Exclude_From_Build 1 !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -4090,159 +2808,21 @@ SOURCE=..\..\src\msw\version.rc # End Source File # Begin Source File -SOURCE=..\..\src\msw\volume.cpp +SOURCE=..\..\src\generic\busyinfo.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\window.cpp +SOURCE=..\..\src\generic\buttonbar.cpp # End Source File -# End Group -# Begin Group "Generic Sources" - -# PROP Default_Filter "" # Begin Source File -SOURCE=..\..\src\generic\accel.cpp - -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" +SOURCE=..\..\src\generic\choicbkg.cpp +# End Source File +# Begin Source File - -!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" - -# 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\generic\animateg.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" - -# 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\generic\busyinfo.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\generic\buttonbar.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\generic\choicbkg.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\generic\choicdgg.cpp -# End Source File -# Begin Source File +SOURCE=..\..\src\generic\choicdgg.cpp +# End Source File +# Begin Source File SOURCE=..\..\src\generic\clrpickerg.cpp # End Source File @@ -4254,26 +2834,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 @@ -4282,26 +2848,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 @@ -4329,26 +2881,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 @@ -4357,26 +2895,12 @@ 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" - -# 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 +2920,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 @@ -4424,26 +2934,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 @@ -4463,26 +2959,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 @@ -4491,26 +2973,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 @@ -4530,26 +2998,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 @@ -4558,26 +3012,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 @@ -4595,332 +3035,69 @@ SOURCE=..\..\src\generic\fontpickerg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\listbkg.cpp +SOURCE=..\..\src\generic\graphicc.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" - - -!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" - -# 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\generic\logg.cpp +SOURCE=..\..\src\generic\headerctrlg.cpp # End Source File # Begin Source File -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" - - -!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" - -# 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 - +SOURCE=..\..\src\generic\infobar.cpp # End Source File # Begin Source File -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" - - -!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" - -# 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\generic\numdlgg.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\generic\panelg.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\generic\printps.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\generic\prntdlgg.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\generic\progdlgg.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\generic\renderg.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\generic\scrlwing.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\generic\selstore.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\generic\spinctlg.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\generic\splitter.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\generic\srchctlg.cpp +SOURCE=..\..\src\generic\listbkg.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 +SOURCE=..\..\src\generic\listctrl.cpp -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!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 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" +!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" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" !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\generic\tabg.cpp - -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" +SOURCE=..\..\src\generic\logg.cpp +# End Source File +# Begin Source File +SOURCE=..\..\src\generic\mdig.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 @@ -4929,26 +3106,12 @@ SOURCE=..\..\src\generic\tabg.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 @@ -4962,122 +3125,140 @@ SOURCE=..\..\src\generic\tabg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\textdlgg.cpp +SOURCE=..\..\src\generic\msgdlgg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\tipwin.cpp +SOURCE=..\..\src\generic\numdlgg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\toolbkg.cpp +SOURCE=..\..\src\generic\panelg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\treebkg.cpp +SOURCE=..\..\src\generic\printps.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\treectlg.cpp +SOURCE=..\..\src\generic\prntdlgg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\vlbox.cpp +SOURCE=..\..\src\generic\progdlgg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\vscroll.cpp +SOURCE=..\..\src\generic\renderg.cpp # End Source File -# End Group -# Begin Group "wxUniv Sources" - -# PROP Default_Filter "" # Begin Source File -SOURCE=..\..\src\univ\bmpbuttn.cpp +SOURCE=..\..\src\generic\richmsgdlgg.cpp +# End Source File +# Begin Source File -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" +SOURCE=..\..\src\generic\scrlwing.cpp +# End Source File +# Begin Source File +SOURCE=..\..\src\generic\selstore.cpp +# End Source File +# Begin Source File -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" +SOURCE=..\..\src\generic\spinctlg.cpp +# End Source File +# Begin Source File +SOURCE=..\..\src\generic\splitter.cpp +# End Source File +# Begin Source File -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +SOURCE=..\..\src\generic\srchctlg.cpp +# End Source File +# Begin Source File +SOURCE=..\..\src\generic\statbmpg.cpp +# End Source File +# Begin Source File -!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 # End Source File # Begin Source File -SOURCE=..\..\src\univ\button.cpp +SOURCE=..\..\src\generic\textdlgg.cpp +# End Source File +# Begin Source File -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" +SOURCE=..\..\src\generic\tipwin.cpp +# End Source File +# Begin Source File +SOURCE=..\..\src\generic\toolbkg.cpp +# End Source File +# Begin Source File -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" +SOURCE=..\..\src\generic\treebkg.cpp +# End Source File +# Begin Source File +SOURCE=..\..\src\generic\treectlg.cpp +# End Source File +# Begin Source File -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +SOURCE=..\..\src\generic\vlbox.cpp +# End Source File +# Begin Source File +SOURCE=..\..\src\generic\vscroll.cpp +# End Source File +# End Group +# Begin Group "wxUniv Sources" -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" +# PROP Default_Filter "" +# Begin Source File +SOURCE=..\..\src\univ\bmpbuttn.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" @@ -5087,26 +3268,12 @@ 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 @@ -5120,28 +3287,14 @@ SOURCE=..\..\src\univ\button.cpp # 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" - +SOURCE=..\..\src\univ\button.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 @@ -5150,26 +3303,12 @@ SOURCE=..\..\src\univ\checkbox.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 @@ -5183,28 +3322,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 @@ -5213,26 +3338,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 @@ -5246,28 +3357,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 @@ -5276,26 +3373,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 @@ -5309,28 +3392,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 @@ -5339,26 +3408,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 @@ -5374,26 +3429,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 @@ -5402,26 +3443,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 @@ -5437,26 +3464,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 @@ -5465,25 +3478,11 @@ 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" +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -# PROP Exclude_From_Build 1 !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -5500,26 +3499,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 @@ -5528,26 +3513,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 @@ -5563,26 +3534,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 @@ -5591,26 +3548,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 @@ -5626,26 +3569,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 @@ -5654,26 +3583,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 @@ -5689,26 +3604,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 @@ -5717,26 +3618,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 @@ -5752,26 +3639,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 @@ -5780,26 +3653,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 @@ -5815,26 +3674,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 @@ -5843,26 +3688,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 @@ -5878,26 +3709,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 @@ -5906,26 +3723,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 @@ -5941,26 +3744,12 @@ 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" +!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 @@ -5969,26 +3758,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 @@ -6004,26 +3779,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 @@ -6032,26 +3793,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 @@ -6067,26 +3814,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 @@ -6095,26 +3828,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 @@ -6130,26 +3849,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 @@ -6158,26 +3863,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 @@ -6193,26 +3884,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 @@ -6221,26 +3898,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 @@ -6256,26 +3919,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 @@ -6284,26 +3933,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 @@ -6319,26 +3954,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 @@ -6347,26 +3968,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 @@ -6382,26 +3989,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 @@ -6410,26 +4003,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 @@ -6445,26 +4024,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 @@ -6473,26 +4038,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 @@ -6508,54 +4059,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 @@ -6571,26 +4129,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 @@ -6599,26 +4143,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 @@ -6634,26 +4164,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 @@ -6662,26 +4178,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 @@ -6697,26 +4199,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 @@ -6725,26 +4213,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 @@ -6760,26 +4234,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 @@ -6788,26 +4248,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 @@ -6823,26 +4269,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 @@ -6851,26 +4283,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 @@ -6886,26 +4304,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 @@ -6914,26 +4318,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 @@ -6949,26 +4339,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 @@ -6977,26 +4353,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 @@ -7012,53 +4374,25 @@ 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 !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" - +# 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" @@ -7075,26 +4409,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 @@ -7103,26 +4423,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 @@ -7138,26 +4444,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 @@ -7166,26 +4458,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 @@ -7201,26 +4479,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 @@ -7229,26 +4493,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 @@ -7264,26 +4514,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 @@ -7292,26 +4528,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 @@ -7327,26 +4549,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 @@ -7355,26 +4563,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 @@ -7390,26 +4584,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 @@ -7418,26 +4598,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 @@ -7453,26 +4619,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 @@ -7481,26 +4633,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 @@ -7520,19 +4658,7 @@ SOURCE=..\..\src\univ\winuniv.cpp 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 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" +!IF "$(CFG)" == "core - Win32 DLL Universal Release" # Begin Custom Build - @@ -7544,7 +4670,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 @@ -7554,7 +4680,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 @@ -7564,38 +4690,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 - @@ -7608,7 +4702,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 @@ -7618,7 +4712,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 @@ -7628,26 +4722,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 @@ -7655,7 +4729,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 @@ -7665,7 +4739,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 @@ -7675,38 +4749,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 - @@ -7719,7 +4761,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 @@ -7729,7 +4771,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 @@ -7739,38 +4781,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 - @@ -7820,6 +4830,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 @@ -7828,6 +4842,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 @@ -7864,6 +4882,10 @@ SOURCE=..\..\include\wx\msw\combobox.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\commandlinkbutton.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\control.h # End Source File # Begin Source File @@ -7964,7 +4986,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 @@ -7974,7 +4996,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 @@ -7984,7 +5006,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 @@ -7994,27 +5016,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 @@ -8024,7 +5026,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 @@ -8034,27 +5036,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 @@ -8064,7 +5046,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 @@ -8074,27 +5056,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 @@ -8104,7 +5066,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 @@ -8114,26 +5076,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 @@ -8143,6 +5085,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 @@ -8159,6 +5105,10 @@ SOURCE=..\..\include\wx\msw\htmlhelp.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\hyperlink.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\icon.h # End Source File # Begin Source File @@ -8219,10 +5169,18 @@ 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 +SOURCE=..\..\include\wx\msw\ownerdrw.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\palette.h # End Source File # Begin Source File @@ -8243,6 +5201,10 @@ SOURCE=..\..\include\wx\msw\printwin.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\progdlg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\radiobox.h # End Source File # Begin Source File @@ -8259,6 +5221,10 @@ SOURCE=..\..\include\wx\msw\region.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\richmsgdlg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\scrolbar.h # End Source File # Begin Source File @@ -8267,7 +5233,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 @@ -8291,10 +5257,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 @@ -8303,7 +5265,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 @@ -8311,10 +5273,6 @@ SOURCE=..\..\include\wx\msw\taskbar.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\tbar95.h -# End Source File -# Begin Source File - SOURCE=..\..\include\wx\msw\textctrl.h # End Source File # Begin Source File @@ -8327,6 +5285,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 @@ -8383,7 +5345,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 @@ -8435,6 +5397,14 @@ SOURCE=..\..\include\wx\generic\dragimgg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\generic\dvrenderer.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\generic\dvrenderers.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\generic\fdrepdlg.h # End Source File # Begin Source File @@ -8467,10 +5437,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 @@ -8479,6 +5457,10 @@ SOURCE=..\..\include\wx\generic\hyperlink.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\generic\infobar.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\generic\laywin.h # End Source File # Begin Source File @@ -8503,6 +5485,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 @@ -8527,6 +5513,10 @@ SOURCE=..\..\include\wx\generic\propdlg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\generic\richmsgdlgg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\generic\sashwin.h # End Source File # Begin Source File @@ -8551,11 +5541,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 @@ -8795,6 +5789,10 @@ SOURCE=..\..\include\wx\html\m_templ.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\html\styleparams.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\html\winpars.h # End Source File # End Group @@ -8815,6 +5813,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 @@ -8827,6 +5829,14 @@ SOURCE=..\..\include\wx\animdecod.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\ribbon\art.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\ribbon\art_internal.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\artprov.h # End Source File # Begin Source File @@ -8835,10 +5845,18 @@ 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 +SOURCE=..\..\include\wx\ribbon\bar.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\bitmap.h # End Source File # Begin Source File @@ -8851,6 +5869,10 @@ SOURCE=..\..\include\wx\bmpcbox.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\persist\bookctrl.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\bookctrl.h # End Source File # Begin Source File @@ -8867,6 +5889,10 @@ SOURCE=..\..\include\wx\button.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\ribbon\buttonbar.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\cairo.h # End Source File # Begin Source File @@ -8935,10 +5961,18 @@ SOURCE=..\..\include\wx\combobox.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\commandlinkbutton.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\control.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\ribbon\control.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\cshelp.h # End Source File # Begin Source File @@ -9055,10 +6089,18 @@ SOURCE=..\..\include\wx\dragimag.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\dvrenderers.h +# End Source File +# Begin Source File + 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 @@ -9067,7 +6109,7 @@ SOURCE=..\..\include\wx\encinfo.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\evtloop.h +SOURCE=..\..\include\wx\evtloopsrc.h # End Source File # Begin Source File @@ -9083,6 +6125,10 @@ SOURCE=..\..\include\wx\filedlg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\filehistory.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\filepicker.h # End Source File # Begin Source File @@ -9123,6 +6169,10 @@ SOURCE=..\..\include\wx\aui\framemanager.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\ribbon\gallery.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\gauge.h # End Source File # Begin Source File @@ -9159,6 +6209,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 @@ -9239,6 +6297,10 @@ SOURCE=..\..\include\wx\imagxpm.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\infobar.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\joystick.h # End Source File # Begin Source File @@ -9267,6 +6329,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 @@ -9295,10 +6361,18 @@ SOURCE=..\..\include\wx\minifram.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\mousemanager.h +# End Source File +# Begin Source File + 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 @@ -9307,6 +6381,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 @@ -9323,6 +6401,10 @@ SOURCE=..\..\include\wx\ownerdrw.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\ribbon\page.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\palette.h # End Source File # Begin Source File @@ -9331,6 +6413,10 @@ SOURCE=..\..\include\wx\panel.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\ribbon\panel.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\paper.h # End Source File # Begin Source File @@ -9339,6 +6425,10 @@ SOURCE=..\..\include\wx\pen.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\persist.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\pickerbase.h # End Source File # Begin Source File @@ -9371,7 +6461,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 @@ -9391,6 +6501,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 @@ -9399,6 +6513,10 @@ SOURCE=..\..\include\wx\renderer.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richmsgdlg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextbuffer.h # End Source File # Begin Source File @@ -9415,6 +6533,10 @@ SOURCE=..\..\include\wx\richtext\richtexthtml.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richtext\richtextimagedlg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextprint.h # End Source File # Begin Source File @@ -9515,14 +6637,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 @@ -9547,6 +6661,10 @@ SOURCE=..\..\include\wx\textentry.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\textwrapper.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\tglbtn.h # End Source File # Begin Source File @@ -9559,6 +6677,10 @@ SOURCE=..\..\include\wx\tipwin.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\ribbon\toolbar.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\toolbar.h # End Source File # Begin Source File @@ -9575,6 +6697,10 @@ SOURCE=..\..\include\wx\toplevel.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\persist\toplevel.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\treebase.h # End Source File # Begin Source File @@ -9583,10 +6709,18 @@ SOURCE=..\..\include\wx\treebook.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\persist\treebook.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\treectrl.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\uiaction.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\valgen.h # End Source File # Begin Source File @@ -9619,10 +6753,22 @@ SOURCE=..\..\include\wx\window.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\persist\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 @@ -9679,6 +6825,10 @@ SOURCE=..\..\include\wx\xrc\xh_clrpicker.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\xrc\xh_cmdlinkbn.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\xrc\xh_collpane.h # End Source File # Begin Source File @@ -9687,6 +6837,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 @@ -9699,6 +6853,14 @@ SOURCE=..\..\include\wx\xrc\xh_dlg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\xrc\xh_editlbox.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_filectrl.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\xrc\xh_filepicker.h # End Source File # Begin Source File @@ -9839,6 +7001,10 @@ SOURCE=..\..\include\wx\xrc\xh_toolb.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\xrc\xh_toolbk.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\xrc\xh_tree.h # End Source File # Begin Source File