Skip to content

Commit 94297f8

Browse files
xengine-qytxengine-qyt
committed
improved:make file build flags
1 parent bd384bc commit 94297f8

File tree

7 files changed

+42
-84
lines changed

7 files changed

+42
-84
lines changed

‎XEngine_Source/Makefile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,25 @@ libjsoncpp.so:
3232
ifeq ($(FLAGS), InstallAll)
3333
cp $(THIRDPART_MODULE_JSONCPP)/libjsoncpp.$(FILEEXT) ../XEngine_Release/
3434
else
35-
make -C $(THIRDPART_MODULE_JSONCPP) PLATFORM=$(PLATFORM) $(FLAGS)
35+
make -C $(THIRDPART_MODULE_JSONCPP) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
3636
endif
3737
libXEngine_InfoReport.so:
3838
ifeq ($(FLAGS), InstallAll)
3939
cp $(THIRDPART_MODULE_REPORT)/libXEngine_InfoReport.$(FILEEXT) ../XEngine_Release/
4040
else
41-
make -C $(THIRDPART_MODULE_REPORT) PLATFORM=$(PLATFORM) $(FLAGS)
41+
make -C $(THIRDPART_MODULE_REPORT) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
4242
endif
4343

4444
libXEngine_ModuleConfigure.so:
45-
make -C $(MODULE_CONFIGURE_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
45+
make -C $(MODULE_CONFIGURE_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
4646
libXEngine_ModuleHelp.so:
47-
make -C $(MODULE_HELP_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
47+
make -C $(MODULE_HELP_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
4848
libXEngine_ModuleProtocol.so:
49-
make -C $(MODULE_PROTOCOL_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
49+
make -C $(MODULE_PROTOCOL_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
5050
libXEngine_ModuleSession.so:
51-
make -C $(MODULE_SESSION_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
51+
make -C $(MODULE_SESSION_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
5252
libXEngine_ModuleQueue.so:
53-
make -C $(MODULE_QUEUE_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
53+
make -C $(MODULE_QUEUE_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
5454

5555
XEngine_StreamMediaApp.exe:
56-
make -C $(APP_STREAMMEDIA_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
56+
make -C $(APP_STREAMMEDIA_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)

‎XEngine_Source/XEngine_ModuleConfigure/Makefile‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,37 @@
11
CC = g++ -Wall -std=c++20 -fPIC
2-
PLATFORM = linux
32
PLATVER =
4-
PLATDIR =
53
FILEEXT =
64
LIBFLAG =
7-
RELEASE = 0
8-
UNICODE = 0
95
LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
106
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
117
LIB = -ljsoncpp
128
LIBEX =
139
OBJECTS = ModuleConfigure_Json.o pch.o
1410

1511
ifeq ($(RELEASE),1)
16-
FLAGS = -c
17-
DEBUG =
12+
FLAGS = -c -D _RELEASE
13+
DEBUG = -O2
1814
else
1915
ifeq ($(PLATFORM),mac)
2016
FLAGS = -c
21-
DEBUG = -g
17+
DEBUG = -g -D _DEBUG
2218
else
2319
FLAGS = -c -lc_p
24-
DEBUG = -g -pg
20+
DEBUG = -g -pg -D _DEBUG
2521
endif
2622
endif
2723

2824
ifeq ($(UNICODE),1)
29-
UNICODE = -D _UNICODE
25+
override UNICODE := -D __UNICODE__
3026
else
31-
UNICODE =
27+
override UNICODE := -D __ANSI__
3228
endif
3329

3430
ifeq ($(PLATFORM),linux)
3531
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
3632
PLATVER = -D __CENTOS__
37-
PLATDIR = XEngine_Linux/Centos
3833
else
3934
PLATVER = -D __UBUNTU__
40-
PLATDIR = XEngine_Linux/Ubuntu
4135
endif
4236
FILEEXT = so
4337
LIBFLAG = -shared
@@ -46,7 +40,6 @@ ifeq ($(PLATFORM),linux)
4640
else ifeq ($(PLATFORM),mac)
4741
CC += -Wno-deprecated-declarations
4842
PLATVER = -D __MACOS__
49-
PLATDIR = XEngine_Mac
5043
FILEEXT = dylib
5144
LIBFLAG = -dynamiclib
5245
LIBEX = -lpthread -ldl

‎XEngine_Source/XEngine_ModuleHelp/Makefile‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
CC = g++ -Wall -std=c++20 -fPIC
2-
PLATFORM = linux
32
PLATVER =
4-
PLATDIR =
53
FILEEXT =
64
LIBFLAG =
7-
RELEASE = 0
8-
UNICODE = 0
95
LOADHDR = -I ./
106
LOADSO =
117
LIB = -lXEngine_BaseLib -lXEngine_Cryption -lNetHelp_APIAddr
@@ -32,31 +28,29 @@ ifeq ($(MACRO_RTC_SUPPORT),1)
3228
endif
3329

3430
ifeq ($(RELEASE),1)
35-
FLAGS = -c
36-
DEBUG =
31+
FLAGS = -c -D _RELEASE
32+
DEBUG = -O2
3733
else
3834
ifeq ($(PLATFORM),mac)
3935
FLAGS = -c
40-
DEBUG = -g
36+
DEBUG = -g -D _DEBUG
4137
else
4238
FLAGS = -c -lc_p
43-
DEBUG = -g -pg
39+
DEBUG = -g -pg -D _DEBUG
4440
endif
4541
endif
4642

4743
ifeq ($(UNICODE),1)
48-
UNICODE = -D _UNICODE
44+
override UNICODE := -D __UNICODE__
4945
else
50-
UNICODE =
46+
override UNICODE := -D __ANSI__
5147
endif
5248

5349
ifeq ($(PLATFORM),linux)
5450
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
5551
PLATVER = -D __CENTOS__
56-
PLATDIR = XEngine_Linux/Centos
5752
else
5853
PLATVER = -D __UBUNTU__
59-
PLATDIR = XEngine_Linux/Ubuntu
6054
endif
6155
FILEEXT = so
6256
LIBFLAG = -shared
@@ -65,7 +59,6 @@ ifeq ($(PLATFORM),linux)
6559
else ifeq ($(PLATFORM),mac)
6660
CC += -Wno-deprecated-declarations
6761
PLATVER = -D __MACOS__
68-
PLATDIR = XEngine_Mac
6962
FILEEXT = dylib
7063
LOADHDR += -I /opt/homebrew/opt/srt/include -I /opt/homebrew/opt/srtp/include
7164
LOADSO += -L /opt/homebrew/opt/srt/lib -L /opt/homebrew/opt/srtp/lib

‎XEngine_Source/XEngine_ModuleProtocol/Makefile‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,37 @@
11
CC = g++ -Wall -std=c++20 -fPIC
2-
PLATFORM = linux
32
PLATVER =
4-
PLATDIR =
53
FILEEXT =
64
LIBFLAG =
7-
RELEASE = 0
8-
UNICODE = 0
95
LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
106
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
117
LIB = -ljsoncpp
128
LIBEX =
139
OBJECTS = ModuleProtocol_Packet.o ModuleProtocol_Parse.o pch.o
1410

1511
ifeq ($(RELEASE),1)
16-
FLAGS = -c
17-
DEBUG =
12+
FLAGS = -c -D _RELEASE
13+
DEBUG = -O2
1814
else
1915
ifeq ($(PLATFORM),mac)
2016
FLAGS = -c
21-
DEBUG = -g
17+
DEBUG = -g -D _DEBUG
2218
else
2319
FLAGS = -c -lc_p
24-
DEBUG = -g -pg
20+
DEBUG = -g -pg -D _DEBUG
2521
endif
2622
endif
2723

2824
ifeq ($(UNICODE),1)
29-
UNICODE = -D _UNICODE
25+
override UNICODE := -D __UNICODE__
3026
else
31-
UNICODE =
27+
override UNICODE := -D __ANSI__
3228
endif
3329

3430
ifeq ($(PLATFORM),linux)
3531
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
3632
PLATVER = -D __CENTOS__
37-
PLATDIR = XEngine_Linux/Centos
3833
else
3934
PLATVER = -D __UBUNTU__
40-
PLATDIR = XEngine_Linux/Ubuntu
4135
endif
4236
FILEEXT = so
4337
LIBFLAG = -shared
@@ -46,7 +40,6 @@ ifeq ($(PLATFORM),linux)
4640
else ifeq ($(PLATFORM),mac)
4741
CC += -Wno-deprecated-declarations
4842
PLATVER = -D __MACOS__
49-
PLATDIR = XEngine_Mac
5043
FILEEXT = dylib
5144
LIBFLAG = -dynamiclib
5245
LIBEX = -lpthread -ldl

‎XEngine_Source/XEngine_ModuleQueue/Makefile‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,37 @@
11
CC = g++ -Wall -std=c++20 -fPIC
2-
PLATFORM = linux
32
PLATVER =
4-
PLATDIR =
53
FILEEXT =
64
LIBFLAG =
7-
RELEASE = 0
8-
UNICODE = 0
95
LOADHDR = -I ./
106
LOADSO =
117
LIB =
128
LIBEX =
139
OBJECTS = ModuleQueue_JT1078.o pch.o
1410

1511
ifeq ($(RELEASE),1)
16-
FLAGS = -c
17-
DEBUG =
12+
FLAGS = -c -D _RELEASE
13+
DEBUG = -O2
1814
else
1915
ifeq ($(PLATFORM),mac)
2016
FLAGS = -c
21-
DEBUG = -g
17+
DEBUG = -g -D _DEBUG
2218
else
2319
FLAGS = -c -lc_p
24-
DEBUG = -g -pg
20+
DEBUG = -g -pg -D _DEBUG
2521
endif
2622
endif
2723

2824
ifeq ($(UNICODE),1)
29-
UNICODE = -D _UNICODE
25+
override UNICODE := -D __UNICODE__
3026
else
31-
UNICODE =
27+
override UNICODE := -D __ANSI__
3228
endif
3329

3430
ifeq ($(PLATFORM),linux)
3531
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
3632
PLATVER = -D __CENTOS__
37-
PLATDIR = XEngine_Linux/Centos
3833
else
3934
PLATVER = -D __UBUNTU__
40-
PLATDIR = XEngine_Linux/Ubuntu
4135
endif
4236
FILEEXT = so
4337
LIBFLAG = -shared
@@ -46,7 +40,6 @@ ifeq ($(PLATFORM),linux)
4640
else ifeq ($(PLATFORM),mac)
4741
CC += -Wno-deprecated-declarations
4842
PLATVER = -D __MACOS__
49-
PLATDIR = XEngine_Mac
5043
FILEEXT = dylib
5144
LIBFLAG = -dynamiclib
5245
LIBEX = -lpthread -ldl

‎XEngine_Source/XEngine_ModuleSession/Makefile‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,37 @@
11
CC = g++ -Wall -std=c++20 -fPIC
2-
PLATFORM = linux
32
PLATVER =
4-
PLATDIR =
53
FILEEXT =
64
LIBFLAG =
7-
RELEASE = 0
8-
UNICODE = 0
95
LOADHDR = -I ./
106
LOADSO =
117
LIB = -lXEngine_BaseLib -lXEngine_SystemApi
128
LIBEX =
139
OBJECTS = ModuleSession_PullStream.o ModuleSession_PushStream.o pch.o
1410

1511
ifeq ($(RELEASE),1)
16-
FLAGS = -c
17-
DEBUG =
12+
FLAGS = -c -D _RELEASE
13+
DEBUG = -O2
1814
else
1915
ifeq ($(PLATFORM),mac)
2016
FLAGS = -c
21-
DEBUG = -g
17+
DEBUG = -g -D _DEBUG
2218
else
2319
FLAGS = -c -lc_p
24-
DEBUG = -g -pg
20+
DEBUG = -g -pg -D _DEBUG
2521
endif
2622
endif
2723

2824
ifeq ($(UNICODE),1)
29-
UNICODE = -D _UNICODE
25+
override UNICODE := -D __UNICODE__
3026
else
31-
UNICODE =
27+
override UNICODE := -D __ANSI__
3228
endif
3329

3430
ifeq ($(PLATFORM),linux)
3531
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
3632
PLATVER = -D __CENTOS__
37-
PLATDIR = XEngine_Linux/Centos
3833
else
3934
PLATVER = -D __UBUNTU__
40-
PLATDIR = XEngine_Linux/Ubuntu
4135
endif
4236
FILEEXT = so
4337
LIBFLAG = -shared
@@ -46,7 +40,6 @@ ifeq ($(PLATFORM),linux)
4640
else ifeq ($(PLATFORM),mac)
4741
CC += -Wno-deprecated-declarations
4842
PLATVER = -D __MACOS__
49-
PLATDIR = XEngine_Mac
5043
FILEEXT = dylib
5144
LIBFLAG = -dynamiclib
5245
LIBEX = -lpthread -ldl

‎XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/Makefile‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
CC = g++ -Wall -std=c++20
2-
PLATFORM = linux
32
PLATVER =
4-
PLATDIR =
5-
RELEASE = 0
6-
UNICODE = 0
73
LOADHDR = -I ./
84
LOADSO = -L ../../XEngine_ModuleConfigure -L ../../XEngine_ModuleProtocol -L ../../XEngine_ModuleSession -L ../../XEngine_ModuleHelp -L ../../XEngine_ModuleQueue \
95
-L ../../XEngine_Depend/XEngine_Module/jsoncpp -L ../../XEngine_Depend/XEngine_Module/XEngine_InfoReport
@@ -24,8 +20,8 @@ OBJECTS = PullStream_ClientGet.o PullStream_ClientRtsp.o PullStream_ClientWebRtc
2420
XEngine_AVPacket.o XEngine_Configure.o XEngine_HttpTask.o XEngine_Network.o XEngine_StreamMediaApp.o
2521

2622
ifeq ($(RELEASE),1)
27-
FLAGS = -c
28-
DEBUG =
23+
FLAGS = -c -D _RELEASE
24+
DEBUG = -O2
2925
else
3026
ifeq ($(PLATFORM),mac)
3127
FLAGS = -c
@@ -37,26 +33,23 @@ else
3733
endif
3834

3935
ifeq ($(UNICODE),1)
40-
UNICODE = -D _UNICODE
36+
override UNICODE := -D __UNICODE__
4137
else
42-
UNICODE =
38+
override UNICODE := -D __ANSI__
4339
endif
4440

4541
ifeq ($(PLATFORM),linux)
4642
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
4743
PLATVER = -D __CENTOS__
48-
PLATDIR = XEngine_Linux/Centos
4944
else
5045
PLATVER = -D __UBUNTU__
51-
PLATDIR = XEngine_Linux/Ubuntu
5246
endif
5347
CC += -Wno-format-overflow
5448
LIBEX = -lpthread -lrt -ldl
5549
LOADBIN = -Wl,-rpath=./:/usr/local/ffmpeg-xengine/lib,--disable-new-dtags
5650
else ifeq ($(PLATFORM),mac)
5751
CC += -Wno-deprecated-declarations
5852
PLATVER = -D __MACOS__
59-
PLATDIR = XEngine_Mac
6053
LIBEX = -lpthread -ldl
6154
LOADBIN = -Wl,-rpath,@loader_path/./
6255
endif

0 commit comments

Comments
 (0)