Skip to content

Commit 941e1d2

Browse files
committed
update:workflows/msbuild.yml
update:make file ext module name
1 parent 4adfa5b commit 941e1d2

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
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_MQServiceApp.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }}

XEngine_Source/Makefile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,23 @@ XENGINE_MODULES = libjsoncpp.so libXEngine_InfoReport.so \
2020
.PHONY:MakeAll
2121
MakeAll:$(XENGINE_MODULES)
2222

23+
ifeq ($(PLATFORM),linux)
24+
FILEEXT = so
25+
else ifeq ($(PLATFORM),mac)
26+
FILEEXT = dylib
27+
endif
2328
libjsoncpp.so:
29+
ifeq ($(FLAGS), InstallAll)
30+
cp $(BASE_THIRDPART_JSONCPP)/libjsoncpp.$(FILEEXT) ../XEngine_Release/
31+
else
2432
make -C $(BASE_THIRDPART_JSONCPP) PLATFORM=$(PLATFORM) $(FLAGS)
33+
endif
2534
libXEngine_InfoReport.so:
35+
ifeq ($(FLAGS), InstallAll)
36+
cp $(BASE_THIRDPART_REPORT)/libXEngine_InfoReport.$(FILEEXT) ../XEngine_Release/
37+
else
2638
make -C $(BASE_THIRDPART_REPORT) PLATFORM=$(PLATFORM) $(FLAGS)
39+
endif
2740

2841
libMQCore_ConfigModule.so:
2942
make -C $(BASE_CONFIG_PATH) PLATFORM=$(PLATFORM) $(FLAGS)

0 commit comments

Comments
 (0)