Skip to content

Commit 0223990

Browse files
committed
fixed:build failure
1 parent 58ac1b2 commit 0223990

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

XEngine_Source/Makefile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ FLAGS=
55
#要编译的模块
66
THIRDPART_MODULE_JSONCPP = ./XEngine_DependLibrary/XEngine_Module/jsoncpp
77
THIRDPART_MODULE_REPORT = ./XEngine_DependLibrary/XEngine_Module/XEngine_InfoReport
8+
THIRDPART_MODULE_VERIFICATION = ./XEngine_DependLibrary/XEngine_Module/XEngine_Verification
89

910
MODULE_CONFIGURE_PATH = ./XEngine_ModuleConfigure
1011
MODULE_HELP_PATH = ./XEngine_ModuleHelp
@@ -20,7 +21,7 @@ else ifeq ($(PLATFORM),mac)
2021
FILEEXT = dylib
2122
endif
2223

23-
XENGINE_MODULES = libjsoncpp.so libXEngine_InfoReport.so \
24+
XENGINE_MODULES = libjsoncpp.so libXEngine_InfoReport.so libXEngine_Verification.so \
2425
libXEngine_ModuleConfigure.so libXEngine_ModuleHelp.so libXEngine_ModuleProtocol.so libXEngine_ModuleSession.so libXEngine_ModuleQueue.so \
2526
XEngine_StreamMediaApp.exe
2627

@@ -40,6 +41,12 @@ ifeq ($(FLAGS), InstallAll)
4041
else
4142
make -C $(THIRDPART_MODULE_REPORT) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
4243
endif
44+
libXEngine_Verification.so:
45+
ifeq ($(FLAGS), InstallAll)
46+
cp $(THIRDPART_MODULE_VERIFICATION)/libXEngine_InfoReport.$(FILEEXT) ../XEngine_Release/
47+
else
48+
make -C $(THIRDPART_MODULE_VERIFICATION) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
49+
endif
4350

4451
libXEngine_ModuleConfigure.so:
4552
make -C $(MODULE_CONFIGURE_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)

XEngine_Source/XEngine.sln

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_StreamMediaApp", "X
3131
{6D0FCB40-D544-4AB2-A239-2FEBC4B98F6D} = {6D0FCB40-D544-4AB2-A239-2FEBC4B98F6D}
3232
{98DB01B5-30B7-4C00-9A84-39886680F069} = {98DB01B5-30B7-4C00-9A84-39886680F069}
3333
{9FF6FA78-456E-4A7E-86B1-17E4DB5403C9} = {9FF6FA78-456E-4A7E-86B1-17E4DB5403C9}
34+
{A8E43EC0-698A-4807-8A61-B2BE5FAB7256} = {A8E43EC0-698A-4807-8A61-B2BE5FAB7256}
3435
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}
3536
{F54F152C-594F-4465-A44E-2DB915B39760} = {F54F152C-594F-4465-A44E-2DB915B39760}
3637
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89} = {F6520D2C-BB8E-45BB-964B-F5D6A4318A89}
@@ -48,6 +49,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_InfoReport", "XEngi
4849
EndProjectSection
4950
EndProject
5051
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_Verification", "XEngine_DependLibrary\XEngine_Module\XEngine_Verification\XEngine_Verification.vcxproj", "{A8E43EC0-698A-4807-8A61-B2BE5FAB7256}"
52+
ProjectSection(ProjectDependencies) = postProject
53+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}
54+
EndProjectSection
5155
EndProject
5256
Global
5357
GlobalSection(SolutionConfigurationPlatforms) = preSolution

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CC = g++ -Wall -std=c++20
22
PLATVER =
33
LOADHDR = -I ./
44
LOADSO = -L ../../XEngine_ModuleConfigure -L ../../XEngine_ModuleProtocol -L ../../XEngine_ModuleSession -L ../../XEngine_ModuleHelp -L ../../XEngine_ModuleQueue \
5-
-L ../../XEngine_DependLibrary/XEngine_Module/jsoncpp -L ../../XEngine_DependLibrary/XEngine_Module/XEngine_InfoReport
5+
-L ../../XEngine_DependLibrary/XEngine_Module/jsoncpp -L ../../XEngine_DependLibrary/XEngine_Module/XEngine_InfoReport -L ../../XEngine_DependLibrary/XEngine_Module/XEngine_Verification
66
LIB = -lXEngine_BaseLib -lXEngine_Algorithm \
77
-lXEngine_Core -lXEngine_ManagePool -lXEngine_Cryption \
88
-lXEngine_SystemApi \
@@ -12,7 +12,7 @@ LIB = -lXEngine_BaseLib -lXEngine_Algorithm \
1212
-lXEngine_AVHelp -lXEngine_AudioCodec \
1313
-lStreamMedia_FLVProtocol -lStreamMedia_RTMPProtocol -lStreamMedia_SDPProtocol -lStreamMedia_HLSProtocol -lStreamMedia_RTSPProtocol -lStreamMedia_RTPProtocol -lStreamMedia_RTCPProtocol \
1414
-lXEngine_ModuleConfigure -lXEngine_ModuleProtocol -lXEngine_ModuleSession -lXEngine_ModuleHelp -lXEngine_ModuleQueue \
15-
-ljsoncpp -lXEngine_InfoReport
15+
-ljsoncpp -lXEngine_InfoReport -lXEngine_Verification
1616
LIBEX =
1717
OBJECTS = PullStream_ClientGet.o PullStream_ClientRtsp.o PullStream_ClientWebRtc.o \
1818
PushStream_JT1078Task.o PushStream_RTMPTask.o PushStream_XStreamTask.o PushStream_SrtTask.o PushStream_ClientWebRtc.o \

0 commit comments

Comments
 (0)