Skip to content

Commit 80e91b5

Browse files
xengine-qytxengine-qyt
committed
fixed:build failure
1 parent f1b61b8 commit 80e91b5

File tree

2 files changed

+53
-35
lines changed

2 files changed

+53
-35
lines changed

‎.github/workflows/msbuild.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ jobs:
7575
$filePath = "XEngine_Source/XEngine_BuildSwitch.h"
7676
(Get-Content $filePath) -replace '#define _XENGINE_BUILD_SWITCH_OPENCV 1', '#define _XENGINE_BUILD_SWITCH_OPENCV 0' | Set-Content $filePath
7777
(Get-Content $filePath) -replace '#define _XENGINE_BUILD_SWITCH_QRDECODEC 1', '#define _XENGINE_BUILD_SWITCH_QRDECODEC 0' | Set-Content $filePath
78-
79-
cat $filePath
8078
shell: pwsh
8179

8280
- name: Set up Dependency x86_64 Environment

‎XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_Hdr.h‎

Lines changed: 53 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,27 @@ extern XENGINE_PLUGINCONFIG st_PluginLuaConfig;
145145
extern XENGINE_DEAMONAPPLIST st_DeamonAppConfig;
146146
//连接库
147147
#ifdef _MSC_BUILD
148-
#ifdef _WIN64
148+
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib.lib")
149+
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseSafe.lib")
150+
#pragma comment(lib,"XEngine_Core/XEngine_Core.lib")
151+
#pragma comment(lib,"XEngine_Core/XEngine_ManagePool.lib")
152+
#pragma comment(lib,"XEngine_Core/XEngine_Cryption.lib")
153+
#pragma comment(lib,"XEngine_Client/XClient_Stream.lib")
154+
#pragma comment(lib,"XEngine_Client/XClient_APIHelp.lib")
155+
#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIAddr")
156+
#pragma comment(lib,"XEngine_HelpComponents/HelpComponents_XLog.lib")
157+
#pragma comment(lib,"XEngine_RfcComponents/RfcComponents_HttpProtocol.lib")
158+
#pragma comment(lib,"XEngine_RfcComponents/RfcComponents_NatProtocol.lib")
159+
#pragma comment(lib,"XEngine_RfcComponents/RfcComponents_NTPProtocol.lib")
160+
#pragma comment(lib,"XEngine_SystemSdk/XEngine_SystemApi")
161+
#pragma comment(lib,"XEngine_AVCodec/XEngine_AVCollect.lib")
162+
#pragma comment(lib,"XEngine_AVCodec/XEngine_VideoCodec.lib")
163+
#pragma comment(lib,"XEngine_AVCodec/XEngine_AudioCodec.lib")
164+
#pragma comment(lib,"XEngine_AVCodec/XEngine_AVHelp.lib")
165+
#pragma comment(lib,"Ws2_32.lib")
166+
#pragma comment(lib,"Dbghelp.lib")
149167
#ifdef _DEBUG
168+
#ifdef _M_X64
150169
#pragma comment(lib,"../../x64/Debug/XEngine_InfoReport.lib")
151170
#pragma comment(lib,"../../x64/Debug/XEngine_APIModuleIPMac.lib")
152171
#pragma comment(lib,"../../x64/Debug/XEngine_APIModulePhone.lib")
@@ -156,19 +175,17 @@ extern XENGINE_DEAMONAPPLIST st_DeamonAppConfig;
156175
#pragma comment(lib,"../../x64/Debug/XEngine_ModuleSystem.lib")
157176
#pragma comment(lib,"../../x64/Debug/XEngine_ModuleHelp.lib")
158177
#pragma comment(lib,"../../x64/Debug/XEngine_ModulePlugin.lib")
159-
#else
160-
#pragma comment(lib,"../../x64/Release/XEngine_InfoReport.lib")
161-
#pragma comment(lib,"../../x64/Release/XEngine_APIModuleIPMac.lib")
162-
#pragma comment(lib,"../../x64/Release/XEngine_APIModulePhone.lib")
163-
#pragma comment(lib,"../../x64/Release/XEngine_ModuleConfigure.lib")
164-
#pragma comment(lib,"../../x64/Release/XEngine_ModuleDatabase.lib")
165-
#pragma comment(lib,"../../x64/Release/XEngine_ModuleProtocol.lib")
166-
#pragma comment(lib,"../../x64/Release/XEngine_ModuleSystem.lib")
167-
#pragma comment(lib,"../../x64/Release/XEngine_ModuleHelp.lib")
168-
#pragma comment(lib,"../../x64/Release/XEngine_ModulePlugin.lib")
169-
#endif
170-
#else
171-
#ifdef _DEBUG
178+
#elif _M_ARM64
179+
#pragma comment(lib,"../../ARM64/Debug/XEngine_InfoReport.lib")
180+
#pragma comment(lib,"../../ARM64/Debug/XEngine_APIModuleIPMac.lib")
181+
#pragma comment(lib,"../../ARM64/Debug/XEngine_APIModulePhone.lib")
182+
#pragma comment(lib,"../../ARM64/Debug/XEngine_ModuleConfigure.lib")
183+
#pragma comment(lib,"../../ARM64/Debug/XEngine_ModuleDatabase.lib")
184+
#pragma comment(lib,"../../ARM64/Debug/XEngine_ModuleProtocol.lib")
185+
#pragma comment(lib,"../../ARM64/Debug/XEngine_ModuleSystem.lib")
186+
#pragma comment(lib,"../../ARM64/Debug/XEngine_ModuleHelp.lib")
187+
#pragma comment(lib,"../../ARM64/Debug/XEngine_ModulePlugin.lib")
188+
#elif _M_IX86
172189
#pragma comment(lib,"../../Debug/XEngine_InfoReport.lib")
173190
#pragma comment(lib,"../../Debug/XEngine_APIModuleIPMac.lib")
174191
#pragma comment(lib,"../../Debug/XEngine_APIModulePhone.lib")
@@ -178,7 +195,29 @@ extern XENGINE_DEAMONAPPLIST st_DeamonAppConfig;
178195
#pragma comment(lib,"../../Debug/XEngine_ModuleSystem.lib")
179196
#pragma comment(lib,"../../Debug/XEngine_ModuleHelp.lib")
180197
#pragma comment(lib,"../../Debug/XEngine_ModulePlugin.lib")
198+
#endif
181199
#else
200+
#ifdef _M_X64
201+
#pragma comment(lib,"../../x64/Release/XEngine_InfoReport.lib")
202+
#pragma comment(lib,"../../x64/Release/XEngine_APIModuleIPMac.lib")
203+
#pragma comment(lib,"../../x64/Release/XEngine_APIModulePhone.lib")
204+
#pragma comment(lib,"../../x64/Release/XEngine_ModuleConfigure.lib")
205+
#pragma comment(lib,"../../x64/Release/XEngine_ModuleDatabase.lib")
206+
#pragma comment(lib,"../../x64/Release/XEngine_ModuleProtocol.lib")
207+
#pragma comment(lib,"../../x64/Release/XEngine_ModuleSystem.lib")
208+
#pragma comment(lib,"../../x64/Release/XEngine_ModuleHelp.lib")
209+
#pragma comment(lib,"../../x64/Release/XEngine_ModulePlugin.lib")
210+
#elif _M_ARM64
211+
#pragma comment(lib,"../../ARM64/Release/XEngine_InfoReport.lib")
212+
#pragma comment(lib,"../../ARM64/Release/XEngine_APIModuleIPMac.lib")
213+
#pragma comment(lib,"../../ARM64/Release/XEngine_APIModulePhone.lib")
214+
#pragma comment(lib,"../../ARM64/Release/XEngine_ModuleConfigure.lib")
215+
#pragma comment(lib,"../../ARM64/Release/XEngine_ModuleDatabase.lib")
216+
#pragma comment(lib,"../../ARM64/Release/XEngine_ModuleProtocol.lib")
217+
#pragma comment(lib,"../../ARM64/Release/XEngine_ModuleSystem.lib")
218+
#pragma comment(lib,"../../ARM64/Release/XEngine_ModuleHelp.lib")
219+
#pragma comment(lib,"../../ARM64/Release/XEngine_ModulePlugin.lib")
220+
#elif _M_IX86
182221
#pragma comment(lib,"../../Release/XEngine_InfoReport.lib")
183222
#pragma comment(lib,"../../Release/XEngine_APIModuleIPMac.lib")
184223
#pragma comment(lib,"../../Release/XEngine_APIModulePhone.lib")
@@ -190,23 +229,4 @@ extern XENGINE_DEAMONAPPLIST st_DeamonAppConfig;
190229
#pragma comment(lib,"../../Release/XEngine_ModulePlugin.lib")
191230
#endif
192231
#endif
193-
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib.lib")
194-
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseSafe.lib")
195-
#pragma comment(lib,"XEngine_Core/XEngine_Core.lib")
196-
#pragma comment(lib,"XEngine_Core/XEngine_ManagePool.lib")
197-
#pragma comment(lib,"XEngine_Core/XEngine_Cryption.lib")
198-
#pragma comment(lib,"XEngine_Client/XClient_Stream.lib")
199-
#pragma comment(lib,"XEngine_Client/XClient_APIHelp.lib")
200-
#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIAddr")
201-
#pragma comment(lib,"XEngine_HelpComponents/HelpComponents_XLog.lib")
202-
#pragma comment(lib,"XEngine_RfcComponents/RfcComponents_HttpProtocol.lib")
203-
#pragma comment(lib,"XEngine_RfcComponents/RfcComponents_NatProtocol.lib")
204-
#pragma comment(lib,"XEngine_RfcComponents/RfcComponents_NTPProtocol.lib")
205-
#pragma comment(lib,"XEngine_SystemSdk/XEngine_SystemApi")
206-
#pragma comment(lib,"XEngine_AVCodec/XEngine_AVCollect.lib")
207-
#pragma comment(lib,"XEngine_AVCodec/XEngine_VideoCodec.lib")
208-
#pragma comment(lib,"XEngine_AVCodec/XEngine_AudioCodec.lib")
209-
#pragma comment(lib,"XEngine_AVCodec/XEngine_AVHelp.lib")
210-
#pragma comment(lib,"Ws2_32.lib")
211-
#pragma comment(lib,"Dbghelp.lib")
212232
#endif

0 commit comments

Comments
 (0)