Skip to content

Commit e02ec7a

Browse files
xengine-qytxengine-qyt
committed
improved:make file build flags
1 parent 0eaf1bc commit e02ec7a

13 files changed

Lines changed: 106 additions & 192 deletions

File tree

‎XEngine_Source/Makefile‎

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@ APIMODULE_IPMAC_PATH = ./XEngine_DBDepend/XEngine_IPMacData/XEngine_Source/XEngi
2525

2626
APP_HTTP_PATH = ./XEngine_ServiceApp/XEngine_HttpApp
2727

28-
ifeq ($(PLATFORM),linux)
29-
FILEEXT = so
30-
else ifeq ($(PLATFORM),mac)
31-
FILEEXT = dylib
32-
endif
33-
3428
XENGINE_MODULES = libjsoncpp.so libXEngine_InfoReport.so \
3529
libXEngine_ModuleConfigure.so libXEngine_ModuleDatabase.so libXEngine_ModuleProtocol.so libXEngine_ModuleSystem.so libXEngine_ModuleHelp.so libXEngine_ModulePlugin.so \
3630
libModulePlugin_Zodiac.so libModulePlugin_Password.so libModulePlugin_Timezone.so libModulePlugin_BMIndex.so libModulePlugin_Meter.so \
@@ -40,55 +34,60 @@ XENGINE_MODULES = libjsoncpp.so libXEngine_InfoReport.so \
4034
.PHONY:MakeAll
4135
MakeAll:$(XENGINE_MODULES)
4236

43-
libXEngine_ModuleConfigure.so:
44-
make -C $(MODULE_CONFIGURE_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
45-
libXEngine_ModuleDatabase.so:
46-
make -C $(MODULE_DATABASE_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
47-
libXEngine_ModuleProtocol.so:
48-
make -C $(MODULE_PROTOCOL_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
49-
libXEngine_ModuleSystem.so:
50-
make -C $(MODULE_SYSTEM_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
51-
libXEngine_ModuleHelp.so:
52-
make -C $(MODULE_HELP_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
53-
libXEngine_ModulePlugin.so:
54-
make -C $(MODULE_PLUGIN_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
55-
56-
libModulePlugin_Zodiac.so:
57-
make -C $(PLUGIN_MODULE_ZODIAC) PLATFORM=$(PLATFORM) $(FLAGS)
58-
libModulePlugin_Password.so:
59-
make -C $(PLUGIN_MODULE_PASSWORD) PLATFORM=$(PLATFORM) $(FLAGS)
60-
libModulePlugin_Timezone.so:
61-
make -C $(PLUGIN_MODULE_TIMEZONE) PLATFORM=$(PLATFORM) $(FLAGS)
62-
libModulePlugin_BMIndex.so:
63-
make -C $(PLUGIN_MODULE_BMINDEX) PLATFORM=$(PLATFORM) $(FLAGS)
64-
libModulePlugin_Meter.so:
65-
make -C $(PLUGIN_MODULE_METER) PLATFORM=$(PLATFORM) $(FLAGS)
37+
ifeq ($(PLATFORM),linux)
38+
FILEEXT = so
39+
else ifeq ($(PLATFORM),mac)
40+
FILEEXT = dylib
41+
endif
6642

6743
libjsoncpp.so:
6844
ifeq ($(FLAGS), InstallAll)
6945
cp $(THIRDPART_MODULE_JSONCPP)/libjsoncpp.$(FILEEXT) ../XEngine_Release/
7046
else
71-
make -C $(THIRDPART_MODULE_JSONCPP) PLATFORM=$(PLATFORM) $(FLAGS)
47+
make -C $(THIRDPART_MODULE_JSONCPP) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
7248
endif
7349
libXEngine_InfoReport.so:
7450
ifeq ($(FLAGS), InstallAll)
7551
cp $(THIRDPART_MODULE_REPORT)/libXEngine_InfoReport.$(FILEEXT) ../XEngine_Release/
7652
else
77-
make -C $(THIRDPART_MODULE_REPORT) PLATFORM=$(PLATFORM) $(FLAGS)
53+
make -C $(THIRDPART_MODULE_REPORT) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
7854
endif
79-
8055
libXEngine_APIModulePhone.so:
8156
ifeq ($(FLAGS), InstallAll)
8257
cp $(APIMODULE_PHONE_PATH)/libXEngine_APIModulePhone.$(FILEEXT) ../XEngine_Release/
8358
else
84-
make -C $(APIMODULE_PHONE_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
59+
make -C $(APIMODULE_PHONE_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
8560
endif
8661
libXEngine_APIModuleIPMac.so:
8762
ifeq ($(FLAGS), InstallAll)
8863
cp $(APIMODULE_IPMAC_PATH)/libXEngine_APIModuleIPMac.$(FILEEXT) ../XEngine_Release/
8964
else
90-
make -C $(APIMODULE_IPMAC_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
65+
make -C $(APIMODULE_IPMAC_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
9166
endif
67+
68+
libXEngine_ModuleConfigure.so:
69+
make -C $(MODULE_CONFIGURE_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
70+
libXEngine_ModuleDatabase.so:
71+
make -C $(MODULE_DATABASE_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
72+
libXEngine_ModuleProtocol.so:
73+
make -C $(MODULE_PROTOCOL_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
74+
libXEngine_ModuleSystem.so:
75+
make -C $(MODULE_SYSTEM_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
76+
libXEngine_ModuleHelp.so:
77+
make -C $(MODULE_HELP_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
78+
libXEngine_ModulePlugin.so:
79+
make -C $(MODULE_PLUGIN_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
80+
81+
libModulePlugin_Zodiac.so:
82+
make -C $(PLUGIN_MODULE_ZODIAC) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
83+
libModulePlugin_Password.so:
84+
make -C $(PLUGIN_MODULE_PASSWORD) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
85+
libModulePlugin_Timezone.so:
86+
make -C $(PLUGIN_MODULE_TIMEZONE) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
87+
libModulePlugin_BMIndex.so:
88+
make -C $(PLUGIN_MODULE_BMINDEX) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
89+
libModulePlugin_Meter.so:
90+
make -C $(PLUGIN_MODULE_METER) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
9291

9392
XEngine_HttpApp.exe:
94-
make -C $(APP_HTTP_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
93+
make -C $(APP_HTTP_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_ModuleDatabase/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 -lHelpComponents_DataBase
128
LIBEX =
139
OBJECTS = ModuleDatabase_IDCard.o ModuleDatabase_Bank.o ModuleDatabase_ZIPCode.o ModuleDatabase_XLog.o ModuleDatabase_ShortLink.o ModuleDatabase_WordFilter.o ModuleDatabase_Machine.o ModuleDatabase_OilInfo.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 ./ -I /usr/include/opencv4 -I /usr/local/include/opencv4 -I /usr/local/include/lua
106
LOADSO =
117
LIB = -lXEngine_BaseLib -lXClient_Socket -lNetHelp_APIAddr
@@ -23,31 +19,29 @@ ifeq ($(MACRO_OPENCV_SUPPORT),1)
2319
endif
2420

2521
ifeq ($(RELEASE),1)
26-
FLAGS = -c
27-
DEBUG =
22+
FLAGS = -c -D _RELEASE
23+
DEBUG = -O2
2824
else
2925
ifeq ($(PLATFORM),mac)
3026
FLAGS = -c
31-
DEBUG = -g
27+
DEBUG = -g -D _DEBUG
3228
else
3329
FLAGS = -c -lc_p
34-
DEBUG = -g -pg
30+
DEBUG = -g -pg -D _DEBUG
3531
endif
3632
endif
3733

3834
ifeq ($(UNICODE),1)
39-
UNICODE = -D _UNICODE
35+
override UNICODE := -D __UNICODE__
4036
else
41-
UNICODE =
37+
override UNICODE := -D __ANSI__
4238
endif
4339

4440
ifeq ($(PLATFORM),linux)
4541
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
4642
PLATVER = -D __CENTOS__
47-
PLATDIR = XEngine_Linux/Centos
4843
else
4944
PLATVER = -D __UBUNTU__
50-
PLATDIR = XEngine_Linux/Ubuntu
5145
endif
5246
FILEEXT = so
5347
LIBFLAG = -shared
@@ -56,7 +50,6 @@ ifeq ($(PLATFORM),linux)
5650
else ifeq ($(PLATFORM),mac)
5751
CC += -Wno-deprecated-declarations
5852
PLATVER = -D __MACOS__
59-
PLATDIR = XEngine_Mac
6053
FILEEXT = dylib
6154
LOADHDR += -I /opt/homebrew/opt/leptonica/include -I /opt/homebrew/opt/opencv/include/opencv4 -I /opt/homebrew/opt/tesseract/include -I /opt/homebrew/opt/qrencode/include
6255
LOADSO += -L /opt/homebrew/opt/leptonica/lib -L /opt/homebrew/opt/opencv/lib -L /opt/homebrew/opt/tesseract/lib -L /opt/homebrew/opt/qrencode/lib

‎XEngine_Source/XEngine_ModulePlugin/Makefile‎

Lines changed: 6 additions & 16 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 ./ -I /usr/include/lua5.4 -I /usr/local/include/lua
106
LOADSO =
117
LIB = -lXEngine_BaseLib
@@ -15,32 +11,30 @@ OBJECTS = ModulePlugin_LibCore.o ModulePlugin_LuaCore.o ModulePlugin_Loader.o pc
1511
MACRO_LUA_SUPPORT := $(shell gcc -E -dM ../XEngine_BuildSwitch.h | grep _XENGINE_BUILD_SWITCH_LUA | cut -d ' ' -f 3)
1612

1713
ifeq ($(RELEASE),1)
18-
FLAGS = -c
19-
DEBUG =
14+
FLAGS = -c -D _RELEASE
15+
DEBUG = -O2
2016
else
2117
ifeq ($(PLATFORM),mac)
2218
FLAGS = -c
23-
DEBUG = -g
19+
DEBUG = -g -D _DEBUG
2420
else
2521
FLAGS = -c -lc_p
26-
DEBUG = -g -pg
22+
DEBUG = -g -pg -D _DEBUG
2723
endif
2824
endif
2925

3026
ifeq ($(UNICODE),1)
31-
UNICODE = -D _UNICODE
27+
override UNICODE := -D __UNICODE__
3228
else
33-
UNICODE =
29+
override UNICODE := -D __ANSI__
3430
endif
3531

3632
ifeq ($(PLATFORM),linux)
3733
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
3834
PLATVER = -D __CENTOS__
39-
PLATDIR = XEngine_Linux/Centos
4035
LIB += -llua
4136
else
4237
PLATVER = -D __UBUNTU__
43-
PLATDIR = XEngine_Linux/Ubuntu
4438
LIB += -llua5.4
4539
endif
4640
FILEEXT = so
@@ -50,21 +44,17 @@ ifeq ($(PLATFORM),linux)
5044
else ifeq ($(PLATFORM),mac)
5145
CC += -Wno-deprecated-declarations
5246
PLATVER = -D __MACOS__
53-
PLATDIR = XEngine_Mac
5447
FILEEXT = dylib
5548
LIBFLAG = -dynamiclib
56-
5749
LOADHDR += -I /opt/homebrew/opt/lua/include/lua
5850
LOADSO += -L /opt/homebrew/opt/lua/lib
59-
6051
ifeq ($(MACRO_LUA_SUPPORT),1)
6152
LIB += -llua
6253
endif
6354
LIBEX = -lpthread -ldl
6455
LOADBIN = -Wl,-rpath,@loader_path/./
6556
endif
6657

67-
6858
all:$(OBJECTS)
6959
$(CC) $(DEBUG) $(OBJECTS) -o libXEngine_ModulePlugin.$(FILEEXT) $(LIBFLAG) $(LIB) $(LIBEX) $(LOADSO) $(LOADBIN)
7060

0 commit comments

Comments
 (0)