From 0bc6a9ba5e3792da654b048aa774ccbfbb2091e8 Mon Sep 17 00:00:00 2001 From: Davide Beatrici Date: Wed, 7 Nov 2018 21:23:55 +0000 Subject: [PATCH 1/2] src: change "afxres.h" to "winres.h" in all resource files, to remove MFC dependency --- src/Neo/Neo.rc | 4 ++-- src/Neo6/Neo6.rc | 4 ++-- src/PenCore/PenCore.rc | 4 ++-- src/See/See.rc | 4 ++-- src/SeeDll/SeeDll.rc | 4 ++-- src/Wfp/Wfp.rc | 4 ++-- src/vpn16/Vpn16.rc | 2 +- src/vpnbridge/vpnbridge.rc | 4 ++-- src/vpnclient/vpnclient.rc | 4 ++-- src/vpncmd/vpncmd.rc | 4 ++-- src/vpncmdsys/vpncmdsys.rc | 4 ++-- src/vpncmgr/vpncmgr.rc | 4 ++-- src/vpndrvinst/vpndrvinst.rc | 4 ++-- src/vpninstall/vpninstall.rc | 4 ++-- src/vpnserver/vpnserver.rc | 4 ++-- src/vpnsetup/vpnsetup.rc | 4 ++-- src/vpnsmgr/vpnsmgr.rc | 4 ++-- src/vpntest/vpntest.rc | 4 ++-- 18 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/Neo/Neo.rc b/src/Neo/Neo.rc index 2e72f111..c0238161 100644 --- a/src/Neo/Neo.rc +++ b/src/Neo/Neo.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winres.h""\r\n" "\0" END diff --git a/src/Neo6/Neo6.rc b/src/Neo6/Neo6.rc index 2e72f111..c0238161 100644 --- a/src/Neo6/Neo6.rc +++ b/src/Neo6/Neo6.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winres.h""\r\n" "\0" END diff --git a/src/PenCore/PenCore.rc b/src/PenCore/PenCore.rc index 3389b9a0..9fe7f4cf 100644 --- a/src/PenCore/PenCore.rc +++ b/src/PenCore/PenCore.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winres.h""\r\n" "\0" END diff --git a/src/See/See.rc b/src/See/See.rc index 5c275264..8c739aa0 100644 --- a/src/See/See.rc +++ b/src/See/See.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winres.h""\r\n" "\0" END diff --git a/src/SeeDll/SeeDll.rc b/src/SeeDll/SeeDll.rc index 2e72f111..c0238161 100644 --- a/src/SeeDll/SeeDll.rc +++ b/src/SeeDll/SeeDll.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winres.h""\r\n" "\0" END diff --git a/src/Wfp/Wfp.rc b/src/Wfp/Wfp.rc index 5c275264..8c739aa0 100644 --- a/src/Wfp/Wfp.rc +++ b/src/Wfp/Wfp.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winres.h""\r\n" "\0" END diff --git a/src/vpn16/Vpn16.rc b/src/vpn16/Vpn16.rc index 1a8208e7..eac2248f 100644 --- a/src/vpn16/Vpn16.rc +++ b/src/vpn16/Vpn16.rc @@ -31,7 +31,7 @@ END 2 TEXTINCLUDE DISCARDABLE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winres.h""\r\n" "\0" END diff --git a/src/vpnbridge/vpnbridge.rc b/src/vpnbridge/vpnbridge.rc index 06e6da7a..0cdb5263 100644 --- a/src/vpnbridge/vpnbridge.rc +++ b/src/vpnbridge/vpnbridge.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winres.h""\r\n" "\0" END diff --git a/src/vpnclient/vpnclient.rc b/src/vpnclient/vpnclient.rc index 8493f080..478fef16 100644 --- a/src/vpnclient/vpnclient.rc +++ b/src/vpnclient/vpnclient.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winres.h""\r\n" "\0" END diff --git a/src/vpncmd/vpncmd.rc b/src/vpncmd/vpncmd.rc index a06de98d..0873228a 100644 --- a/src/vpncmd/vpncmd.rc +++ b/src/vpncmd/vpncmd.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winres.h""\r\n" "\0" END diff --git a/src/vpncmdsys/vpncmdsys.rc b/src/vpncmdsys/vpncmdsys.rc index c40298f7..d66ea179 100644 --- a/src/vpncmdsys/vpncmdsys.rc +++ b/src/vpncmdsys/vpncmdsys.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winres.h""\r\n" "\0" END diff --git a/src/vpncmgr/vpncmgr.rc b/src/vpncmgr/vpncmgr.rc index e7e8933f..e142d8d5 100644 --- a/src/vpncmgr/vpncmgr.rc +++ b/src/vpncmgr/vpncmgr.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winres.h""\r\n" "\0" END diff --git a/src/vpndrvinst/vpndrvinst.rc b/src/vpndrvinst/vpndrvinst.rc index deedb19b..b9b417f9 100644 --- a/src/vpndrvinst/vpndrvinst.rc +++ b/src/vpndrvinst/vpndrvinst.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winres.h""\r\n" "\0" END diff --git a/src/vpninstall/vpninstall.rc b/src/vpninstall/vpninstall.rc index b24478a0..0bb9ecf0 100644 --- a/src/vpninstall/vpninstall.rc +++ b/src/vpninstall/vpninstall.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winres.h""\r\n" "\0" END diff --git a/src/vpnserver/vpnserver.rc b/src/vpnserver/vpnserver.rc index 03b7af53..819753d9 100644 --- a/src/vpnserver/vpnserver.rc +++ b/src/vpnserver/vpnserver.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winres.h""\r\n" "\0" END diff --git a/src/vpnsetup/vpnsetup.rc b/src/vpnsetup/vpnsetup.rc index be68c92f..363d597d 100644 --- a/src/vpnsetup/vpnsetup.rc +++ b/src/vpnsetup/vpnsetup.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winres.h""\r\n" "\0" END diff --git a/src/vpnsmgr/vpnsmgr.rc b/src/vpnsmgr/vpnsmgr.rc index 5fd26d16..444131ab 100644 --- a/src/vpnsmgr/vpnsmgr.rc +++ b/src/vpnsmgr/vpnsmgr.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winres.h""\r\n" "\0" END diff --git a/src/vpntest/vpntest.rc b/src/vpntest/vpntest.rc index 6d048626..86a3b0d6 100644 --- a/src/vpntest/vpntest.rc +++ b/src/vpntest/vpntest.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winres.h""\r\n" "\0" END From c2591382259751a549ab7546a1725bf2d57154ff Mon Sep 17 00:00:00 2001 From: Davide Beatrici Date: Thu, 8 Nov 2018 15:44:52 +0100 Subject: [PATCH 2/2] src/BUILD_WINDOWS.md: remove ATL/MFC step --- src/BUILD_WINDOWS.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/BUILD_WINDOWS.md b/src/BUILD_WINDOWS.md index c4a3f914..1ce328f8 100644 --- a/src/BUILD_WINDOWS.md +++ b/src/BUILD_WINDOWS.md @@ -53,12 +53,8 @@ Requirements: 1. Download Visual Studio 2017 (Community Edition is fine). 2. During install, make sure to check "Desktop development with C++" under "Workloads". 3. Click on individual components and scroll until you see "Visual C++ tools for CMake" under the compilers section. Make sure this is checked. -4. Continue scrolling down until you reach "SDKs, libraries, and frameworks". Under this tab you want to check to options: - 1. Visual C++ ATL for x86 and x64 - 2. Visual C++ MFC for x86 and x64 - -5. Proceed with and finish Visual Studio 2017 install. -6. Install the needed submodules to build the project, avoiding CMake telling you to do so with: `git submodule update --init --recursive` +4. Proceed with and finish Visual Studio 2017 install. +5. Install the needed submodules to build the project, avoiding CMake telling you to do so with: `git submodule update --init --recursive` Building: