Skip to content

Commit 557824a

Browse files
xengine-qytxengine-qyt
committed
improved:make file build flags
1 parent 9698997 commit 557824a

File tree

6 files changed

+35
-70
lines changed

6 files changed

+35
-70
lines changed

‎XEngine_Source/Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ libXEngine_InfoReport.so:
3434
ifeq ($(FLAGS), InstallAll)
3535
cp $(THIRDPART_MODULE_REPORT)/libXEngine_InfoReport.$(FILEEXT) ../XEngine_Release/
3636
else
37-
make -C $(THIRDPART_MODULE_REPORT) PLATFORM=$(PLATFORM) $(FLAGS)
37+
make -C $(THIRDPART_MODULE_REPORT) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
3838
endif
3939
libXEngine_ModuleConfigure.so:
40-
make -C $(MODULE_CONFIGURE_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
40+
make -C $(MODULE_CONFIGURE_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
4141
libXEngine_ModuleProtocol.so:
42-
make -C $(MODULE_PROTOCOL_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
42+
make -C $(MODULE_PROTOCOL_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
4343
libXEngine_ModuleSession.so:
44-
make -C $(MODULE_SESSION_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
44+
make -C $(MODULE_SESSION_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
4545

4646
XEngine_ServiceApp.exe:
47-
make -C $(APP_SERVICE_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
47+
make -C $(APP_SERVICE_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)

‎XEngine_Source/XEngine_ModuleAuthorize/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 = ModuleAuthorize_User.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_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_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_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 ./ -I ../XEngine_ThirdPart/jsoncpp
106
LOADSO =
117
LIB = -lXEngine_BaseLib -lXEngine_Algorithm
128
LIBEX =
139
OBJECTS = ModuleSession_Forward.o ModuleSession_Socks.o ModuleSession_Tunnel.o ModuleSession_Proxy.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/Makefile‎

Lines changed: 6 additions & 13 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 ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
84
LOADSO = -L ../XEngine_ModuleConfigure -L ../XEngine_ModuleSession -L ../XEngine_ModuleProtocol \
95
-L ../XEngine_Depend/XEngine_Module/jsoncpp -L ../XEngine_Depend/XEngine_Module/XEngine_InfoReport
@@ -14,38 +10,35 @@ LIBEX =
1410
OBJECTS = XEngine_Configure.o XEngine_Network.o XEngine_SocksTask.o XEngine_TunnelTask.o XEngine_ForwardTask.o XEngine_ProxyTask.o XEngine_ServiceApp.o
1511

1612
ifeq ($(RELEASE),1)
17-
FLAGS = -c
18-
DEBUG =
13+
FLAGS = -c -D _RELEASE
14+
DEBUG = -O2
1915
else
2016
ifeq ($(PLATFORM),mac)
2117
FLAGS = -c
22-
DEBUG = -g
18+
DEBUG = -g -D _DEBUG
2319
else
2420
FLAGS = -c -lc_p
25-
DEBUG = -g -pg
21+
DEBUG = -g -pg -D _DEBUG
2622
endif
2723
endif
2824

2925
ifeq ($(UNICODE),1)
30-
UNICODE = -D _UNICODE
26+
override UNICODE := -D __UNICODE__
3127
else
32-
UNICODE =
28+
override UNICODE := -D __ANSI__
3329
endif
3430

3531
ifeq ($(PLATFORM),linux)
3632
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
3733
PLATVER = -D __CENTOS__
38-
PLATDIR = XEngine_Linux/Centos
3934
else
4035
PLATVER = -D __UBUNTU__
41-
PLATDIR = XEngine_Linux/Ubuntu
4236
endif
4337
LIBEX = -lpthread -lrt -ldl
4438
LOADBIN = -Wl,-rpath=./,--disable-new-dtags
4539
else ifeq ($(PLATFORM),mac)
4640
CC += -Wno-deprecated-declarations
4741
PLATVER = -D __MACOS__
48-
PLATDIR = XEngine_Mac
4942
LIBEX = -lpthread -ldl
5043
LOADBIN = -Wl,-rpath,@loader_path/./
5144
endif

0 commit comments

Comments
 (0)