Skip to content

Commit f2d1f55

Browse files
xengine-qytxengine-qyt
committed
update:make file build flags
1 parent 0c09f44 commit f2d1f55

File tree

9 files changed

+102
-101
lines changed

9 files changed

+102
-101
lines changed

‎.github/workflows/macbuild.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ jobs:
3535
git submodule init
3636
git submodule update
3737
38+
- name: Set TERM variable
39+
run: echo "TERM=xterm" >> $GITHUB_ENV
40+
3841
- name: brew install
3942
run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
4043

‎XEngine_Source/MQCore_ConfigModule/Makefile‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,37 @@
11
CC = g++ -Wall -std=c++20 -fPIC
2-
PLATFORM = linux
32
PLATVER =
4-
PLATDIR =
53
FILEEXT =
64
LIBFLAG =
7-
RELEASE = 0
85
LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
96
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
107
LIB = -ljsoncpp
118
LIBEX =
129
OBJECTS = Config_Json.o pch.o
1310

1411
ifeq ($(RELEASE),1)
15-
FLAGS = -c
16-
DEBUG =
12+
FLAGS = -c -D _RELEASE
13+
DEBUG = -O2
1714
else
1815
ifeq ($(PLATFORM),mac)
1916
FLAGS = -c
20-
DEBUG = -g
17+
DEBUG = -g -D _DEBUG
2118
else
2219
FLAGS = -c -lc_p
23-
DEBUG = -g -pg
20+
DEBUG = -g -pg -D _DEBUG
2421
endif
2522
endif
2623

24+
ifeq ($(UNICODE),1)
25+
override UNICODE := -D __UNICODE__
26+
else
27+
override UNICODE := -D __ANSI__
28+
endif
29+
2730
ifeq ($(PLATFORM),linux)
2831
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
2932
PLATVER = -D __CENTOS__
30-
PLATDIR = XEngine_Linux/Centos
3133
else
3234
PLATVER = -D __UBUNTU__
33-
PLATDIR = XEngine_Linux/Ubuntu
3435
endif
3536
FILEEXT = so
3637
LIBFLAG = -shared
@@ -39,7 +40,6 @@ ifeq ($(PLATFORM),linux)
3940
else ifeq ($(PLATFORM),mac)
4041
CC += -Wno-deprecated-declarations
4142
PLATVER = -D __MACOS__
42-
PLATDIR = XEngine_Mac
4343
FILEEXT = dylib
4444
LIBFLAG = -dynamiclib
4545
LIBEX = -lpthread -ldl
@@ -51,10 +51,10 @@ all:$(OBJECTS)
5151
$(CC) $(DEBUG) $(OBJECTS) -o libMQCore_ConfigModule.$(FILEEXT) $(LIBFLAG) $(LIB) $(LIBEX) $(LOADSO) $(LOADBIN)
5252

5353
Config_Json.o:./Config_Json/Config_Json.cpp
54-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./Config_Json/Config_Json.cpp
54+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./Config_Json/Config_Json.cpp
5555

5656
pch.o:./pch.cpp
57-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./pch.cpp
57+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./pch.cpp
5858

5959

6060
InstallAll:InstallSo

‎XEngine_Source/MQCore_DBModule/Makefile‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,37 @@
11
CC = g++ -Wall -std=c++20 -fPIC
2-
PLATFORM = linux
32
PLATVER =
4-
PLATDIR =
53
FILEEXT =
64
LIBFLAG =
7-
RELEASE = 0
85
LOADHDR = -I ./
96
LOADSO = -L ../MQCore_MemoryCache
107
LIB = -lXEngine_BaseLib -lHelpComponents_DataBase -lMQCore_MemoryCache
118
LIBEX =
129
OBJECTS = DBModule_MQData.o DBModule_MQUser.o pch.o
1310

1411
ifeq ($(RELEASE),1)
15-
FLAGS = -c
16-
DEBUG =
12+
FLAGS = -c -D _RELEASE
13+
DEBUG = -O2
1714
else
1815
ifeq ($(PLATFORM),mac)
1916
FLAGS = -c
20-
DEBUG = -g
17+
DEBUG = -g -D _DEBUG
2118
else
2219
FLAGS = -c -lc_p
23-
DEBUG = -g -pg
20+
DEBUG = -g -pg -D _DEBUG
2421
endif
2522
endif
2623

24+
ifeq ($(UNICODE),1)
25+
override UNICODE := -D __UNICODE__
26+
else
27+
override UNICODE := -D __ANSI__
28+
endif
29+
2730
ifeq ($(PLATFORM),linux)
2831
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
2932
PLATVER = -D __CENTOS__
30-
PLATDIR = XEngine_Linux/Centos
3133
else
3234
PLATVER = -D __UBUNTU__
33-
PLATDIR = XEngine_Linux/Ubuntu
3435
endif
3536
FILEEXT = so
3637
LIBFLAG = -shared
@@ -39,7 +40,6 @@ ifeq ($(PLATFORM),linux)
3940
else ifeq ($(PLATFORM),mac)
4041
CC += -Wno-deprecated-declarations
4142
PLATVER = -D __MACOS__
42-
PLATDIR = XEngine_Mac
4343
FILEEXT = dylib
4444
LIBFLAG = -dynamiclib
4545
LIBEX = -lpthread -ldl
@@ -51,12 +51,12 @@ all:$(OBJECTS)
5151
$(CC) $(DEBUG) $(OBJECTS) -o libMQCore_DBModule.$(FILEEXT) $(LIBFLAG) $(LIB) $(LIBEX) $(LOADSO) $(LOADBIN)
5252

5353
DBModule_MQData.o:./DBModule_MQData/DBModule_MQData.cpp
54-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./DBModule_MQData/DBModule_MQData.cpp
54+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./DBModule_MQData/DBModule_MQData.cpp
5555
DBModule_MQUser.o:./DBModule_MQUser/DBModule_MQUser.cpp
56-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./DBModule_MQUser/DBModule_MQUser.cpp
56+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./DBModule_MQUser/DBModule_MQUser.cpp
5757

5858
pch.o:./pch.cpp
59-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./pch.cpp
59+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./pch.cpp
6060

6161

6262
InstallAll:InstallSo

‎XEngine_Source/MQCore_HelpModule/Makefile‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,37 @@
11
CC = g++ -Wall -std=c++20 -fPIC
2-
PLATFORM = linux
32
PLATVER =
4-
PLATDIR =
53
FILEEXT =
64
LIBFLAG =
7-
RELEASE = 0
85
LOADHDR = -I ./
96
LOADSO =
107
LIB =
118
LIBEX =
129
OBJECTS = APIHelp_Counter.o pch.o
1310

1411
ifeq ($(RELEASE),1)
15-
FLAGS = -c
16-
DEBUG =
12+
FLAGS = -c -D _RELEASE
13+
DEBUG = -O2
1714
else
1815
ifeq ($(PLATFORM),mac)
1916
FLAGS = -c
20-
DEBUG = -g
17+
DEBUG = -g -D _DEBUG
2118
else
2219
FLAGS = -c -lc_p
23-
DEBUG = -g -pg
20+
DEBUG = -g -pg -D _DEBUG
2421
endif
2522
endif
2623

24+
ifeq ($(UNICODE),1)
25+
override UNICODE := -D __UNICODE__
26+
else
27+
override UNICODE := -D __ANSI__
28+
endif
29+
2730
ifeq ($(PLATFORM),linux)
2831
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
2932
PLATVER = -D __CENTOS__
30-
PLATDIR = XEngine_Linux/Centos
3133
else
3234
PLATVER = -D __UBUNTU__
33-
PLATDIR = XEngine_Linux/Ubuntu
3435
endif
3536
FILEEXT = so
3637
LIBFLAG = -shared
@@ -39,7 +40,6 @@ ifeq ($(PLATFORM),linux)
3940
else ifeq ($(PLATFORM),mac)
4041
CC += -Wno-deprecated-declarations
4142
PLATVER = -D __MACOS__
42-
PLATDIR = XEngine_Mac
4343
FILEEXT = dylib
4444
LIBFLAG = -dynamiclib
4545
LIBEX = -lpthread -ldl
@@ -51,10 +51,10 @@ all:$(OBJECTS)
5151
$(CC) $(DEBUG) $(OBJECTS) -o libMQCore_HelpModule.$(FILEEXT) $(LIBFLAG) $(LIB) $(LIBEX) $(LOADSO) $(LOADBIN)
5252

5353
APIHelp_Counter.o:./APIHelp_Counter/APIHelp_Counter.cpp
54-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./APIHelp_Counter/APIHelp_Counter.cpp
54+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./APIHelp_Counter/APIHelp_Counter.cpp
5555

5656
pch.o:./pch.cpp
57-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./pch.cpp
57+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./pch.cpp
5858

5959

6060
InstallAll:InstallSo

‎XEngine_Source/MQCore_MemoryCache/Makefile‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,37 @@
11
CC = g++ -Wall -std=c++20 -fPIC
2-
PLATFORM = linux
32
PLATVER =
4-
PLATDIR =
53
FILEEXT =
64
LIBFLAG =
7-
RELEASE = 0
85
LOADHDR = -I ./
96
LOADSO =
107
LIB = -lHelpComponents_DataBase
118
LIBEX =
129
OBJECTS = MemoryCache_DBData.o MemoryCache_DBUser.o pch.o
1310

1411
ifeq ($(RELEASE),1)
15-
FLAGS = -c
16-
DEBUG =
12+
FLAGS = -c -D _RELEASE
13+
DEBUG = -O2
1714
else
1815
ifeq ($(PLATFORM),mac)
1916
FLAGS = -c
20-
DEBUG = -g
17+
DEBUG = -g -D _DEBUG
2118
else
2219
FLAGS = -c -lc_p
23-
DEBUG = -g -pg
20+
DEBUG = -g -pg -D _DEBUG
2421
endif
2522
endif
2623

24+
ifeq ($(UNICODE),1)
25+
override UNICODE := -D __UNICODE__
26+
else
27+
override UNICODE := -D __ANSI__
28+
endif
29+
2730
ifeq ($(PLATFORM),linux)
2831
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
2932
PLATVER = -D __CENTOS__
30-
PLATDIR = XEngine_Linux/Centos
3133
else
3234
PLATVER = -D __UBUNTU__
33-
PLATDIR = XEngine_Linux/Ubuntu
3435
endif
3536
FILEEXT = so
3637
LIBFLAG = -shared
@@ -39,7 +40,6 @@ ifeq ($(PLATFORM),linux)
3940
else ifeq ($(PLATFORM),mac)
4041
CC += -Wno-deprecated-declarations
4142
PLATVER = -D __MACOS__
42-
PLATDIR = XEngine_Mac
4343
FILEEXT = dylib
4444
LIBFLAG = -dynamiclib
4545
LIBEX = -lpthread -ldl
@@ -51,12 +51,12 @@ all:$(OBJECTS)
5151
$(CC) $(DEBUG) $(OBJECTS) -o libMQCore_MemoryCache.$(FILEEXT) $(LIBFLAG) $(LIB) $(LIBEX) $(LOADSO) $(LOADBIN)
5252

5353
MemoryCache_DBData.o:./MemoryCache_DBData/MemoryCache_DBData.cpp
54-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./MemoryCache_DBData/MemoryCache_DBData.cpp
54+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./MemoryCache_DBData/MemoryCache_DBData.cpp
5555
MemoryCache_DBUser.o:./MemoryCache_DBUser/MemoryCache_DBUser.cpp
56-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./MemoryCache_DBUser/MemoryCache_DBUser.cpp
56+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./MemoryCache_DBUser/MemoryCache_DBUser.cpp
5757

5858
pch.o:./pch.cpp
59-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./pch.cpp
59+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./pch.cpp
6060

6161

6262
InstallAll:InstallSo

‎XEngine_Source/MQCore_ProtocolModule/Makefile‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,37 @@
11
CC = g++ -Wall -std=c++20 -fPIC
2-
PLATFORM = linux
32
PLATVER =
4-
PLATDIR =
53
FILEEXT =
64
LIBFLAG =
7-
RELEASE = 0
85
LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
96
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
107
LIB = -ljsoncpp -lXEngine_BaseLib -lXEngine_Cryption -lRfcComponents_MQTTProtocol
118
LIBEX =
129
OBJECTS = ProtocolModule_Packet.o ProtocolModule_Parse.o pch.o
1310

1411
ifeq ($(RELEASE),1)
15-
FLAGS = -c
16-
DEBUG =
12+
FLAGS = -c -D _RELEASE
13+
DEBUG = -O2
1714
else
1815
ifeq ($(PLATFORM),mac)
1916
FLAGS = -c
20-
DEBUG = -g
17+
DEBUG = -g -D _DEBUG
2118
else
2219
FLAGS = -c -lc_p
23-
DEBUG = -g -pg
20+
DEBUG = -g -pg -D _DEBUG
2421
endif
2522
endif
2623

24+
ifeq ($(UNICODE),1)
25+
override UNICODE := -D __UNICODE__
26+
else
27+
override UNICODE := -D __ANSI__
28+
endif
29+
2730
ifeq ($(PLATFORM),linux)
2831
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
2932
PLATVER = -D __CENTOS__
30-
PLATDIR = XEngine_Linux/Centos
3133
else
3234
PLATVER = -D __UBUNTU__
33-
PLATDIR = XEngine_Linux/Ubuntu
3435
endif
3536
FILEEXT = so
3637
LIBFLAG = -shared
@@ -39,7 +40,6 @@ ifeq ($(PLATFORM),linux)
3940
else ifeq ($(PLATFORM),mac)
4041
CC += -Wno-deprecated-declarations
4142
PLATVER = -D __MACOS__
42-
PLATDIR = XEngine_Mac
4343
FILEEXT = dylib
4444
LIBFLAG = -dynamiclib
4545
LIBEX = -lpthread -ldl
@@ -51,12 +51,12 @@ all:$(OBJECTS)
5151
$(CC) $(DEBUG) $(OBJECTS) -o libMQCore_ProtocolModule.$(FILEEXT) $(LIBFLAG) $(LIB) $(LIBEX) $(LOADSO) $(LOADBIN)
5252

5353
ProtocolModule_Packet.o:./ProtocolModule_Packet/ProtocolModule_Packet.cpp
54-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./ProtocolModule_Packet/ProtocolModule_Packet.cpp
54+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./ProtocolModule_Packet/ProtocolModule_Packet.cpp
5555
ProtocolModule_Parse.o:./ProtocolModule_Parse/ProtocolModule_Parse.cpp
56-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./ProtocolModule_Parse/ProtocolModule_Parse.cpp
56+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./ProtocolModule_Parse/ProtocolModule_Parse.cpp
5757

5858
pch.o:./pch.cpp
59-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./pch.cpp
59+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./pch.cpp
6060

6161

6262
InstallAll:InstallSo

0 commit comments

Comments
 (0)