Skip to content

Commit 6b558c0

Browse files
xengine-qytxengine-qyt
committed
update:make file g++ version
improved:make file build flags
1 parent 68084ee commit 6b558c0

File tree

8 files changed

+79
-129
lines changed

8 files changed

+79
-129
lines changed

‎XEngine_Source/Makefile‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,51 +16,50 @@ BASE_BTORRENT_PATH = ./StorageModule_BTorrent
1616

1717
APPSERVICE_STORAGE_PATH = ./XEngine_StorageApp
1818

19-
ifeq ($(PLATFORM),linux)
20-
FILEEXT = so
21-
else ifeq ($(PLATFORM),mac)
22-
FILEEXT = dylib
23-
endif
24-
2519
XENGINE_MODULES = libjsoncpp.so libtinyxml2.so libXEngine_InfoReport.so \
2620
libStorageModule_Database.so libStorageModule_Config.so libStorageModule_Session.so libStorageModule_APIHelp.so libStorageModule_Protocol.so libStorageModule_BTorrent.so \
2721
XEngine_StorageApp.exe
2822

2923
.PHONY:MakeAll
3024
MakeAll:$(XENGINE_MODULES)
3125

32-
26+
ifeq ($(PLATFORM),linux)
27+
FILEEXT = so
28+
else ifeq ($(PLATFORM),mac)
29+
FILEEXT = dylib
30+
endif
31+
3332
libjsoncpp.so:
3433
ifeq ($(FLAGS), InstallAll)
3534
cp $(THIRD_JSONCPP_PATH)/libjsoncpp.$(FILEEXT) ../XEngine_Release/
3635
else
37-
make -C $(THIRD_JSONCPP_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
36+
make -C $(THIRD_JSONCPP_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
3837
endif
3938
libtinyxml2.so:
4039
ifeq ($(FLAGS), InstallAll)
4140
cp $(THIRD_TINYXML_PATH)/libtinyxml2.$(FILEEXT) ../XEngine_Release/
4241
else
43-
make -C $(THIRD_TINYXML_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
42+
make -C $(THIRD_TINYXML_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
4443
endif
4544
libXEngine_InfoReport.so:
4645
ifeq ($(FLAGS), InstallAll)
4746
cp $(THIRD_REPORT_PATH)/libXEngine_InfoReport.$(FILEEXT) ../XEngine_Release/
4847
else
49-
make -C $(THIRD_REPORT_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
48+
make -C $(THIRD_REPORT_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
5049
endif
5150

5251
libStorageModule_Database.so:
53-
make -C $(BASE_SQL_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
52+
make -C $(BASE_SQL_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
5453
libStorageModule_Config.so:
55-
make -C $(BASE_CONFIG_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
54+
make -C $(BASE_CONFIG_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
5655
libStorageModule_Session.so:
57-
make -C $(BASE_SESSION_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
56+
make -C $(BASE_SESSION_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
5857
libStorageModule_APIHelp.so:
59-
make -C $(BASE_APIHELP_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
58+
make -C $(BASE_APIHELP_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
6059
libStorageModule_Protocol.so:
61-
make -C $(BASE_PROTOCOL_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
60+
make -C $(BASE_PROTOCOL_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
6261
libStorageModule_BTorrent.so:
63-
make -C $(BASE_BTORRENT_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
62+
make -C $(BASE_BTORRENT_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
6463

6564
XEngine_StorageApp.exe:
66-
make -C $(APPSERVICE_STORAGE_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
65+
make -C $(APPSERVICE_STORAGE_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)

‎XEngine_Source/StorageModule_APIHelp/Makefile‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,37 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
2-
PLATFORM = linux
1+
CC = g++ -Wall -std=c++20 -fPIC
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 = -lXEngine_BaseLib -lXEngine_Cryption -lRfcComponents_HttpProtocol -lXEngine_SystemApi -ljsoncpp
128
LIBEX =
139
OBJECTS = APIHelp_Distributed.o APIHelp_Api.o APIHelp_Cryption.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/StorageModule_BTorrent/Makefile‎

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
2-
PLATFORM = linux
1+
CC = g++ -Wall -std=c++20 -fPIC
32
PLATVER =
4-
PLATDIR =
53
FILEEXT =
64
LIBFLAG =
7-
RELEASE = 0
8-
UNICODE = 0
95
LOADHDR = -I ./
106
LIB = -lXEngine_BaseLib
117
LIBEX =
@@ -18,13 +14,30 @@ ifeq ($(MACRO_VALUE),1)
1814
LIB += -ltorrent-rasterbar
1915
endif
2016

17+
ifeq ($(RELEASE),1)
18+
FLAGS = -c -D _RELEASE
19+
DEBUG = -O2
20+
else
21+
ifeq ($(PLATFORM),mac)
22+
FLAGS = -c
23+
DEBUG = -g -D _DEBUG
24+
else
25+
FLAGS = -c -lc_p
26+
DEBUG = -g -pg -D _DEBUG
27+
endif
28+
endif
29+
30+
ifeq ($(UNICODE),1)
31+
override UNICODE := -D __UNICODE__
32+
else
33+
override UNICODE := -D __ANSI__
34+
endif
35+
2136
ifeq ($(PLATFORM),linux)
2237
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
2338
PLATVER = -D __CENTOS__
24-
PLATDIR = XEngine_Linux/Centos
2539
else
2640
PLATVER = -D __UBUNTU__
27-
PLATDIR = XEngine_Linux/Ubuntu
2841
endif
2942
FILEEXT = so
3043
LIBFLAG = -shared
@@ -33,32 +46,12 @@ ifeq ($(PLATFORM),linux)
3346
else ifeq ($(PLATFORM),mac)
3447
CC += -Wno-deprecated-declarations
3548
PLATVER = -D __MACOS__
36-
PLATDIR = XEngine_Mac
3749
FILEEXT = dylib
3850
LIBFLAG = -dynamiclib
3951
LIBEX = -lpthread -ldl
4052
LOADBIN = -Wl,-rpath,@loader_path/../XEngine_BaseLib/
4153
endif
4254

43-
ifeq ($(RELEASE),1)
44-
FLAGS = -c
45-
DEBUG =
46-
else
47-
ifeq ($(PLATFORM),mac)
48-
FLAGS = -c
49-
DEBUG = -g
50-
else
51-
FLAGS = -c -lc_p
52-
DEBUG = -g -pg
53-
endif
54-
endif
55-
56-
ifeq ($(UNICODE),1)
57-
UNICODE = -D _UNICODE
58-
else
59-
UNICODE =
60-
endif
61-
6255
all:$(OBJECTS)
6356
$(CC) $(DEBUG) $(OBJECTS) -o libStorageModule_BTorrent.$(FILEEXT) $(LIBFLAG) $(LIB) $(LIBEX) $(LOADSO) $(LOADBIN)
6457

‎XEngine_Source/StorageModule_Config/Makefile‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,37 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
2-
PLATFORM = linux
3-
PLATVER =
4-
PLATDIR =
1+
CC = g++ -Wall -std=c++20 -fPIC
2+
PLATVER =
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 = Config_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/StorageModule_Database/Makefile‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,37 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
2-
PLATFORM = linux
1+
CC = g++ -Wall -std=c++20 -fPIC
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_Cryption -lHelpComponents_DataBase -lXEngine_SystemApi
128
LIBEX =
139
OBJECTS = Database_File.o Database_Memory.o Database_Help.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/StorageModule_Protocol/Makefile‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,37 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
2-
PLATFORM = linux
1+
CC = g++ -Wall -std=c++20 -fPIC
32
PLATVER =
4-
PLATDIR =
53
FILEEXT =
64
LIBFLAG =
7-
RELEASE = 0
8-
UNICODE = 0
95
LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp -I ../XEngine_Depend/XEngine_Module/tinyxml2
106
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp -L ../XEngine_Depend/XEngine_Module/tinyxml2 -L ../StorageModule_Session -L ../StorageModule_APIHelp
117
LIB = -lXEngine_BaseLib -lXEngine_SystemApi -ljsoncpp -ltinyxml2 -lStorageModule_Session -lStorageModule_APIHelp
128
LIBEX =
139
OBJECTS = Protocol_StoragePacket.o Protocol_StorageParse.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

0 commit comments

Comments
 (0)