Skip to content

Commit 7535b80

Browse files
xengine-qytxengine-qyt
committed
fixed:build failed
1 parent 2729220 commit 7535b80

File tree

4 files changed

+94
-6
lines changed

4 files changed

+94
-6
lines changed

‎XEngine_Source/Makefile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ THIRDPART_MODULE_REPORT = ./XEngine_Depend/XEngine_Module/XEngine_InfoReport
99
MODULE_CONFIGURE_PATH = ./XEngine_ModuleConfigure
1010
MODULE_PROTOCOL_PATH = ./XEngine_ModuleProtocol
1111
MODULE_SESSION_PATH = ./XEngine_ModuleSession
12+
MODULE_HELP_PATH = ./XEngine_ModuleHelp
1213
APP_SERVICE_PATH = ./XEngine_ServiceApp
1314

1415
ifeq ($(PLATFORM),linux)
@@ -18,7 +19,7 @@ else ifeq ($(PLATFORM),mac)
1819
endif
1920

2021
XENGINE_MODULES = libjsoncpp.so libXEngine_InfoReport.so \
21-
libXEngine_ModuleConfigure.so libXEngine_ModuleProtocol.so libXEngine_ModuleSession.so \
22+
libXEngine_ModuleConfigure.so libXEngine_ModuleProtocol.so libXEngine_ModuleSession.so libXEngine_ModuleHelp.so \
2223
XEngine_ServiceApp.exe
2324

2425
.PHONY:MakeAll
@@ -42,6 +43,8 @@ libXEngine_ModuleProtocol.so:
4243
make -C $(MODULE_PROTOCOL_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
4344
libXEngine_ModuleSession.so:
4445
make -C $(MODULE_SESSION_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
45-
46+
libXEngine_ModuleHelp.so:
47+
make -C $(MODULE_HELP_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
48+
4649
XEngine_ServiceApp.exe:
4750
make -C $(APP_SERVICE_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)

‎XEngine_Source/XEngine.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ Global
122122
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Release|x64.Build.0 = Release|x64
123123
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Release|x86.ActiveCfg = Release|Win32
124124
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Release|x86.Build.0 = Release|Win32
125-
{7A864141-B878-4A5E-B2A1-D5BB4CF58FCB}.Debug|ARM64.ActiveCfg = Debug|x64
126-
{7A864141-B878-4A5E-B2A1-D5BB4CF58FCB}.Debug|ARM64.Build.0 = Debug|x64
125+
{7A864141-B878-4A5E-B2A1-D5BB4CF58FCB}.Debug|ARM64.ActiveCfg = Debug|ARM64
126+
{7A864141-B878-4A5E-B2A1-D5BB4CF58FCB}.Debug|ARM64.Build.0 = Debug|ARM64
127127
{7A864141-B878-4A5E-B2A1-D5BB4CF58FCB}.Debug|x64.ActiveCfg = Debug|x64
128128
{7A864141-B878-4A5E-B2A1-D5BB4CF58FCB}.Debug|x64.Build.0 = Debug|x64
129129
{7A864141-B878-4A5E-B2A1-D5BB4CF58FCB}.Debug|x86.ActiveCfg = Debug|Win32

‎XEngine_Source/XEngine_ModuleHelp/XEngine_ModuleHelp.vcxproj‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|ARM64">
5+
<Configuration>Debug</Configuration>
6+
<Platform>ARM64</Platform>
7+
</ProjectConfiguration>
48
<ProjectConfiguration Include="Debug|Win32">
59
<Configuration>Debug</Configuration>
610
<Platform>Win32</Platform>
711
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|ARM64">
13+
<Configuration>Release</Configuration>
14+
<Platform>ARM64</Platform>
15+
</ProjectConfiguration>
816
<ProjectConfiguration Include="Release|Win32">
917
<Configuration>Release</Configuration>
1018
<Platform>Win32</Platform>
@@ -45,13 +53,26 @@
4553
<PlatformToolset>v143</PlatformToolset>
4654
<CharacterSet>Unicode</CharacterSet>
4755
</PropertyGroup>
56+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
57+
<ConfigurationType>DynamicLibrary</ConfigurationType>
58+
<UseDebugLibraries>true</UseDebugLibraries>
59+
<PlatformToolset>v143</PlatformToolset>
60+
<CharacterSet>Unicode</CharacterSet>
61+
</PropertyGroup>
4862
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4963
<ConfigurationType>DynamicLibrary</ConfigurationType>
5064
<UseDebugLibraries>false</UseDebugLibraries>
5165
<PlatformToolset>v143</PlatformToolset>
5266
<WholeProgramOptimization>true</WholeProgramOptimization>
5367
<CharacterSet>Unicode</CharacterSet>
5468
</PropertyGroup>
69+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
70+
<ConfigurationType>DynamicLibrary</ConfigurationType>
71+
<UseDebugLibraries>false</UseDebugLibraries>
72+
<PlatformToolset>v143</PlatformToolset>
73+
<WholeProgramOptimization>true</WholeProgramOptimization>
74+
<CharacterSet>Unicode</CharacterSet>
75+
</PropertyGroup>
5576
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5677
<ImportGroup Label="ExtensionSettings">
5778
</ImportGroup>
@@ -66,14 +87,40 @@
6687
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
6788
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6889
</ImportGroup>
90+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
91+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
92+
</ImportGroup>
6993
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
7094
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7195
</ImportGroup>
96+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
97+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
98+
</ImportGroup>
7299
<PropertyGroup Label="UserMacros" />
73100
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
74101
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
75102
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
76103
</PropertyGroup>
104+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
105+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
106+
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
107+
</PropertyGroup>
108+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
109+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
110+
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
111+
</PropertyGroup>
112+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
113+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
114+
<LibraryPath>$(XEngine_LibArm64);$(LibraryPath)</LibraryPath>
115+
</PropertyGroup>
116+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
117+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
118+
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
119+
</PropertyGroup>
120+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
121+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
122+
<LibraryPath>$(XEngine_LibArm64);$(LibraryPath)</LibraryPath>
123+
</PropertyGroup>
77124
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
78125
<ClCompile>
79126
<WarningLevel>Level3</WarningLevel>
@@ -126,6 +173,22 @@
126173
<ModuleDefinitionFile>XEngine_ModuleHelp.def</ModuleDefinitionFile>
127174
</Link>
128175
</ItemDefinitionGroup>
176+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
177+
<ClCompile>
178+
<WarningLevel>Level3</WarningLevel>
179+
<SDLCheck>true</SDLCheck>
180+
<PreprocessorDefinitions>_DEBUG;XENGINEMODULEHELP_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
181+
<ConformanceMode>true</ConformanceMode>
182+
<PrecompiledHeader>Use</PrecompiledHeader>
183+
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
184+
</ClCompile>
185+
<Link>
186+
<SubSystem>Windows</SubSystem>
187+
<GenerateDebugInformation>true</GenerateDebugInformation>
188+
<EnableUAC>false</EnableUAC>
189+
<ModuleDefinitionFile>XEngine_ModuleHelp.def</ModuleDefinitionFile>
190+
</Link>
191+
</ItemDefinitionGroup>
129192
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
130193
<ClCompile>
131194
<WarningLevel>Level3</WarningLevel>
@@ -146,6 +209,26 @@
146209
<ModuleDefinitionFile>XEngine_ModuleHelp.def</ModuleDefinitionFile>
147210
</Link>
148211
</ItemDefinitionGroup>
212+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
213+
<ClCompile>
214+
<WarningLevel>Level3</WarningLevel>
215+
<FunctionLevelLinking>true</FunctionLevelLinking>
216+
<IntrinsicFunctions>true</IntrinsicFunctions>
217+
<SDLCheck>true</SDLCheck>
218+
<PreprocessorDefinitions>NDEBUG;XENGINEMODULEHELP_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
219+
<ConformanceMode>true</ConformanceMode>
220+
<PrecompiledHeader>Use</PrecompiledHeader>
221+
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
222+
</ClCompile>
223+
<Link>
224+
<SubSystem>Windows</SubSystem>
225+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
226+
<OptimizeReferences>true</OptimizeReferences>
227+
<GenerateDebugInformation>true</GenerateDebugInformation>
228+
<EnableUAC>false</EnableUAC>
229+
<ModuleDefinitionFile>XEngine_ModuleHelp.def</ModuleDefinitionFile>
230+
</Link>
231+
</ItemDefinitionGroup>
149232
<ItemGroup>
150233
<ClInclude Include="framework.h" />
151234
<ClInclude Include="ModuleHelp_APIHelp\ModuleHelp_APIHelp.h" />
@@ -159,8 +242,10 @@
159242
<ClCompile Include="pch.cpp">
160243
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
161244
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
245+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
162246
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
163247
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
248+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
164249
</ClCompile>
165250
</ItemGroup>
166251
<ItemGroup>

‎XEngine_Source/XEngine_ServiceApp/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
CC = g++ -Wall -std=c++20
22
PLATVER =
33
LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
4-
LOADSO = -L ../XEngine_ModuleConfigure -L ../XEngine_ModuleSession -L ../XEngine_ModuleProtocol \
4+
LOADSO = -L ../XEngine_ModuleConfigure -L ../XEngine_ModuleSession -L ../XEngine_ModuleProtocol -L ../XEngine_ModuleHelp \
55
-L ../XEngine_Depend/XEngine_Module/jsoncpp -L ../XEngine_Depend/XEngine_Module/XEngine_InfoReport
66
LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_Cryption -lXEngine_ManagePool -lXClient_Socket -lXClient_APIHelp -lHelpComponents_XLog -lHelpComponents_Packets -lRfcComponents_ProxyProtocol -lNetHelp_APIHelp -lNetHelp_APIAddr -lNetHelp_XSocket \
7-
-lXEngine_ModuleConfigure -lXEngine_ModuleSession -lXEngine_ModuleProtocol \
7+
-lXEngine_ModuleConfigure -lXEngine_ModuleSession -lXEngine_ModuleProtocol -lXEngine_ModuleHelp \
88
-ljsoncpp -lXEngine_InfoReport
99
LIBEX =
1010
OBJECTS = XEngine_Configure.o XEngine_Network.o XEngine_SocksTask.o XEngine_TunnelTask.o XEngine_ForwardTask.o XEngine_ProxyTask.o XEngine_ServiceApp.o

0 commit comments

Comments
 (0)