Skip to content

Commit aeaaad0

Browse files
xengine-qytxengine-qyt
committed
fixed:ms build error
1 parent bf69441 commit aeaaad0

File tree

5 files changed

+64
-32
lines changed

5 files changed

+64
-32
lines changed

‎.github/workflows/msbuild.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
name: XEngine_StorageApp-x86_64-Windows
125125
path: XEngine_Release/
126126
retention-days: 1
127-
- name: Upload folder as artifact with x64
127+
- name: Upload folder as artifact with ARM64
128128
if: matrix.configuration == 'Release' && matrix.platform == 'ARM64'
129129
uses: actions/upload-artifact@v4
130130
with:

‎XEngine_Source/StorageModule_APIHelp/pch.h‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,20 @@ extern XLONG APIHelp_dwErrorCode;
6565
#pragma comment(lib,"XEngine_RfcComponents/RfcComponents_HttpProtocol")
6666
#pragma comment(lib,"XEngine_SystemSdk/XEngine_SystemApi")
6767
#ifdef _DEBUG
68-
#ifdef _WIN64
69-
#pragma comment(lib,"../x64/Debug/jsoncpp")
70-
#else
71-
#pragma comment(lib,"../Debug/jsoncpp")
68+
#ifdef _M_X64
69+
#pragma comment(lib,"../x64/Debug/jsoncpp.lib")
70+
#elif _M_ARM64
71+
#pragma comment(lib,"../ARM64/Debug/jsoncpp.lib")
72+
#elif _M_IX86
73+
#pragma comment(lib,"../Debug/jsoncpp.lib")
7274
#endif
7375
#else
74-
#ifdef _WIN64
75-
#pragma comment(lib,"../x64/Release/jsoncpp")
76-
#else
77-
#pragma comment(lib,"../Release/jsoncpp")
76+
#ifdef _M_X64
77+
#pragma comment(lib,"../x64/Release/jsoncpp.lib")
78+
#elif _M_ARM64
79+
#pragma comment(lib,"../ARM64/Release/jsoncpp.lib")
80+
#elif _M_IX86
81+
#pragma comment(lib,"../Release/jsoncpp.lib")
7882
#endif
7983
#endif
8084
#endif

‎XEngine_Source/StorageModule_Config/pch.h‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,20 @@ extern XLONG Config_dwErrorCode;
4242

4343
#ifdef _MSC_BUILD
4444
#ifdef _DEBUG
45-
#ifdef _WIN64
46-
#pragma comment(lib,"../x64/Debug/jsoncpp")
47-
#else
48-
#pragma comment(lib,"../Debug/jsoncpp")
45+
#ifdef _M_X64
46+
#pragma comment(lib,"../x64/Debug/jsoncpp.lib")
47+
#elif _M_ARM64
48+
#pragma comment(lib,"../ARM64/Debug/jsoncpp.lib")
49+
#elif _M_IX86
50+
#pragma comment(lib,"../Debug/jsoncpp.lib")
4951
#endif
5052
#else
51-
#ifdef _WIN64
52-
#pragma comment(lib,"../x64/Release/jsoncpp")
53-
#else
54-
#pragma comment(lib,"../Release/jsoncpp")
53+
#ifdef _M_X64
54+
#pragma comment(lib,"../x64/Release/jsoncpp.lib")
55+
#elif _M_ARM64
56+
#pragma comment(lib,"../ARM64/Release/jsoncpp.lib")
57+
#elif _M_IX86
58+
#pragma comment(lib,"../Release/jsoncpp.lib")
5559
#endif
5660
#endif
5761
#endif

‎XEngine_Source/StorageModule_Protocol/pch.h‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,24 +68,34 @@ extern XLONG Protocol_dwErrorCode;
6868
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib.lib")
6969
#pragma comment(lib,"XEngine_SystemSdk/XEngine_SystemApi.lib")
7070
#ifdef _DEBUG
71-
#ifdef _WIN64
71+
#ifdef _M_X64
7272
#pragma comment(lib,"../x64/Debug/jsoncpp")
7373
#pragma comment(lib,"../x64/Debug/tinyxml2")
7474
#pragma comment(lib,"../x64/Debug/StorageModule_Session.lib")
7575
#pragma comment(lib,"../x64/Debug/StorageModule_APIHelp.lib")
76-
#else
76+
#elif _M_ARM64
77+
#pragma comment(lib,"../ARM64/Debug/jsoncpp")
78+
#pragma comment(lib,"../ARM64/Debug/tinyxml2")
79+
#pragma comment(lib,"../ARM64/Debug/StorageModule_Session.lib")
80+
#pragma comment(lib,"../ARM64/Debug/StorageModule_APIHelp.lib")
81+
#elif _M_IX86
7782
#pragma comment(lib,"../Debug/jsoncpp")
7883
#pragma comment(lib,"../Debug/tinyxml2")
7984
#pragma comment(lib,"../Debug/StorageModule_Session.lib")
8085
#pragma comment(lib,"../Debug/StorageModule_APIHelp.lib")
8186
#endif
8287
#else
83-
#ifdef _WIN64
88+
#ifdef _M_X64
8489
#pragma comment(lib,"../x64/Release/jsoncpp")
8590
#pragma comment(lib,"../x64/Release/tinyxml2")
8691
#pragma comment(lib,"../x64/Release/StorageModule_Session.lib")
8792
#pragma comment(lib,"../x64/Release/StorageModule_APIHelp.lib")
88-
#else
93+
#elif _M_ARM64
94+
#pragma comment(lib,"../ARM64/Release/jsoncpp")
95+
#pragma comment(lib,"../ARM64/Release/tinyxml2")
96+
#pragma comment(lib,"../ARM64/Release/StorageModule_Session.lib")
97+
#pragma comment(lib,"../ARM64/Release/StorageModule_APIHelp.lib")
98+
#elif _M_IX86
8999
#pragma comment(lib,"../Release/jsoncpp")
90100
#pragma comment(lib,"../Release/tinyxml2")
91101
#pragma comment(lib,"../Release/StorageModule_Session.lib")

‎XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -136,31 +136,45 @@ extern XENGINE_LBCONFIG st_LoadbalanceCfg;
136136
#pragma comment(lib,"XEngine_HelpComponents/HelpComponents_Packets.lib")
137137
#pragma comment(lib,"XEngine_RfcComponents/RfcComponents_HttpProtocol.lib")
138138
#pragma comment(lib,"XEngine_SystemSdk/XEngine_SystemApi.lib")
139-
#ifdef _WIN64
140139
#ifdef _DEBUG
140+
#ifdef _M_X64
141141
#pragma comment(lib,"../x64/Debug/StorageModule_Session.lib")
142142
#pragma comment(lib,"../x64/Debug/StorageModule_Config.lib")
143143
#pragma comment(lib,"../x64/Debug/StorageModule_APIHelp.lib")
144144
#pragma comment(lib,"../x64/Debug/StorageModule_Protocol.lib")
145145
#pragma comment(lib,"../x64/Debug/StorageModule_Database.lib")
146146
#pragma comment(lib,"../x64/Debug/XEngine_InfoReport.lib")
147-
#else
148-
#pragma comment(lib,"../x64/Release/StorageModule_Session.lib")
149-
#pragma comment(lib,"../x64/Release/StorageModule_Config.lib")
150-
#pragma comment(lib,"../x64/Release/StorageModule_APIHelp.lib")
151-
#pragma comment(lib,"../x64/Release/StorageModule_Protocol.lib")
152-
#pragma comment(lib,"../x64/Release/StorageModule_Database.lib")
153-
#pragma comment(lib,"../x64/Release/XEngine_InfoReport.lib")
154-
#endif
155-
#else
156-
#ifdef _DEBUG
147+
#elif _M_ARM64
148+
#pragma comment(lib,"../ARM64/Debug/StorageModule_Session.lib")
149+
#pragma comment(lib,"../ARM64/Debug/StorageModule_Config.lib")
150+
#pragma comment(lib,"../ARM64/Debug/StorageModule_APIHelp.lib")
151+
#pragma comment(lib,"../ARM64/Debug/StorageModule_Protocol.lib")
152+
#pragma comment(lib,"../ARM64/Debug/StorageModule_Database.lib")
153+
#pragma comment(lib,"../ARM64/Debug/XEngine_InfoReport.lib")
154+
#elif _M_IX86
157155
#pragma comment(lib,"../Debug/StorageModule_Session.lib")
158156
#pragma comment(lib,"../Debug/StorageModule_Config.lib")
159157
#pragma comment(lib,"../Debug/StorageModule_APIHelp.lib")
160158
#pragma comment(lib,"../Debug/StorageModule_Protocol.lib")
161159
#pragma comment(lib,"../Debug/StorageModule_Database.lib")
162160
#pragma comment(lib,"../Debug/XEngine_InfoReport.lib")
161+
#endif
163162
#else
163+
#ifdef _M_X64
164+
#pragma comment(lib,"../x64/Release/StorageModule_Session.lib")
165+
#pragma comment(lib,"../x64/Release/StorageModule_Config.lib")
166+
#pragma comment(lib,"../x64/Release/StorageModule_APIHelp.lib")
167+
#pragma comment(lib,"../x64/Release/StorageModule_Protocol.lib")
168+
#pragma comment(lib,"../x64/Release/StorageModule_Database.lib")
169+
#pragma comment(lib,"../x64/Release/XEngine_InfoReport.lib")
170+
#elif _M_ARM64
171+
#pragma comment(lib,"../ARM64/Release/StorageModule_Session.lib")
172+
#pragma comment(lib,"../ARM64/Release/StorageModule_Config.lib")
173+
#pragma comment(lib,"../ARM64/Release/StorageModule_APIHelp.lib")
174+
#pragma comment(lib,"../ARM64/Release/StorageModule_Protocol.lib")
175+
#pragma comment(lib,"../ARM64/Release/StorageModule_Database.lib")
176+
#pragma comment(lib,"../ARM64/Release/XEngine_InfoReport.lib")
177+
#elif _M_IX86
164178
#pragma comment(lib,"../Release/StorageModule_Session.lib")
165179
#pragma comment(lib,"../Release/StorageModule_Config.lib")
166180
#pragma comment(lib,"../Release/StorageModule_APIHelp.lib")

0 commit comments

Comments
 (0)