Skip to content

Commit 87d061a

Browse files
committed
fixed:build error on mac
1 parent fd5ff72 commit 87d061a

File tree

7 files changed

+53
-14
lines changed

7 files changed

+53
-14
lines changed

XEngine_Source/Makefile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,19 @@ XENGINE_MODULES = libjsoncpp.so libXEngine_InfoReport.so
2121
.PHONY:MakeAll
2222
MakeAll:$(XENGINE_MODULES)
2323

24+
2425
libjsoncpp.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
2631
libXEngine_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

2938
libXEngine_ModuleConfigure.so:
3039
make -C $(MODULE_CONFIGURE_PATH) PLATFORM=$(PLATFORM) $(FLAGS)

XEngine_Source/XEngine_ModuleConfigure/Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,13 @@ ifeq ($(RELEASE),1)
1616
FLAGS = -c
1717
DEBUG =
1818
else
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
2126
endif
2227

2328
ifeq ($(UNICODE),1)

XEngine_Source/XEngine_ModuleHelp/Makefile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RELEASE = 0
88
UNICODE = 0
99
LOADHDR = -I ./
1010
LOADSO =
11-
LIB = -lXEngine_OPenSsl
11+
LIB = -lXEngine_BaseLib -lXEngine_OPenSsl
1212
LIBEX =
1313
OBJECTS = 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)
2626
FLAGS = -c
2727
DEBUG =
2828
else
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
3136
endif
3237

3338
ifeq ($(UNICODE),1)

XEngine_Source/XEngine_ModuleProtocol/Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,13 @@ ifeq ($(RELEASE),1)
1616
FLAGS = -c
1717
DEBUG =
1818
else
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
2126
endif
2227

2328
ifeq ($(UNICODE),1)

XEngine_Source/XEngine_ModuleQueue/Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,13 @@ ifeq ($(RELEASE),1)
1616
FLAGS = -c
1717
DEBUG =
1818
else
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
2126
endif
2227

2328
ifeq ($(UNICODE),1)

XEngine_Source/XEngine_ModuleSession/Makefile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,21 @@ RELEASE = 0
88
UNICODE = 0
99
LOADHDR = -I ./
1010
LOADSO =
11-
LIB =
11+
LIB = -lXEngine_BaseLib -lXEngine_SystemApi
1212
LIBEX =
1313
OBJECTS = ModuleSession_PullStream.o ModuleSession_PushStream.o pch.o
1414

1515
ifeq ($(RELEASE),1)
1616
FLAGS = -c
1717
DEBUG =
1818
else
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
2126
endif
2227

2328
ifeq ($(UNICODE),1)

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,13 @@ ifeq ($(RELEASE),1)
2020
FLAGS = -c
2121
DEBUG =
2222
else
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
2530
endif
2631

2732
ifeq ($(UNICODE),1)

0 commit comments

Comments
 (0)