Skip to content

Commit 49b1e0c

Browse files
committed
improved:build mode
1 parent aaaddfb commit 49b1e0c

2 files changed

Lines changed: 25 additions & 6 deletions

File tree

.github/workflows/codeql.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ jobs:
5151
chmod +x ./XEngine_LINEnv.sh
5252
sudo ./XEngine_LINEnv.sh -i 3
5353
54+
- name: make pre
55+
run: |
56+
cd XEngine_Source
57+
make BUILDTYPE=1
58+
5459
- name: Initialize CodeQL
5560
uses: github/codeql-action/init@v4
5661
with:
@@ -59,10 +64,10 @@ jobs:
5964
queries: security-and-quality
6065
config-file: .github/workflows/codeql/codeql-config.yml
6166

62-
- name: make
67+
- name: make check
6368
run: |
6469
cd XEngine_Source
65-
make
70+
make BUILDTYPE=2
6671
6772
- name: Perform CodeQL Analysis
6873
uses: github/codeql-action/analyze@v4

XEngine_Source/Makefile

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
RELEASE = 0
22
UNICODE = 0
33
PLATFORM=linux
4+
BUILDTYPE=0
45
FLAGS=
56

67
THIRD_JSONCPP_PATH = ./XEngine_DependLibrary/XEngine_Module/jsoncpp
@@ -23,9 +24,22 @@ else ifeq ($(PLATFORM),mac)
2324
FILEEXT = dylib
2425
endif
2526

26-
XENGINE_MODULES = libjsoncpp.so libtinyxml2.so libXEngine_InfoReport.so libXEngine_Verification.so \
27-
libStorageModule_Database.so libStorageModule_Config.so libStorageModule_Session.so libStorageModule_APIHelp.so libStorageModule_Protocol.so libStorageModule_BTorrent.so \
28-
XEngine_StorageApp.exe
27+
# 第三方库模块
28+
MODULES_THIRD = libjsoncpp.so libtinyxml2.so libXEngine_InfoReport.so libXEngine_Verification.so
29+
30+
# 业务模块 + 应用
31+
MODULES_STORAGE = libStorageModule_Database.so libStorageModule_Config.so libStorageModule_Session.so \
32+
libStorageModule_APIHelp.so libStorageModule_Protocol.so libStorageModule_BTorrent.so \
33+
XEngine_StorageApp.exe
34+
35+
# 根据 BUILDTYPE 决定编译目标
36+
ifeq ($(BUILDTYPE),0)
37+
XENGINE_MODULES = $(MODULES_THIRD) $(MODULES_STORAGE)
38+
else ifeq ($(BUILDTYPE),1)
39+
XENGINE_MODULES = $(MODULES_THIRD)
40+
else ifeq ($(BUILDTYPE),2)
41+
XENGINE_MODULES = $(MODULES_STORAGE)
42+
endif
2943

3044
.PHONY:MakeAll
3145
MakeAll:$(XENGINE_MODULES)
@@ -69,4 +83,4 @@ libStorageModule_BTorrent.so:
6983
make -C $(BASE_BTORRENT_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
7084

7185
XEngine_StorageApp.exe:
72-
make -C $(APPSERVICE_STORAGE_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
86+
make -C $(APPSERVICE_STORAGE_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)

0 commit comments

Comments
 (0)