Skip to content

Commit bfdf734

Browse files
xengine-qytxengine-qyt
committed
added:_DEBUG _RELEASE FLAGS and __UNICODE__ __ANSI__ FLAGS for make file with build
1 parent f328cf0 commit bfdf734

10 files changed

Lines changed: 53 additions & 76 deletions

File tree

‎.github/workflows/rocky_Arm64_build.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939

4040
- name: install system package
4141
run: |
42+
uname --machine
4243
dnf update -y
4344
dnf install gcc g++ make git jq unzip -y
4445
# 设置依赖库的环境变量

‎XEngine_Source/Makefile‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,37 +33,29 @@ libjsoncpp.so:
3333
ifeq ($(FLAGS), InstallAll)
3434
cp $(THIRDPART_MODULE_JSONCPP)/libjsoncpp.$(FILEEXT) ../XEngine_Release/
3535
else
36-
make -C $(THIRDPART_MODULE_JSONCPP) PLATFORM=$(PLATFORM) $(FLAGS)
36+
make -C $(THIRDPART_MODULE_JSONCPP) PLATFORM=$(PLATFORM) RELEASE=$(RELEASE) $(FLAGS)
3737
endif
3838
libXEngine_InfoReport.so:
3939
ifeq ($(FLAGS), InstallAll)
4040
cp $(THIRDPART_MODULE_REPORT)/libXEngine_InfoReport.$(FILEEXT) ../XEngine_Release/
4141
else
42-
make -C $(THIRDPART_MODULE_REPORT) PLATFORM=$(PLATFORM) $(FLAGS)
42+
make -C $(THIRDPART_MODULE_REPORT) PLATFORM=$(PLATFORM) RELEASE=$(RELEASE) $(FLAGS)
4343
endif
4444

4545
libXEngine_ModuleConfigure.so:
46-
make -C $(MODULE_CONFIGURE_PATH) $(FLAGS)
46+
make -C $(MODULE_CONFIGURE_PATH) UNICODE=$(UNICODE) PLATFORM=$(PLATFORM) RELEASE=$(RELEASE) $(FLAGS)
4747
libXEngine_ModuleDatabase.so:
48-
make -C $(MODULE_DATABASE_PATH) $(FLAGS)
48+
make -C $(MODULE_DATABASE_PATH) UNICODE=$(UNICODE) PLATFORM=$(PLATFORM) RELEASE=$(RELEASE) $(FLAGS)
4949
libXEngine_ModuleProtocol.so:
50-
make -C $(MODULE_PROTOCOL_PATH) $(FLAGS)
50+
make -C $(MODULE_PROTOCOL_PATH) UNICODE=$(UNICODE) PLATFORM=$(PLATFORM) RELEASE=$(RELEASE) $(FLAGS)
5151

5252
XEngine_CenterApp.exe:
53-
make -C $(APP_CENTER_PATH) $(FLAGS)
53+
make -C $(APP_CENTER_PATH) UNICODE=$(UNICODE) PLATFORM=$(PLATFORM) RELEASE=$(RELEASE) $(FLAGS)
5454
XEngine_HttpApp.exe:
55-
make -C $(APP_HTTP_PATH) $(FLAGS)
55+
make -C $(APP_HTTP_PATH) UNICODE=$(UNICODE) PLATFORM=$(PLATFORM) RELEASE=$(RELEASE) $(FLAGS)
5656
XEngine_Http2App.exe:
57-
make -C $(APP_HTTP2_PATH) $(FLAGS)
57+
make -C $(APP_HTTP2_PATH) UNICODE=$(UNICODE) PLATFORM=$(PLATFORM) RELEASE=$(RELEASE) $(FLAGS)
5858
XEngine_WebSocketApp.exe:
59-
make -C $(APP_WEBSOCKET_PATH) $(FLAGS)
59+
make -C $(APP_WEBSOCKET_PATH) UNICODE=$(UNICODE) PLATFORM=$(PLATFORM) RELEASE=$(RELEASE) $(FLAGS)
6060
XEngine_SimpleApp.exe:
61-
make -C $(APP_SIMPLE_PATH) $(FLAGS)
62-
63-
SetFlags_Install:
64-
export FLAGS=InstallAll
65-
InstallAll:SetFlags_Install $(NETENGINE_LIB)
66-
67-
SetFlags_Clean:
68-
export FLAGS=CleanAll
69-
CleanAll:SetFlags_Clean $(NETENGINE_LIB)
61+
make -C $(APP_SIMPLE_PATH) UNICODE=$(UNICODE) PLATFORM=$(PLATFORM) RELEASE=$(RELEASE) $(FLAGS)

‎XEngine_Source/XEngine_ModuleConfigure/Makefile‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,29 @@ PLATFORM = linux
33
PLATVER =
44
FILEEXT =
55
LIBFLAG =
6-
RELEASE = 0
7-
UNICODE = 0
86
LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
97
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
108
LIB = -ljsoncpp
119
LIBEX =
1210
OBJECTS = ModuleConfigure_Json.o pch.o
1311

1412
ifeq ($(RELEASE),1)
15-
FLAGS = -c
13+
FLAGS = -c -D _RELEASE
1614
DEBUG =
1715
else
1816
ifeq ($(PLATFORM),mac)
1917
FLAGS = -c
20-
DEBUG = -g
18+
DEBUG = -g -D _DEBUG
2119
else
2220
FLAGS = -c -lc_p
23-
DEBUG = -g -pg
21+
DEBUG = -g -pg -D _DEBUG
2422
endif
2523
endif
2624

2725
ifeq ($(UNICODE),1)
28-
UNICODE = -D _UNICODE
26+
override UNICODE := -D __UNICODE__
2927
else
30-
UNICODE =
28+
override UNICODE := -D __ANSI__
3129
endif
3230

3331
ifeq ($(PLATFORM),linux)

‎XEngine_Source/XEngine_ModuleDatabase/Makefile‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,29 @@ PLATFORM = linux
33
PLATVER =
44
FILEEXT =
55
LIBFLAG =
6-
RELEASE = 0
7-
UNICODE = 0
86
LOADHDR = -I ./
97
LOADSO =
108
LIB = -lHelpComponents_DataBase
119
LIBEX =
1210
OBJECTS = ModuleDatabase_MySql.o ModuleDatabase_SQlite.o pch.o
1311

1412
ifeq ($(RELEASE),1)
15-
FLAGS = -c
13+
FLAGS = -c _RELEASE
1614
DEBUG =
1715
else
1816
ifeq ($(PLATFORM),mac)
1917
FLAGS = -c
20-
DEBUG = -g
18+
DEBUG = -g -D _DEBUG
2119
else
2220
FLAGS = -c -lc_p
23-
DEBUG = -g -pg
21+
DEBUG = -g -pg -D _DEBUG
2422
endif
2523
endif
2624

2725
ifeq ($(UNICODE),1)
28-
UNICODE = -D _UNICODE
26+
override UNICODE := -D __UNICODE__
2927
else
30-
UNICODE =
28+
override UNICODE := -D __ANSI__
3129
endif
3230

3331
ifeq ($(PLATFORM),linux)

‎XEngine_Source/XEngine_ModuleProtocol/Makefile‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,29 @@ PLATFORM = linux
33
PLATVER =
44
FILEEXT =
55
LIBFLAG =
6-
RELEASE = 0
7-
UNICODE = 0
86
LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
97
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
108
LIB = -ljsoncpp
119
LIBEX =
1210
OBJECTS = ModuleProtocol_Packet.o ModuleProtocol_Parse.o pch.o
1311

1412
ifeq ($(RELEASE),1)
15-
FLAGS = -c
13+
FLAGS = -c _RELEASE
1614
DEBUG =
1715
else
1816
ifeq ($(PLATFORM),mac)
1917
FLAGS = -c
20-
DEBUG = -g
18+
DEBUG = -g -D _DEBUG
2119
else
2220
FLAGS = -c -lc_p
23-
DEBUG = -g -pg
21+
DEBUG = -g -pg -D _DEBUG
2422
endif
2523
endif
2624

2725
ifeq ($(UNICODE),1)
28-
UNICODE = -D _UNICODE
26+
override UNICODE := -D __UNICODE__
2927
else
30-
UNICODE =
28+
override UNICODE := -D __ANSI__
3129
endif
3230

3331
ifeq ($(PLATFORM),linux)

‎XEngine_Source/XEngine_ServiceApp/XEngine_CenterApp/Makefile‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
CC = g++ -Wall -std=c++17
22
PLATFORM = linux
33
PLATVER =
4-
RELEASE = 0
5-
UNICODE = 0
64
LOADHDR = -I ./
75
LOADSO = -L ../../XEngine_ModuleConfigure -L ../../XEngine_ModuleDatabase -L ../../XEngine_ModuleProtocol \
86
-L ../../XEngine_Depend/XEngine_Module/jsoncpp
@@ -13,22 +11,22 @@ LIBEX =
1311
OBJECTS = XEngine_Configure.o XEngine_Network.o XEngine_CenterTask.o XEngine_CenterApp.o
1412

1513
ifeq ($(RELEASE),1)
16-
FLAGS = -c
14+
FLAGS = -c _RELEASE
1715
DEBUG =
1816
else
1917
ifeq ($(PLATFORM),mac)
2018
FLAGS = -c
21-
DEBUG = -g
19+
DEBUG = -g -D _DEBUG
2220
else
2321
FLAGS = -c -lc_p
24-
DEBUG = -g -pg
22+
DEBUG = -g -pg -D _DEBUG
2523
endif
2624
endif
2725

2826
ifeq ($(UNICODE),1)
29-
UNICODE = -D _UNICODE
27+
override UNICODE := -D __UNICODE__
3028
else
31-
UNICODE =
29+
override UNICODE := -D __ANSI__
3230
endif
3331

3432
ifeq ($(PLATFORM),linux)

‎XEngine_Source/XEngine_ServiceApp/XEngine_HTTP2App/Makefile‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
CC = g++ -Wall -std=c++17
22
PLATFORM = linux
33
PLATVER =
4-
RELEASE = 0
5-
UNICODE = 0
64
LOADHDR = -I ./
75
LOADSO = -L ../../XEngine_ModuleConfigure -L ../../XEngine_ModuleDatabase -L ../../XEngine_ModuleProtocol \
86
-L ../../XEngine_Depend/XEngine_Module/jsoncpp
@@ -13,22 +11,22 @@ LIBEX =
1311
OBJECTS = XEngine_Configure.o XEngine_Network.o XEngine_HTTP2Task.o XEngine_HTTP2App.o
1412

1513
ifeq ($(RELEASE),1)
16-
FLAGS = -c
14+
FLAGS = -c -D _RELEASE
1715
DEBUG =
1816
else
1917
ifeq ($(PLATFORM),mac)
2018
FLAGS = -c
21-
DEBUG = -g
19+
DEBUG = -g -D _DEBUG
2220
else
2321
FLAGS = -c -lc_p
24-
DEBUG = -g -pg
22+
DEBUG = -g -pg -D _DEBUG
2523
endif
2624
endif
2725

2826
ifeq ($(UNICODE),1)
29-
UNICODE = -D _UNICODE
27+
override UNICODE := -D __UNICODE__
3028
else
31-
UNICODE =
29+
override UNICODE := -D __ANSI__
3230
endif
3331

3432
ifeq ($(PLATFORM),linux)

‎XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/Makefile‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
CC = g++ -Wall -std=c++17
22
PLATFORM = linux
33
PLATVER =
4-
RELEASE = 0
5-
UNICODE = 0
64
LOADHDR = -I ./
75
LOADSO = -L ../../XEngine_ModuleConfigure -L ../../XEngine_ModuleDatabase -L ../../XEngine_ModuleProtocol \
86
-L ../../XEngine_Depend/XEngine_Module/jsoncpp
@@ -13,22 +11,22 @@ LIBEX =
1311
OBJECTS = XEngine_Configure.o XEngine_Network.o XEngine_HTTPTask.o XEngine_HttpApp.o
1412

1513
ifeq ($(RELEASE),1)
16-
FLAGS = -c
14+
FLAGS = -c -D _RELEASE
1715
DEBUG =
1816
else
1917
ifeq ($(PLATFORM),mac)
2018
FLAGS = -c
21-
DEBUG = -g
19+
DEBUG = -g -D _DEBUG
2220
else
2321
FLAGS = -c -lc_p
24-
DEBUG = -g -pg
22+
DEBUG = -g -pg -D _DEBUG
2523
endif
2624
endif
2725

2826
ifeq ($(UNICODE),1)
29-
UNICODE = -D _UNICODE
27+
override UNICODE := -D __UNICODE__
3028
else
31-
UNICODE =
29+
override UNICODE := -D __ANSI__
3230
endif
3331

3432
ifeq ($(PLATFORM),linux)

‎XEngine_Source/XEngine_ServiceApp/XEngine_SimpleApp/Makefile‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,29 @@
11
CC = g++ -Wall -std=c++17
22
PLATFORM = linux
33
PLATVER =
4-
RELEASE = 0
5-
UNICODE = 0
64
LOADHDR = -I ./
75
LOADSO =
86
LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool
97
LIBEX =
108
OBJECTS = XEngine_Configure.o XEngine_Network.o XEngine_SimpleApp.o
119

1210
ifeq ($(RELEASE),1)
13-
FLAGS = -c
11+
FLAGS = -c -D _RELEASE
1412
DEBUG =
1513
else
1614
ifeq ($(PLATFORM),mac)
1715
FLAGS = -c
18-
DEBUG = -g
16+
DEBUG = -g -D _DEBUG
1917
else
2018
FLAGS = -c -lc_p
21-
DEBUG = -g -pg
19+
DEBUG = -g -pg -D _DEBUG
2220
endif
2321
endif
2422

2523
ifeq ($(UNICODE),1)
26-
UNICODE = -D _UNICODE
24+
override UNICODE := -D __UNICODE__
2725
else
28-
UNICODE =
26+
override UNICODE := -D __ANSI__
2927
endif
3028

3129
ifeq ($(PLATFORM),linux)

‎XEngine_Source/XEngine_ServiceApp/XEngine_WebSocketApp/Makefile‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
CC = g++ -Wall -std=c++17
22
PLATFORM = linux
33
PLATVER =
4-
RELEASE = 0
5-
UNICODE = 0
64
LOADHDR = -I ./
75
LOADSO = -L ../../XEngine_ModuleConfigure -L ../../XEngine_ModuleDatabase -L ../../XEngine_ModuleProtocol \
86
-L ../../XEngine_Depend/XEngine_Module/jsoncpp
@@ -13,22 +11,22 @@ LIBEX =
1311
OBJECTS = XEngine_Configure.o XEngine_Network.o XEngine_WSTask.o XEngine_WebSocketApp.o
1412

1513
ifeq ($(RELEASE),1)
16-
FLAGS = -c
14+
FLAGS = -c -D _RELEASE
1715
DEBUG =
1816
else
1917
ifeq ($(PLATFORM),mac)
20-
FLAGS = -c
21-
DEBUG = -g
18+
FLAGS = -c
19+
DEBUG = -g -D _DEBUG
2220
else
23-
FLAGS = -c -lc_p
24-
DEBUG = -g -pg
21+
FLAGS = -c -lc_p
22+
DEBUG = -g -pg -D _DEBUG
2523
endif
2624
endif
2725

2826
ifeq ($(UNICODE),1)
29-
UNICODE = -D _UNICODE
27+
override UNICODE := -D __UNICODE__
3028
else
31-
UNICODE =
29+
override UNICODE := -D __ANSI__
3230
endif
3331

3432
ifeq ($(PLATFORM),linux)

0 commit comments

Comments
 (0)