From ddaf4cc598723478be1ea769182096f9beae5bbd Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 7 Feb 2020 15:35:32 +0100 Subject: [PATCH] EAPMethods: Move build and src files one folder up Signed-off-by: Simon Rozman --- EAPMethods/{build => }/.gitignore | 0 EAPMethods/{build => }/Common.props | 14 ++-- EAPMethods/{build => }/EAP-TTLS.vcxproj | 12 +-- .../{build => }/EAP-TTLS.vcxproj.filters | 8 +- EAPMethods/{build => }/EAP-TTLS_UI.vcxproj | 26 +++---- .../{build => }/EAP-TTLS_UI.vcxproj.filters | 70 ++++++++--------- EAPMethods/{build => }/EAPMethod.def | Bin EAPMethods/{build => }/EAPMethod.props | 8 +- EAPMethods/{build => }/EAPMethod_UI.def | Bin EAPMethods/EAPMethod_UI.props | 72 ++++++++++++++++++ EAPMethods/{src => }/Main.cpp | 0 EAPMethods/{src => }/Main_UI.cpp | 0 EAPMethods/{src => }/PCH.cpp | 0 EAPMethods/{src => }/PCH.h | 4 +- EAPMethods/{src => }/PCH_UI.cpp | 0 EAPMethods/{src => }/PCH_UI.h | 2 +- EAPMethods/build/EAPMethod_UI.props | 72 ------------------ GEANTLink.sln | 4 +- 18 files changed, 146 insertions(+), 146 deletions(-) rename EAPMethods/{build => }/.gitignore (100%) rename EAPMethods/{build => }/Common.props (52%) rename EAPMethods/{build => }/EAP-TTLS.vcxproj (93%) rename EAPMethods/{build => }/EAP-TTLS.vcxproj.filters (87%) rename EAPMethods/{build => }/EAP-TTLS_UI.vcxproj (88%) rename EAPMethods/{build => }/EAP-TTLS_UI.vcxproj.filters (69%) rename EAPMethods/{build => }/EAPMethod.def (100%) rename EAPMethods/{build => }/EAPMethod.props (78%) rename EAPMethods/{build => }/EAPMethod_UI.def (100%) create mode 100644 EAPMethods/EAPMethod_UI.props rename EAPMethods/{src => }/Main.cpp (100%) rename EAPMethods/{src => }/Main_UI.cpp (100%) rename EAPMethods/{src => }/PCH.cpp (100%) rename EAPMethods/{src => }/PCH.h (88%) rename EAPMethods/{src => }/PCH_UI.cpp (100%) rename EAPMethods/{src => }/PCH_UI.h (92%) delete mode 100644 EAPMethods/build/EAPMethod_UI.props diff --git a/EAPMethods/build/.gitignore b/EAPMethods/.gitignore similarity index 100% rename from EAPMethods/build/.gitignore rename to EAPMethods/.gitignore diff --git a/EAPMethods/build/Common.props b/EAPMethods/Common.props similarity index 52% rename from EAPMethods/build/Common.props rename to EAPMethods/Common.props index 63c1f9f..079c079 100644 --- a/EAPMethods/build/Common.props +++ b/EAPMethods/Common.props @@ -1,27 +1,27 @@ - - + + <_PropertySheetDisplayName>EAP Method Common - ..\..\output\$(Platform).$(Configuration)\ + ..\output\$(Platform).$(Configuration)\ - $(ProjectDir);..\..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\include;..\..\lib\WinStd\include;%(AdditionalIncludeDirectories) + $(ProjectDir);..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;%(AdditionalIncludeDirectories) - + {ad6816a0-9600-4e01-8c49-39d03d1e791f} - + {d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b} - + {47399d91-7eb9-41de-b521-514ba5db0c43} diff --git a/EAPMethods/build/EAP-TTLS.vcxproj b/EAPMethods/EAP-TTLS.vcxproj similarity index 93% rename from EAPMethods/build/EAP-TTLS.vcxproj rename to EAPMethods/EAP-TTLS.vcxproj index d9a548e..6c2e007 100644 --- a/EAPMethods/build/EAP-TTLS.vcxproj +++ b/EAPMethods/EAP-TTLS.vcxproj @@ -103,22 +103,22 @@ - + {b385ec2b-c3f4-48bb-9bac-8b996de7f754} - + {114a70bb-8698-4a0c-8c90-58f22edd8129} - + {86a6d6a0-4b7d-4134-be81-a5755c77584d} - + {36b0cf8a-7794-46c3-8099-825ba962b4c7} - + {4d40cb8a-812e-4f12-b23a-31af743878e8} - + {ee0ef0d9-a475-4038-8637-5754724f65b0} diff --git a/EAPMethods/build/EAP-TTLS.vcxproj.filters b/EAPMethods/EAP-TTLS.vcxproj.filters similarity index 87% rename from EAPMethods/build/EAP-TTLS.vcxproj.filters rename to EAPMethods/EAP-TTLS.vcxproj.filters index d64719d..ebf0b23 100644 --- a/EAPMethods/build/EAP-TTLS.vcxproj.filters +++ b/EAPMethods/EAP-TTLS.vcxproj.filters @@ -15,20 +15,20 @@ - + Header Files - + Source Files - + Source Files - + Resource Files diff --git a/EAPMethods/build/EAP-TTLS_UI.vcxproj b/EAPMethods/EAP-TTLS_UI.vcxproj similarity index 88% rename from EAPMethods/build/EAP-TTLS_UI.vcxproj rename to EAPMethods/EAP-TTLS_UI.vcxproj index 2e33e1d..7131dfe 100644 --- a/EAPMethods/build/EAP-TTLS_UI.vcxproj +++ b/EAPMethods/EAP-TTLS_UI.vcxproj @@ -103,45 +103,45 @@ - + {b385ec2b-c3f4-48bb-9bac-8b996de7f754} - + {13d2d8b5-f6aa-459d-b5f7-29b95dd9d583} - + {114a70bb-8698-4a0c-8c90-58f22edd8129} - + {34680813-3a52-46fb-b5a8-1e4bbf770855} - + {86a6d6a0-4b7d-4134-be81-a5755c77584d} - + {7af5b922-7c17-428a-97e0-09e3b41a684d} - + {36b0cf8a-7794-46c3-8099-825ba962b4c7} - + {3d309c2e-64ab-4bc4-a16d-468571a2bc1a} - + {4d40cb8a-812e-4f12-b23a-31af743878e8} - + {9a25c261-8ade-4938-8393-e857ef0e37e9} - + {ee0ef0d9-a475-4038-8637-5754724f65b0} - + {42f0f0f4-c928-4860-a4e4-94991c2c3d90} - + \ No newline at end of file diff --git a/EAPMethods/build/EAP-TTLS_UI.vcxproj.filters b/EAPMethods/EAP-TTLS_UI.vcxproj.filters similarity index 69% rename from EAPMethods/build/EAP-TTLS_UI.vcxproj.filters rename to EAPMethods/EAP-TTLS_UI.vcxproj.filters index 8edc66f..e419783 100644 --- a/EAPMethods/build/EAP-TTLS_UI.vcxproj.filters +++ b/EAPMethods/EAP-TTLS_UI.vcxproj.filters @@ -19,20 +19,20 @@ - + Header Files - + Source Files - + Source Files - + Resource Files @@ -40,99 +40,99 @@ Source Files - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization - + Resource Files\Localization diff --git a/EAPMethods/build/EAPMethod.def b/EAPMethods/EAPMethod.def similarity index 100% rename from EAPMethods/build/EAPMethod.def rename to EAPMethods/EAPMethod.def diff --git a/EAPMethods/build/EAPMethod.props b/EAPMethods/EAPMethod.props similarity index 78% rename from EAPMethods/build/EAPMethod.props rename to EAPMethods/EAPMethod.props index 1f1f5d6..f6d48bd 100644 --- a/EAPMethods/build/EAPMethod.props +++ b/EAPMethods/EAPMethod.props @@ -11,11 +11,11 @@ - + - - + + Create @@ -23,6 +23,6 @@ - + \ No newline at end of file diff --git a/EAPMethods/build/EAPMethod_UI.def b/EAPMethods/EAPMethod_UI.def similarity index 100% rename from EAPMethods/build/EAPMethod_UI.def rename to EAPMethods/EAPMethod_UI.def diff --git a/EAPMethods/EAPMethod_UI.props b/EAPMethods/EAPMethod_UI.props new file mode 100644 index 0000000..4280903 --- /dev/null +++ b/EAPMethods/EAPMethod_UI.props @@ -0,0 +1,72 @@ + + + + + + + + + + PCH_UI.h + + + EAPMethod_UI.def + + + + + + + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {d4b54856-be1f-4937-a8f7-495125be76be} + + + {d3e29951-d9f5-486d-a167-20ae8e90b1fa} + + + \ No newline at end of file diff --git a/EAPMethods/src/Main.cpp b/EAPMethods/Main.cpp similarity index 100% rename from EAPMethods/src/Main.cpp rename to EAPMethods/Main.cpp diff --git a/EAPMethods/src/Main_UI.cpp b/EAPMethods/Main_UI.cpp similarity index 100% rename from EAPMethods/src/Main_UI.cpp rename to EAPMethods/Main_UI.cpp diff --git a/EAPMethods/src/PCH.cpp b/EAPMethods/PCH.cpp similarity index 100% rename from EAPMethods/src/PCH.cpp rename to EAPMethods/PCH.cpp diff --git a/EAPMethods/src/PCH.h b/EAPMethods/PCH.h similarity index 88% rename from EAPMethods/src/PCH.h rename to EAPMethods/PCH.h index aefec9e..d3db77c 100644 --- a/EAPMethods/src/PCH.h +++ b/EAPMethods/PCH.h @@ -21,8 +21,8 @@ #pragma once #if EAPMETHOD_TYPE == 21 -#include "../../lib/TTLS/include/Method.h" -#include "../../lib/TTLS/include/Module.h" +#include "../lib/TTLS/include/Method.h" +#include "../lib/TTLS/include/Module.h" #define EAPMETHOD_PEER eap::peer_ttls #else #error Unknown EAP Method type. diff --git a/EAPMethods/src/PCH_UI.cpp b/EAPMethods/PCH_UI.cpp similarity index 100% rename from EAPMethods/src/PCH_UI.cpp rename to EAPMethods/PCH_UI.cpp diff --git a/EAPMethods/src/PCH_UI.h b/EAPMethods/PCH_UI.h similarity index 92% rename from EAPMethods/src/PCH_UI.h rename to EAPMethods/PCH_UI.h index e7c1cff..820e989 100644 --- a/EAPMethods/src/PCH_UI.h +++ b/EAPMethods/PCH_UI.h @@ -24,7 +24,7 @@ #define _CRT_SECURE_NO_WARNINGS #if EAPMETHOD_TYPE == 21 -#include "../../lib/TTLS_UI/include/Module.h" +#include "../lib/TTLS_UI/include/Module.h" #define EAPMETHOD_PEER_UI eap::peer_ttls_ui #else #error Unknown EAP Method type. diff --git a/EAPMethods/build/EAPMethod_UI.props b/EAPMethods/build/EAPMethod_UI.props deleted file mode 100644 index 73853aa..0000000 --- a/EAPMethods/build/EAPMethod_UI.props +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - PCH_UI.h - - - EAPMethod_UI.def - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {d4b54856-be1f-4937-a8f7-495125be76be} - - - {d3e29951-d9f5-486d-a167-20ae8e90b1fa} - - - \ No newline at end of file diff --git a/GEANTLink.sln b/GEANTLink.sln index 943f3d0..253ffa5 100644 --- a/GEANTLink.sln +++ b/GEANTLink.sln @@ -11,7 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EAP Methods", "EAP Methods", "{60BAAC3D-DC98-4C19-BC40-1A86963DE86C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAP-TTLS", "EAPMethods\build\EAP-TTLS.vcxproj", "{331B6077-E3E2-4867-B93E-9D3F57280DE7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAP-TTLS", "EAPMethods\EAP-TTLS.vcxproj", "{331B6077-E3E2-4867-B93E-9D3F57280DE7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{E66A3FE1-4EE4-401F-8EAD-BE518B230393}" EndProject @@ -23,7 +23,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CredWrite", "CredWrite\Cred EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Events", "lib\Events\build\Events.vcxproj", "{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAP-TTLS_UI", "EAPMethods\build\EAP-TTLS_UI.vcxproj", "{DD7A97CA-F18E-43B7-95C4-D06E6A291624}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAP-TTLS_UI", "EAPMethods\EAP-TTLS_UI.vcxproj", "{DD7A97CA-F18E-43B7-95C4-D06E6A291624}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPBase", "lib\EAPBase\build\EAPBase.vcxproj", "{AD6816A0-9600-4E01-8C49-39D03D1E791F}" EndProject