File tree Expand file tree Collapse file tree 7 files changed +53
-14
lines changed
XEngine_ServiceApp/XEngine_StreamMediaApp Expand file tree Collapse file tree 7 files changed +53
-14
lines changed Original file line number Diff line number Diff line change @@ -21,10 +21,19 @@ XENGINE_MODULES = libjsoncpp.so libXEngine_InfoReport.so
2121.PHONY :MakeAll
2222MakeAll :$(XENGINE_MODULES )
2323
24+
2425libjsoncpp.so :
26+ ifeq ($(FLAGS ) , InstallAll)
27+ cp $(THIRDPART_MODULE_JSONCPP)/libjsoncpp.$(FILEEXT) ../XEngine_Release/
28+ else
2529 make -C $(THIRDPART_MODULE_JSONCPP) PLATFORM=$(PLATFORM) $(FLAGS)
30+ endif
2631libXEngine_InfoReport.so :
32+ ifeq ($(FLAGS ) , InstallAll)
33+ cp $(THIRDPART_MODULE_REPORT)/libXEngine_InfoReport.$(FILEEXT) ../XEngine_Release/
34+ else
2735 make -C $(THIRDPART_MODULE_REPORT) PLATFORM=$(PLATFORM) $(FLAGS)
36+ endif
2837
2938libXEngine_ModuleConfigure.so :
3039 make -C $(MODULE_CONFIGURE_PATH ) PLATFORM=$(PLATFORM ) $(FLAGS )
Original file line number Diff line number Diff line change @@ -16,8 +16,13 @@ ifeq ($(RELEASE),1)
1616FLAGS = -c
1717DEBUG =
1818else
19- FLAGS = -c -lc_p
20- DEBUG = -g -pg
19+ ifeq ($(PLATFORM),mac)
20+ FLAGS = -c
21+ DEBUG = -g
22+ else
23+ FLAGS = -c -lc_p
24+ DEBUG = -g -pg
25+ endif
2126endif
2227
2328ifeq ($(UNICODE ) ,1)
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ RELEASE = 0
88UNICODE = 0
99LOADHDR = -I ./
1010LOADSO =
11- LIB = -lXEngine_OPenSsl
11+ LIB = -lXEngine_BaseLib - lXEngine_OPenSsl
1212LIBEX =
1313OBJECTS = ModuleHelp_JT1078.o ModuleHelp_SrtCore.o ModuleHelp_Rtsp.o ModuleHelp_Rtmp.o ModuleHelp_SRTPCore.o pch.o
1414
@@ -26,8 +26,13 @@ ifeq ($(RELEASE),1)
2626FLAGS = -c
2727DEBUG =
2828else
29- FLAGS = -c -lc_p
30- DEBUG = -g -pg
29+ ifeq ($(PLATFORM),mac)
30+ FLAGS = -c
31+ DEBUG = -g
32+ else
33+ FLAGS = -c -lc_p
34+ DEBUG = -g -pg
35+ endif
3136endif
3237
3338ifeq ($(UNICODE ) ,1)
Original file line number Diff line number Diff line change @@ -16,8 +16,13 @@ ifeq ($(RELEASE),1)
1616FLAGS = -c
1717DEBUG =
1818else
19- FLAGS = -c -lc_p
20- DEBUG = -g -pg
19+ ifeq ($(PLATFORM),mac)
20+ FLAGS = -c
21+ DEBUG = -g
22+ else
23+ FLAGS = -c -lc_p
24+ DEBUG = -g -pg
25+ endif
2126endif
2227
2328ifeq ($(UNICODE ) ,1)
Original file line number Diff line number Diff line change @@ -16,8 +16,13 @@ ifeq ($(RELEASE),1)
1616FLAGS = -c
1717DEBUG =
1818else
19- FLAGS = -c -lc_p
20- DEBUG = -g -pg
19+ ifeq ($(PLATFORM),mac)
20+ FLAGS = -c
21+ DEBUG = -g
22+ else
23+ FLAGS = -c -lc_p
24+ DEBUG = -g -pg
25+ endif
2126endif
2227
2328ifeq ($(UNICODE ) ,1)
Original file line number Diff line number Diff line change @@ -8,16 +8,21 @@ RELEASE = 0
88UNICODE = 0
99LOADHDR = -I ./
1010LOADSO =
11- LIB =
11+ LIB = -lXEngine_BaseLib -lXEngine_SystemApi
1212LIBEX =
1313OBJECTS = ModuleSession_PullStream.o ModuleSession_PushStream.o pch.o
1414
1515ifeq ($(RELEASE ) ,1)
1616FLAGS = -c
1717DEBUG =
1818else
19- FLAGS = -c -lc_p
20- DEBUG = -g -pg
19+ ifeq ($(PLATFORM),mac)
20+ FLAGS = -c
21+ DEBUG = -g
22+ else
23+ FLAGS = -c -lc_p
24+ DEBUG = -g -pg
25+ endif
2126endif
2227
2328ifeq ($(UNICODE ) ,1)
Original file line number Diff line number Diff line change @@ -20,8 +20,13 @@ ifeq ($(RELEASE),1)
2020FLAGS = -c
2121DEBUG =
2222else
23- FLAGS = -c -lc_p
24- DEBUG = -g -pg
23+ ifeq ($(PLATFORM),mac)
24+ FLAGS = -c
25+ DEBUG = -g
26+ else
27+ FLAGS = -c -lc_p
28+ DEBUG = -g -pg
29+ endif
2530endif
2631
2732ifeq ($(UNICODE ) ,1)
You can’t perform that action at this time.
0 commit comments