From: Steve Brokenshire Date: Thu, 13 Aug 2020 07:49:44 +0000 (+0100) Subject: Migrate building on Windows to using CMake X-Git-Tag: release-0.24~10 X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=commitdiff_plain;h=26d19ed9ed27c5775dc9033ab2afe5983eb34619 Migrate building on Windows to using CMake --- diff --git a/projects/msw/.gitignore b/projects/msw/.gitignore deleted file mode 100644 index 28e5196..0000000 --- a/projects/msw/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -.vs/ -x64/ -vc_mswudll/ -vc_mswuddll/ -vc_mswudll_x64/ -vc_mswuddll_x64/ -*.db -*.opendb -*.user diff --git a/projects/msw/README-W32BUILD.txt b/projects/msw/README-W32BUILD.txt deleted file mode 100644 index 9bddfbe..0000000 --- a/projects/msw/README-W32BUILD.txt +++ /dev/null @@ -1,43 +0,0 @@ -Xestia Address Book Windows Development -======================================= - -Step 1: Setup environment variables -=================================== - -The Visual Studio 2013 (Express) project uses the following environment -variables to work out where the header and library files are. - -============================================================================= -| Type | Arch | Normal name | Debug name | -============================================================================= -| wxWidgets | i686 | WXWIDGETS_32BIT | WXWIDGETS_32BIT_DEBUG | -| wxWidgets | x64 | WXWIDGETS_64BIT | WXWIDGETS_64BIT_DEBUG | -| SFML | i686 | SFML_32BIT | SFML_32BIT | -| SFML | x64 | SFML_64BIT | SFML_64BIT | -| libcurl | i686 | CURL_32BIT | CURL_32BIT | -| libcurl | x64 | CURL_64BIT | CURL_64BIT | -| libxml2 | i686 | LIBXML2_32BIT | LIBXML2_32BIT | -| libxml2 | x64 | LIBXML2_64BIT | LIBXML2_64BIT | -| iconv | i686 | ICONV_32BIT | ICONV_32BIT | -| iconv | x64 | ICONV_64BIT | ICONV_64BIT | -============================================================================= - -To setup the envrionment variables on your system, go into the Control Panel, -open System and then click on the Advanced System Settings link. - -Click on the Advanced tab (if not already showing this tab) and then click on -the Environment Variables button. Add or edit the variables using the names -above with the paths to the library directories (don't add include or lib to -the end of it - this is done by the Visual Studio project itself). - -It is recommended to setup these up as user environment variables not system -enironment variables. - -Step 2: Build -============= - -To build, click on Project then Build Solution or press F7. This will then -build the bitmapcode helper first and then Xestia Address Book. - -Release executables tend to be smaller but cannot be debugged as easily -compared to the Debug executables. \ No newline at end of file diff --git a/projects/msw/bitmapcode.vcxproj b/projects/msw/bitmapcode.vcxproj deleted file mode 100644 index aa4b739..0000000 --- a/projects/msw/bitmapcode.vcxproj +++ /dev/null @@ -1,271 +0,0 @@ - - - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - - - - - bitmapcode - {966CF7A9-125F-4F94-BBD6-5BD49550ECC2} - - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 - - - vc_mswuddll\ - vc_mswuddll\bitmapcode - true - true - - - vc_mswudll\ - vc_mswudll\bitmapcode - false - true - - - true - true - $(LibraryPath) - $(ExecutablePath) - vc_mswuddll_x64\ - vc_mswuddll_x64\bitmapcode - - - vc_mswudll_x64\ - vc_mswudll_x64\bitmapcode - false - true - - - - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - .\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(WXWIDGETS_32BIT_DEBUG)\lib\vc_dll\mswu;$(WXWIDGETS_32BIT_DEBUG)\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - vc_mswuddll\bitmapcode - vc_mswuddll\bitmapcode.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - 0x0409 - .\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - - - wxmsw30ud_core.lib;wxbase30ud.lib;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;%(AdditionalDependencies) - vc_mswuddll\bitmapcode.exe - true - $(WXWIDGETS_32BIT_DEBUG)\lib\vc_dll;$(WXWIDGETS_32BIT_DEBUG)\lib\vc_lib;%(AdditionalLibraryDirectories) - true - vc_mswuddll\bitmapcode.pdb - Console - MachineX86 - - - vc_mswuddll\bitmapcode_vc9.bsc - true - - - - - WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - .\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(WXWIDGETS_32BIT)\lib\vc_dll\mswu;$(WXWIDGETS_32BIT)\include;%(AdditionalIncludeDirectories) - WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;WXMSW;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - vc_mswudll\bitmapcode.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - 0x0409 - .\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - - - rpcrt4.lib;wxregexu.lib;comctl32.lib;wxbase30u.lib;wxbase30u_net.lib;wxbase30u_xml.lib;wxmsw30u_adv.lib;wxmsw30u_aui.lib;wxmsw30u_core.lib;wxmsw30u_gl.lib;wxmsw30u_html.lib;wxmsw30u_media.lib;wxmsw30u_propgrid.lib;wxmsw30u_qa.lib;wxmsw30u_ribbon.lib;wxmsw30u_richtext.lib;wxmsw30u_stc.lib;wxmsw30u_webview.lib;wxmsw30u_xrc.lib;wxexpat.lib;wxjpeg.lib;wxpng.lib;wxscintilla.lib;wxtiff.lib;wxzlib.lib;%(AdditionalDependencies) - vc_mswudll\bitmapcode.exe - true - $(WXWIDGETS_32BIT)\lib\vc_dll;%(AdditionalIncludeDirectories) - true - vc_mswudll\bitmapcode.pdb - Console - MachineX86 - true - true - - - vc_mswudll\xestiaab_vc9.bsc - true - - - - - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - .\..\..\lib\vc_x64_dll\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(WXWIDGETS_64BIT_DEBUG)\lib\vc_x64_lib\mswud;$(WXWIDGETS_64BIT_DEBUG)\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;WXMSW;%(PreprocessorDefinitions) - Sync - Default - MultiThreadedDebugDLL - true - $(IntDir) - $(IntDir)vc$(PlatformToolsetVersion).pdb - Level3 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - 0x0409 - .\..\..\lib\vc_x64_dll\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - - - rpcrt4.lib;wxregexu.lib;comctl32.lib;wxbase30ud.lib;wxbase30ud_net.lib;wxbase30ud_xml.lib;wxmsw30ud_adv.lib;wxmsw30ud_aui.lib;wxmsw30ud_core.lib;wxmsw30ud_gl.lib;wxmsw30ud_html.lib;wxmsw30ud_media.lib;wxmsw30ud_propgrid.lib;wxmsw30ud_qa.lib;wxmsw30ud_ribbon.lib;wxmsw30ud_richtext.lib;wxmsw30ud_stc.lib;wxmsw30ud_webview.lib;wxmsw30ud_xrc.lib;wxexpatd.lib;wxjpegd.lib;wxpngd.lib;wxscintillad.lib;wxtiffd.lib;wxzlibd.lib - vc_mswuddll_x64\bitmapcode.exe - true - $(WXWIDGETS_64BIT_DEBUG)\lib\vc_x64_dll;$(WXWIDGETS_64BIT_DEBUG)\lib\vc_x64_lib;%(AdditionalLibraryDirectories) - true - $(OutDir)$(TargetName).pdb - Console - MachineX64 - - - vc_mswuddll_x64\bitmapcode_debug_vc9.bsc - true - - - - - - - - - - - - WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - .\..\..\lib\vc_x64_dll\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(WXWIDGETS_64BIT)\lib\vc_x64_lib\mswud;$(WXWIDGETS_64BIT)\include;%(AdditionalIncludeDirectories) - WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;WXMSW;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - vc_mswudll_x64\bitmapcode\ - vc_mswudll_x64\bitmapcode.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - 0x0409 - .\..\..\lib\vc_x64_dll\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - - - rpcrt4.lib;wxregexu.lib;comctl32.lib;wxbase30u.lib;wxbase30u_net.lib;wxbase30u_xml.lib;wxmsw30u_adv.lib;wxmsw30u_aui.lib;wxmsw30u_core.lib;wxmsw30u_gl.lib;wxmsw30u_html.lib;wxmsw30u_media.lib;wxmsw30u_propgrid.lib;wxmsw30u_qa.lib;wxmsw30u_ribbon.lib;wxmsw30u_richtext.lib;wxmsw30u_stc.lib;wxmsw30u_webview.lib;wxmsw30u_xrc.lib;wxexpat.lib;wxjpeg.lib;wxpng.lib;wxscintilla.lib;wxtiff.lib;wxzlib.lib;%(AdditionalDependencies) - vc_mswudll_x64\bitmapcode.exe - true - $(WXWIDGETS_64BIT)\lib\vc_x64_dll;$(WXWIDGETS_64BIT)\lib\vc_x64_lib;%(AdditionalLibraryDirectories) - true - vc_mswudll_x64\bitmapcode.pdb - Console - MachineX64 - true - true - - - vc_mswudll_x64\bitmapcode_vc9.bsc - true - - - - - - \ No newline at end of file diff --git a/projects/msw/bitmapcode.vcxproj.filters b/projects/msw/bitmapcode.vcxproj.filters deleted file mode 100644 index 926c366..0000000 --- a/projects/msw/bitmapcode.vcxproj.filters +++ /dev/null @@ -1,18 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - \ No newline at end of file diff --git a/projects/msw/odthelpbrowser.vcxproj b/projects/msw/odthelpbrowser.vcxproj deleted file mode 100644 index 36d2c10..0000000 --- a/projects/msw/odthelpbrowser.vcxproj +++ /dev/null @@ -1,187 +0,0 @@ - - - - - DLL Debug - Win32 - - - DLL Release - Win32 - - - DLL Debug - x64 - - - DLL Release - x64 - - - - {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4} - Win32Proj - odthelpbrowser - 8.1 - - - - Application - true - v140 - Unicode - - - Application - false - v140 - true - Unicode - - - Application - true - v140 - Unicode - - - Application - false - v140 - true - Unicode - - - - - - - - - - - - - - - - - - - - - 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;_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 - 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 - - - MaxSpeed - true - true - 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 - - - MaxSpeed - true - true - 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 - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/projects/msw/odthelpbrowser.vcxproj.filters b/projects/msw/odthelpbrowser.vcxproj.filters deleted file mode 100644 index 39cc62a..0000000 --- a/projects/msw/odthelpbrowser.vcxproj.filters +++ /dev/null @@ -1,51 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - 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 deleted file mode 100644 index 8cb56fc..0000000 --- a/projects/msw/xestiaab.sln +++ /dev/null @@ -1,80 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 14 for Windows Desktop -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xestiaab", "xestiaab.vcxproj", "{853D1FD7-20AB-586C-9699-9680F84AC985}" - ProjectSection(ProjectDependencies) = postProject - {966CF7A9-125F-4F94-BBD6-5BD49550ECC2} = {966CF7A9-125F-4F94-BBD6-5BD49550ECC2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bitmapcode", "bitmapcode.vcxproj", "{966CF7A9-125F-4F94-BBD6-5BD49550ECC2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odthelpbrowser", "odthelpbrowser.vcxproj", "{34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - DLL Debug|Win32 = DLL Debug|Win32 - DLL Debug|x64 = DLL Debug|x64 - DLL Release|Win32 = DLL Release|Win32 - DLL Release|x64 = DLL Release|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|Win32.ActiveCfg = DLL Debug|Win32 - {853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|Win32.Build.0 = DLL Debug|Win32 - {853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|x64.ActiveCfg = DLL Debug|x64 - {853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|x64.Build.0 = DLL Debug|x64 - {853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Debug|Win32.Deploy.0 = DLL Debug|Win32 - {853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Release|x64.Build.0 = DLL Release|x64 - {853D1FD7-20AB-586C-9699-9680F84AC985}.Release|Win32.ActiveCfg = DLL Release|Win32 - {853D1FD7-20AB-586C-9699-9680F84AC985}.Release|Win32.Build.0 = DLL Release|Win32 - {853D1FD7-20AB-586C-9699-9680F84AC985}.Release|x64.ActiveCfg = DLL Release|x64 - {853D1FD7-20AB-586C-9699-9680F84AC985}.Release|x64.Build.0 = DLL Release|x64 - {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.Debug|Win32.ActiveCfg = DLL Debug|Win32 - {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.Debug|Win32.Build.0 = DLL Debug|Win32 - {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.Debug|x64.ActiveCfg = DLL Debug|x64 - {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.Debug|x64.Build.0 = DLL Debug|x64 - {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.DLL Release|x64.Build.0 = DLL Release|x64 - {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.Release|Win32.ActiveCfg = DLL Release|Win32 - {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 = 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 - EndGlobalSection -EndGlobal diff --git a/projects/msw/xestiaab.vcxproj b/projects/msw/xestiaab.vcxproj deleted file mode 100644 index c9b923b..0000000 --- a/projects/msw/xestiaab.vcxproj +++ /dev/null @@ -1,395 +0,0 @@ - - - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - xestiaab - {853D1FD7-20AB-586C-9699-9680F84AC985} - - - - Application - v140 - false - Unicode - - - Application - v140 - false - Unicode - - - Application - v140 - false - Unicode - - - Application - v140 - false - Unicode - false - false - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 - - - vc_mswuddll\ - vc_mswuddll\xestiaab_debug - true - true - $(ProjectName)_debug - - - vc_mswudll\ - vc_mswudll\xestiaab - false - false - - - vc_mswuddll_x64\ - vc_mswuddll_x64\xestiaab_debug - true - true - $(ExecutablePath) - $(ProjectName)_debug - - - vc_mswudll_x64\ - vc_mswudll_x64\xestiaab - false - false - - - - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - .\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(CURL_32BIT)\builds\libcurl-vc-x86-release-dll-zlib-static-ipv6-sspi-winssl\include;$(ICONV_32BIT)\include;$(WXWIDGETS_32BIT_DEBUG)\lib\vc_dll\mswud;$(WXWIDGETS_32BIT_DEBUG)\include;$(SFML_32BIT)\include;$(LIBXML2_32BIT)\include\libxml2\;. - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;SECURITY_WIN32;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - vc_mswuddll\xestiaab_debug.pdb - Level4 - true - ProgramDatabase - - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - 0x0409 - .\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - - - wxmsw30ud_core.lib;wxmsw30ud_html.lib;wxbase30ud.lib;wxmsw30ud_adv.lib;libcurl.lib;libxml2.dll.a;sfml-audio.lib;sfml-system.lib;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;security.lib;cryptui.lib;crypt32.lib;%(AdditionalDependencies) - vc_mswuddll/xestiaab_debug.exe - true - $(SFML_32BIT)\lib;$(LIBXML2_32BIT)\lib;$(CURL_32BIT)\builds\libcurl-vc-x86-release-dll-zlib-static-ipv6-sspi-winssl\lib;$(WXWIDGETS_32BIT_DEBUG)\lib\vc_dll;%(AdditionalLibraryDirectories) - true - vc_mswuddll\xestiaab_debug.pdb - Windows - MachineX86 - - - vc_mswuddll\xestiaab_debug_vc9.bsc - true - - - $(OutDir)$(TargetName).xml - - - $(TargetDir)bitmapcode.exe ..\..\source\bitmaps - Generating bitmaps as source code - - - - - WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - .\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MinSpace - $(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;. - WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;SECURITY_WIN32;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - vc_mswudll\xestiaab_debug.pdb - Level4 - true - ProgramDatabase - Size - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - 0x0409 - .\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - - - wxmsw30u_core.lib;wxmsw30u_html.lib;wxbase30u.lib;wxmsw30u_adv.lib;libcurl.lib;libxml2.dll.a;sfml-audio.lib;sfml-system.lib;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;security.lib;cryptui.lib;crypt32.lib;%(AdditionalDependencies) - vc_mswudll\xestiaab.exe - true - $(SFML_32BIT)\lib;$(LIBXML2_32BIT)\lib;$(CURL_32BIT)\builds\libcurl-vc-x86-release-dll-zlib-static-ipv6-sspi-winssl\lib;$(WXWIDGETS_32BIT)\lib\vc_dll;%(AdditionalLibraryDirectories) - false - vc_mswudll\xestiaab.pdb - Windows - MachineX86 - true - true - UseLinkTimeCodeGeneration - - - vc_mswudll\xestiaab_vc9.bsc - true - - - $(TargetDir)bitmapcode.exe ..\..\source\bitmaps - Generating bitmaps as source code - - - - - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - .\..\..\lib\vc_x64_dll\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(CURL_64BIT)\builds\libcurl-vc-x64-release-dll-zlib-dll-ipv6-sspi-winssl\include;$(ICONV_64BIT)\include;$(WXWIDGETS_64BIT_DEBUG)\lib\vc_x64_dll\mswud;$(WXWIDGETS_64BIT_DEBUG)\include;$(SFML_64BIT)\include;$(LIBXML2_64BIT)\include\libxml2;. - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;SECURITY_WIN32;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - vc_mswuddll_x64\xestiaab_debug.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - 0x0409 - .\..\..\lib\vc_x64_dll\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - - - wxmsw30ud_core.lib;wxmsw30ud_html.lib;wxbase30ud.lib;wxmsw30ud_adv.lib;libcurl.lib;libxml2.dll.a;sfml-audio.lib;sfml-system.lib;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;security.lib;cryptui.lib;crypt32.lib;%(AdditionalDependencies) - vc_mswuddll_x64\xestiaab_debug.exe - true - $(SFML_64BIT)\lib;$(LIBXML2_64BIT)\lib;$(CURL_64BIT)\builds\\libcurl-vc-x64-release-dll-zlib-dll-ipv6-sspi-winssl\lib;$(WXWIDGETS_64BIT_DEBUG)\lib\vc_x64_dll;%(AdditionalLibraryDirectories) - true - vc_mswuddll_x64\xestiaab_debug.pdb - Windows - MachineX64 - - - vc_mswuddll_x64\xestiaab_debug_vc9.bsc - true - - - $(TargetDir)bitmapcode.exe ..\..\source\bitmaps - Generating bitmaps as source code - - - - - WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - .\..\..\lib\vc_x64_dll\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MinSpace - $(CURL_64BIT)\builds\libcurl-vc-x64-release-dll-zlib-static-ipv6-sspi-winssl\include;$(ICONV_64BIT)\include;$(WXWIDGETS_64BIT)\lib\vc_x64_dll\mswud;$(WXWIDGETS_64BIT)\include;$(SFML_64BIT)\include;$(LIBXML2_64BIT)\include\libxml2;. - WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;SECURITY_WIN32;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - vc_mswudll_x64\minimal\ - vc_mswudll_x64\minimal.pdb - Level4 - true - ProgramDatabase - Size - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - 0x0809 - .\..\..\lib\vc_x64_dll\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - - - wxmsw30u_core.lib;wxmsw30u_html.lib;wxbase30u.lib;wxmsw30u_adv.lib;libcurl.lib;libxml2.dll.a;sfml-audio.lib;sfml-system.lib;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;security.lib;cryptui.lib;crypt32.lib;%(AdditionalDependencies) - vc_mswudll_x64\xestiaab.exe - true - $(SFML_64BIT)\lib;$(LIBXML2_64BIT)\lib;$(CURL_64BIT)\builds\libcurl-vc-x64-release-dll-zlib-static-ipv6-sspi-winssl\lib;$(WXWIDGETS_64BIT)\lib\vc_x64_dll;%(AdditionalLibraryDirectories) - false - vc_mswudll_x64\xestiaab.pdb - Windows - MachineX64 - true - true - UseLinkTimeCodeGeneration - true - - - vc_mswudll_x64\xestiaab_vc9.bsc - true - - - false - - - false - - - $(TargetDir)bitmapcode.exe ..\..\source\bitmaps - Generating bitmaps as source code - - - - - - \ No newline at end of file diff --git a/projects/msw/xestiaab.vcxproj.filters b/projects/msw/xestiaab.vcxproj.filters deleted file mode 100644 index b72ef45..0000000 --- a/projects/msw/xestiaab.vcxproj.filters +++ /dev/null @@ -1,305 +0,0 @@ - - - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/source/CMakeFunctions/Application.cmake b/source/CMakeFunctions/Application.cmake index ddf96a4..87a6208 100644 --- a/source/CMakeFunctions/Application.cmake +++ b/source/CMakeFunctions/Application.cmake @@ -35,12 +35,19 @@ set(FILE_LIST main.cpp frmUpdate.h) if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - list(APPEND ${FILE_LIST} frmEditAccount.mm + list(APPEND FILE_LIST frmEditAccount.mm frmNewAccount.mm) endif() -add_executable(xestiaab - ${FILE_LIST}) +if (MSVC) + list(APPEND FILE_LIST os/msw/xestiaab.rc) + add_executable(xestiaab WIN32 + ${FILE_LIST}) +else() + add_executable(xestiaab + ${FILE_LIST}) +endif() + message("${RUNTIME_OUTPUT_NAME_bitmapcode}") @@ -50,22 +57,33 @@ target_include_directories(xestiaab add_dependencies(xestiaab bitmapcode) +list(APPEND LIBRARIES ${wxWidgets_LIBRARIES} + ${LIBXML2_LIBRARY} + sfml-audio + CURL::libcurl + actmgr + carddav2 + common + contacteditor + export + import + misc + search + vcard + widgets) + +if (MSVC) + list(APPEND LIBRARIES wsock32 + wininet + security + cryptui + crypt32) +endif() + target_link_libraries(xestiaab LINK_PUBLIC - ${wxWidgets_LIBRARIES} - ${LIBXML2_LIBRARY} - sfml-audio - CURL::libcurl - actmgr - carddav2 - common - contacteditor - export - import - misc - search - vcard - widgets) + ${LIBRARIES} +) file(GLOB DOCUMENTATION_INSTALL_FILES "${CMAKE_SOURCE_DIR}/../docs/*") foreach(ITEM ${DOCUMENTATION_INSTALL_FILES}) diff --git a/source/CMakeFunctions/Packages.cmake b/source/CMakeFunctions/Packages.cmake index 830bc74..4678364 100644 --- a/source/CMakeFunctions/Packages.cmake +++ b/source/CMakeFunctions/Packages.cmake @@ -1,11 +1,18 @@ -find_package(wxWidgets REQUIRED html net adv core base) +if (MSVC) + add_definitions(-D_CRT_SECURE_NO_WARNINGS -DSECURITY_WIN32 -DNOPCH -DWXUSINGDLL -DUNICODE) +endif() + +find_package(wxWidgets REQUIRED html adv core base) include(${wxWidgets_USE_FILE}) find_package(LibXml2 REQUIRED) include_directories(${LIBXML2_INCLUDE_DIRS}) +find_package(Iconv REQUIRED) +include_directories(${Iconv_INCLUDE_DIR}) + find_package(CURL REQUIRED) include_directories(${CURL_INCLUDE_DIRS}) find_package(SFML COMPONENTS audio REQUIRED) -include_directories(${SFML_INCLUDE_DIR}) \ No newline at end of file +include_directories(${SFML_DIR}/../include) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 4e551f1..097c584 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.14) project (xestiaab) set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/CMakeFunctions") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) set(CMAKE_CXX_STANDARD 11) include(Options) include(Packages) diff --git a/source/common/CMakeLists.txt b/source/common/CMakeLists.txt index 552d13b..588c631 100644 --- a/source/common/CMakeLists.txt +++ b/source/common/CMakeLists.txt @@ -1,6 +1,6 @@ set(TARGET_NAME "common") -set(FILE_LIST base64.cpp +list(APPEND FILE_LIST base64.cpp base64.h CMakeLists.txt defaults.cpp @@ -32,9 +32,9 @@ set(FILE_LIST base64.cpp uuid.cpp uuid.h) -if(WIN32) - list(APPEND ${FILE_LIST} win32ssl.cpp - win32ssl.h) +if(MSVC) + list(APPEND FILE_LIST win32ssl.cpp + win32ssl.h) endif() add_library(${TARGET_NAME} diff --git a/source/frmSSLCertificate.cpp b/source/frmSSLCertificate.cpp index a06c9fd..1f374db 100644 --- a/source/frmSSLCertificate.cpp +++ b/source/frmSSLCertificate.cpp @@ -205,7 +205,9 @@ void frmSSLCertificate::SetupCertsString(SSLCertCollectionString SSLCertsInc) std::map::iterator Validiter = SCDIter->second.CertData.find("Start date"); wxDateTime ValidFromDate; - ValidFromDate.ParseDate(Validiter->second); + const wxString validFromDateToParse = wxString(Validiter->second); + wxString::const_iterator validFromDateToParseEnd = validFromDateToParse.end(); + ValidFromDate.ParseDateTime(validFromDateToParse, &validFromDateToParseEnd); lblValidFromData->SetLabel(ValidFromDate.FormatDate()); diff --git a/projects/msw/resource.h b/source/os/msw/resource.h similarity index 100% rename from projects/msw/resource.h rename to source/os/msw/resource.h diff --git a/projects/msw/xestiaab.rc b/source/os/msw/xestiaab.rc similarity index 100% rename from projects/msw/xestiaab.rc rename to source/os/msw/xestiaab.rc diff --git a/projects/msw/xestiaab_win32icon.ico b/source/os/msw/xestiaab_win32icon.ico similarity index 100% rename from projects/msw/xestiaab_win32icon.ico rename to source/os/msw/xestiaab_win32icon.ico diff --git a/source/tools/CMakeLists.txt b/source/tools/CMakeLists.txt index 8de8c5a..a34ec67 100644 --- a/source/tools/CMakeLists.txt +++ b/source/tools/CMakeLists.txt @@ -1,16 +1,18 @@ add_executable(bitmapcode bitmapcode.cpp) +if (MSVC) add_custom_command( TARGET bitmapcode POST_BUILD - COMMAND ${CMAKE_BINARY_DIR}/tools/bitmapcode ${CMAKE_SOURCE_DIR}/bitmaps) + COMMAND $(OutDir)/bitmapcode ${CMAKE_SOURCE_DIR}/bitmaps) +endif() target_link_libraries(bitmapcode LINK_PUBLIC ${wxWidgets_LIBRARIES}) -add_executable(odthelpbrowser +set (sources odthelpbrowser/base64.cpp odthelpbrowser/base64.h odthelpbrowser/frmMain.cpp @@ -21,8 +23,14 @@ add_executable(odthelpbrowser odthelpbrowser/ODTHelpBrowser.cpp odthelpbrowser/ODTHelpBrowser.h odthelpbrowser/version.h) + +if (WIN32) + add_executable(odthelpbrowser WIN32 ${sources}) +else() + add_executable(odthelpbrowser ${sources}) +endif() target_link_libraries(odthelpbrowser LINK_PUBLIC ${wxWidgets_LIBRARIES} - ${LIBXML2_LIBRARY}) \ No newline at end of file + ${LIBXML2_LIBRARY})