From ee8ae32cda2e4664e50085d9a77e933a693ddd8c Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Sun, 2 Sep 2018 21:49:39 +0100 Subject: [PATCH] odthelpbrowser: Update VS2015 Express project --- projects/msw/odthelpbrowser.vcxproj | 94 +++++++++++++++------ projects/msw/odthelpbrowser.vcxproj.filters | 34 ++++++++ projects/msw/xestiaab.sln | 32 +++---- 3 files changed, 116 insertions(+), 44 deletions(-) diff --git a/projects/msw/odthelpbrowser.vcxproj b/projects/msw/odthelpbrowser.vcxproj index 2027ed1..36d2c10 100644 --- a/projects/msw/odthelpbrowser.vcxproj +++ b/projects/msw/odthelpbrowser.vcxproj @@ -1,20 +1,20 @@  - - Debug + + DLL Debug Win32 - - Release + + DLL Release Win32 - - Debug + + DLL Debug x64 - - Release + + DLL Release x64 @@ -25,26 +25,26 @@ 8.1 - + Application true v140 Unicode - + Application false v140 true Unicode - + Application true v140 Unicode - + Application false v140 @@ -56,58 +56,77 @@ - + - + - + - + - + true + vc_mswuddll\ + vc_mswuddll\odthelpbrowser_debug + odthelpbrowser - + true + vc_mswuddll_x64\ + vc_mswuddll_x64\odthelpbrowser_debug + odthelpbrowser - + false + vc_mswudll_x64\ + vc_mswudll_x64\odthelpbrowser + odthelpbrowser - + false + vc_mswudll_x64\ + vc_mswudll_x64\odthelpbrowser + odthelpbrowser - + Level3 Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) + $(WXWIDGETS_32BIT_DEBUG)\lib\vc_dll\mswud;$(WXWIDGETS_32BIT_DEBUG)\include;$(ICONV_32BIT)\include;$(LIBXML2_32BIT)\include\libxml2\;. Windows true + vc_mswudll_x64\odthelpbrowser.exe + $(LIBXML2_32BIT)\lib;$(WXWIDGETS_32BIT_DEBUG)\lib\vc_dll;%(AdditionalLibraryDirectories) - + Level3 Disabled - _DEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) + $(WXWIDGETS_64BIT_DEBUG)\lib\vc_x64_dll\mswud;$(WXWIDGETS_64BIT_DEBUG)\include;$(ICONV_64BIT)\include;$(LIBXML2_64BIT)\include\libxml2;. Windows true + wxmsw30ud_core.lib;wxmsw30ud_html.lib;wxbase30ud.lib;wxmsw30ud_adv.lib;libxml2.dll.a;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;%(AdditionalDependencies) + $(LIBXML2_64BIT)\lib;$(WXWIDGETS_64BIT_DEBUG)\lib\vc_x64_dll;%(AdditionalLibraryDirectories) + vc_mswuddll_x64\odthelpbrowser.exe - + Level3 @@ -115,16 +134,20 @@ MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) + $(CURL_32BIT)\builds\libcurl-vc-x86-release-dll-zlib-static-ipv6-sspi-winssl\include;$(ICONV_32BIT)\include;$(WXWIDGETS_32BIT)\lib\vc_dll\mswud;$(WXWIDGETS_32BIT)\include;$(SFML_32BIT)\include;$(LIBXML2_32BIT)\include\libxml2;. Windows true true true + wxmsw30u_core.lib;wxmsw30u_html.lib;wxbase30u.lib;wxmsw30u_adv.lib;libxml2.dll.a;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;%(AdditionalDependencies) + vc_mswudll\odthelpbrowser.exe + $(LIBXML2_32BIT)\lib;$(WXWIDGETS_32BIT)\lib\vc_dll;%(AdditionalLibraryDirectories) - + Level3 @@ -132,16 +155,31 @@ MaxSpeed true true - NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) + $(WXWIDGETS_64BIT)\lib\vc_x64_dll\mswud;$(WXWIDGETS_64BIT)\include;$(ICONV_64BIT)\include;$(LIBXML2_64BIT)\include\libxml2;. Windows true true true + $(LIBXML2_64BIT)\lib;$(WXWIDGETS_64BIT)\lib\vc_x64_dll;%(AdditionalLibraryDirectories) + vc_mswudll_x64\odthelpbrowser.exe + + + + + + + + + + + + diff --git a/projects/msw/odthelpbrowser.vcxproj.filters b/projects/msw/odthelpbrowser.vcxproj.filters index 6a1782f..39cc62a 100644 --- a/projects/msw/odthelpbrowser.vcxproj.filters +++ b/projects/msw/odthelpbrowser.vcxproj.filters @@ -14,4 +14,38 @@ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/projects/msw/xestiaab.sln b/projects/msw/xestiaab.sln index e9ef279..8cb56fc 100644 --- a/projects/msw/xestiaab.sln +++ b/projects/msw/xestiaab.sln @@ -57,22 +57,22 @@ Global {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.Release|Win32.Build.0 = DLL Release|Win32 {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.Release|x64.ActiveCfg = DLL Release|x64 {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.Release|x64.Build.0 = DLL Release|x64 - {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Debug|Win32.ActiveCfg = Debug|Win32 - {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Debug|Win32.Build.0 = Debug|Win32 - {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Debug|x64.ActiveCfg = Debug|x64 - {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Debug|x64.Build.0 = Debug|x64 - {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Debug|Win32.ActiveCfg = Debug|Win32 - {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Debug|Win32.Build.0 = Debug|Win32 - {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Debug|x64.ActiveCfg = Debug|x64 - {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Debug|x64.Build.0 = Debug|x64 - {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Release|Win32.ActiveCfg = Release|Win32 - {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Release|Win32.Build.0 = Release|Win32 - {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Release|x64.ActiveCfg = Release|x64 - {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Release|x64.Build.0 = Release|x64 - {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Release|Win32.ActiveCfg = Release|Win32 - {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Release|Win32.Build.0 = Release|Win32 - {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Release|x64.ActiveCfg = Release|x64 - {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Release|x64.Build.0 = Release|x64 + {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Debug|Win32.ActiveCfg = DLL Debug|Win32 + {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Debug|Win32.Build.0 = DLL Debug|Win32 + {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Debug|x64.ActiveCfg = DLL Debug|x64 + {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Debug|x64.Build.0 = DLL Debug|x64 + {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Release|x64.Build.0 = DLL Release|x64 + {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Release|Win32.ActiveCfg = DLL Release|Win32 + {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Release|Win32.Build.0 = DLL Release|Win32 + {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Release|x64.ActiveCfg = DLL Release|x64 + {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Release|x64.Build.0 = DLL Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE -- 2.39.5