Merge pull request #41 from libxengine/develop

make file update
libxengine · Sep 23, 2024 · e769e15 · e769e15
2 parents dfc89bd + 437b6ed
commit e769e15
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
@@ -50,7 +50,7 @@ jobs:
 
  # 配置 MSBuild 的路径，准备构建 VC++ 项目
  - name: Setup MSBuild
- uses: microsoft/setup-msbuild@v1.0.2
+ uses: microsoft/setup-msbuild@v2
  #编译
  - name: Build Solution
  run: msbuild XEngine_Source/XEngine_MQServiceApp.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }}

diff --git a/XEngine_Source/Makefile b/XEngine_Source/Makefile
@@ -13,17 +13,32 @@ BASE_SESSION_PATH = ./MQCore_SessionModule
 
 APP_SERVICE_PATH = ./XEngine_MQServiceApp
 
+ifeq ($(PLATFORM),linux)
+ FILEEXT = so
+else ifeq ($(PLATFORM),mac)
+ FILEEXT = dylib
+endif
+
 XENGINE_MODULES = libjsoncpp.so libXEngine_InfoReport.so \
  libMQCore_ConfigModule.so libMQCore_ProtocolModule.so libMQCore_SessionModule.so libMQCore_DBModule.so \
  XEngine_MQServiceApp.exe 
 
 .PHONY:MakeAll 
 MakeAll:$(XENGINE_MODULES)
 
+
 libjsoncpp.so:
+ifeq ($(FLAGS), InstallAll)
+ cp $(BASE_THIRDPART_JSONCPP)/libjsoncpp.$(FILEEXT) ../XEngine_Release/
+else
  make -C $(BASE_THIRDPART_JSONCPP) PLATFORM=$(PLATFORM) $(FLAGS)
+endif
 libXEngine_InfoReport.so:
+ifeq ($(FLAGS), InstallAll)
+ cp $(BASE_THIRDPART_REPORT)/libXEngine_InfoReport.$(FILEEXT) ../XEngine_Release/
+else
  make -C $(BASE_THIRDPART_REPORT) PLATFORM=$(PLATFORM) $(FLAGS)
+endif
 
 libMQCore_ConfigModule.so:
  make -C $(BASE_CONFIG_PATH) PLATFORM=$(PLATFORM) $(FLAGS)