Skip to content

Commit 9643357

Browse files
committed
fixed:linux build error
1 parent 1583413 commit 9643357

File tree

5 files changed

+5
-4
lines changed

5 files changed

+5
-4
lines changed

.github/workflows/linuxbuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: ubuntu build workflows
1+
name: linux build workflows
22

33
on:
44
push:

.github/workflows/macbuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
matrix:
1717
include:
1818
- os: macos-13
19-
- os: macos-14
19+
#- os: macos-14
2020
runs-on: ${{ matrix.os }}
2121

2222
steps:

XEngine_Source/XEngine_ModuleHelp/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RELEASE = 0
88
UNICODE = 0
99
LOADHDR = -I ./ -I /usr/include/opencv4 -I /usr/local/include/opencv4 -I /usr/local/include/lua
1010
LOADSO =
11-
LIB = -lXEngine_BaseLib -lXClient_Socket
11+
LIB = -lXEngine_BaseLib -lXClient_Socket -lNetHelp_APIAddr
1212
LIBEX =
1313
OBJECTS = ModuleHelp_IDCard.o ModuleHelp_Language.o ModuleHelp_P2PClient.o ModuleHelp_Locker.o ModuleHelp_QRCode.o ModuleHelp_SocketTest.o ModuleHelp_ImageGet.o ModuleHelp_ImageSet.o pch.o
1414

XEngine_Source/XEngine_ModuleHelp/pch.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include <opencv2/opencv.hpp>
3838
#include <opencv2/core/utils/logger.hpp>
3939
#include <opencv2/wechat_qrcode.hpp>
40+
#include <sys/socket.h>
4041
#endif
4142
#include <qrencode.h>
4243
#endif

XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LOADHDR = -I ./
1010
LOADSO = -L ../../XEngine_ModuleConfigure -L ../../XEngine_ModuleDatabase -L ../../XEngine_ModuleProtocol -L ../../XEngine_ModuleSystem -L ../../XEngine_ModuleHelp -L ../../XEngine_ModulePlugin \
1111
-L ../../XEngine_Depend/XEngine_Module/jsoncpp -L ../../XEngine_Depend/XEngine_Module/XEngine_InfoReport \
1212
-L ../../XEngine_DBDepend/XEngine_IPMacData/XEngine_Source/XEngine_APIModuleIPMac -L ../../XEngine_DBDepend/XEngine_PhoneData/Source/C/XEngine_APIModulePhone
13-
LIB = -lXEngine_BaseSafe -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_OPenSsl -lXClient_Stream -lXClient_APIHelp -lHelpComponents_XLog -lRfcComponents_HttpProtocol -lRfcComponents_NatProtocol -lRfcComponents_NTPProtocol -lXEngine_ProcFile -lXEngine_SystemApi -lXEngine_AVHelp -lXEngine_VideoCodec -lXEngine_AudioCodec -lXEngine_AVCollect \
13+
LIB = -lXEngine_BaseSafe -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_Cryption -lXClient_Stream -lXClient_APIHelp -lNetHelp_APIAddr -lHelpComponents_XLog -lRfcComponents_HttpProtocol -lRfcComponents_NatProtocol -lRfcComponents_NTPProtocol -lXEngine_ProcFile -lXEngine_SystemApi -lXEngine_AVHelp -lXEngine_VideoCodec -lXEngine_AudioCodec -lXEngine_AVCollect \
1414
-lXEngine_ModuleConfigure -lXEngine_ModuleDatabase -lXEngine_ModuleProtocol -lXEngine_ModuleSystem -lXEngine_ModuleHelp -lXEngine_ModulePlugin \
1515
-ljsoncpp -lXEngine_InfoReport \
1616
-lXEngine_APIModuleIPMac -lXEngine_APIModulePhone

0 commit comments

Comments
 (0)