Amebis/GEANTLink
Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

Make EAP method StdAfx(_UI).h and RC files reusable

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2020-01-09 13:53:52 +01:00
parent d3760d33ca
commit 08a67c561a
12 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
EAPMethods/build/EAPMethod.props
View File

@ -22,4 +22,7 @@
<ItemGroup> <ItemGroup>
<None Include="EAPMethod.def" /> <None Include="EAPMethod.def" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\res\EAPMethod.rc" />
</ItemGroup>
</Project> </Project>

3
EAPMethods/build/EAPMethod_UI.props
View File

@ -58,6 +58,9 @@
<POCompile Include="..\locale\tr_TR.po" /> <POCompile Include="..\locale\tr_TR.po" />
<POCompile Include="..\locale\vi_VN.po" /> <POCompile Include="..\locale\vi_VN.po" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\res\EAPMethod_UI.rc" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\lib\EAPBase_UI\build\EAPBase_UI.vcxproj"> <ProjectReference Include="..\..\lib\EAPBase_UI\build\EAPBase_UI.vcxproj">
<Project>{d4b54856-be1f-4937-a8f7-495125be76be}</Project> <Project>{d4b54856-be1f-4937-a8f7-495125be76be}</Project>

6
EAPMethods/build/EAPTTLS.vcxproj
View File

@ -92,6 +92,9 @@
<ClCompile> <ClCompile>
<PreprocessorDefinitions>EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
@ -99,9 +102,6 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" /> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
<ItemGroup>
<ResourceCompile Include="..\res\EAPTTLS.rc" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\lib\EapHost\build\EapHost.vcxproj"> <ProjectReference Include="..\..\lib\EapHost\build\EapHost.vcxproj">
<Project>{b385ec2b-c3f4-48bb-9bac-8b996de7f754}</Project> <Project>{b385ec2b-c3f4-48bb-9bac-8b996de7f754}</Project>

2
EAPMethods/build/EAPTTLS.vcxproj.filters
View File

@ -28,7 +28,7 @@
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="..\res\EAPTTLS.rc"> <ResourceCompile Include="..\res\EAPMethod.rc">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</ResourceCompile> </ResourceCompile>
</ItemGroup> </ItemGroup>

6
EAPMethods/build/EAPTTLS_UI.vcxproj
View File

@ -92,6 +92,9 @@
<ClCompile> <ClCompile>
<PreprocessorDefinitions>EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
@ -99,9 +102,6 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" /> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
<ItemGroup>
<ResourceCompile Include="..\res\EAPTTLS_UI.rc" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\lib\EapHost\build\EapHost.vcxproj"> <ProjectReference Include="..\..\lib\EapHost\build\EapHost.vcxproj">
<Project>{b385ec2b-c3f4-48bb-9bac-8b996de7f754}</Project> <Project>{b385ec2b-c3f4-48bb-9bac-8b996de7f754}</Project>

2
EAPMethods/build/EAPTTLS_UI.vcxproj.filters
View File

@ -32,7 +32,7 @@
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="..\res\EAPTTLS_UI.rc"> <ResourceCompile Include="..\res\EAPMethod_UI.rc">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</ResourceCompile> </ResourceCompile>
</ItemGroup> </ItemGroup>

BIN
EAPMethods/res/EAPTTLS.rc → EAPMethods/res/EAPMethod.rc
View File

Binary file not shown.

BIN
EAPMethods/res/EAPTTLS_UI.rc → EAPMethods/res/EAPMethod_UI.rc
View File

Binary file not shown.

9
EAPMethods/src/Main.cpp
View File

@ -20,16 +20,11 @@
#include "StdAfx.h" #include "StdAfx.h"
#pragma comment(lib, "Ws2_32.lib")
using namespace std; using namespace std;
using namespace winstd; using namespace winstd;
#pragma comment(lib, "Ws2_32.lib")
#if EAPMETHOD_TYPE==21
#define _EAPMETHOD_PEER eap::peer_ttls
#else
#error Unknown EAP Method type.
#endif
_EAPMETHOD_PEER g_peer; _EAPMETHOD_PEER g_peer;

6
EAPMethods/src/Main_UI.cpp
View File

@ -26,12 +26,6 @@ using namespace std;
using namespace winstd; using namespace winstd;
#if EAPMETHOD_TYPE==21
#define _EAPMETHOD_PEER_UI eap::peer_ttls_ui
#else
#error Unknown EAP Method type.
#endif
HANDLE g_act_ctx = NULL; HANDLE g_act_ctx = NULL;
_EAPMETHOD_PEER_UI g_peer; _EAPMETHOD_PEER_UI g_peer;

5
EAPMethods/src/StdAfx.h
View File

@ -20,5 +20,10 @@
#pragma once #pragma once
#if EAPMETHOD_TYPE == 21
#include "../../lib/TTLS/include/Method.h" #include "../../lib/TTLS/include/Method.h"
#include "../../lib/TTLS/include/Module.h" #include "../../lib/TTLS/include/Module.h"
#define _EAPMETHOD_PEER eap::peer_ttls
#else
#error Unknown EAP Method type.
#endif

5
EAPMethods/src/StdAfx_UI.h
View File

@ -20,4 +20,9 @@
#pragma once #pragma once
#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.
#endif