Skip to content

Commit 1557093

Browse files
committed
update:workflows/msbuild.yml
update:make file build
1 parent bb8c8c1 commit 1557093

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

.github/workflows/msbuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050

5151
# 配置 MSBuild 的路径,准备构建 VC++ 项目
5252
- name: Setup MSBuild
53-
uses: microsoft/setup-msbuild@v1.0.2
53+
uses: microsoft/setup-msbuild@v2
5454
#编译
5555
- name: Build Solution
5656
run: msbuild XEngine_Source/XEngine.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }}

XEngine_Source/Makefile

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ UNICODE = 0
33
#编译的选项参数
44
FLAGS = RELEASE=$(RELEASE)
55

6+
ifeq ($(PLATFORM),linux)
7+
FILEEXT = so
8+
else ifeq ($(PLATFORM),mac)
9+
FILEEXT = dylib
10+
endif
611
#要编译的模块
712
THIRDPART_MODULE_JSONCPP = ./XEngine_Depend/XEngine_Module/jsoncpp
813
THIRDPART_MODULE_REPORT = ./XEngine_Depend/XEngine_Module/XEngine_InfoReport
@@ -24,9 +29,17 @@ XENGINE_MODULES = libjsoncpp.so libXEngine_InfoReport.so \
2429
MakeAll:$(XENGINE_MODULES)
2530

2631
libjsoncpp.so:
27-
make -C $(THIRDPART_MODULE_JSONCPP) $(FLAGS)
32+
ifeq ($(FLAGS), InstallAll)
33+
cp $(THIRDPART_MODULE_JSONCPP)/libjsoncpp.$(FILEEXT) ../XEngine_Release/
34+
else
35+
make -C $(THIRDPART_MODULE_JSONCPP) PLATFORM=$(PLATFORM) $(FLAGS)
36+
endif
2837
libXEngine_InfoReport.so:
29-
make -C $(THIRDPART_MODULE_REPORT) $(FLAGS)
38+
ifeq ($(FLAGS), InstallAll)
39+
cp $(THIRDPART_MODULE_REPORT)/libXEngine_InfoReport.$(FILEEXT) ../XEngine_Release/
40+
else
41+
make -C $(THIRDPART_MODULE_REPORT) PLATFORM=$(PLATFORM) $(FLAGS)
42+
endif
3043

3144
libXEngine_ModuleConfigure.so:
3245
make -C $(MODULE_CONFIGURE_PATH) $(FLAGS)

0 commit comments

Comments
 (0)