update:workflow and make file

Author: xengine-qyt

.github/workflows/linuxbuild.yml

@@ -17,7 +17,7 @@ jobs:
       matrix:
         include:
           - os: ubuntu-22.04
-        #  - os: ubuntu-24.04
+          #- os: ubuntu-24.04
     runs-on: ${{ matrix.os }}
 
     steps:

.github/workflows/msbuild.yml

@@ -53,4 +53,25 @@ jobs:
         uses: microsoft/[email protected]
       #编译
       - name: Build Solution
-        run: msbuild XEngine_Source/XEngine.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }}
+        run: msbuild XEngine_Source/XEngine_StorageApp.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }}
+      #测试
+      - name: Conditional Step for x86 Release
+        if: matrix.configuration == 'Release' && matrix.platform == 'x86'
+        run: |
+          cp -r XEngine_Source/Release/*.dll XEngine_Release/
+          cp -r XEngine_Source/Release/*.exe XEngine_Release/
+          cp -r XEngine_Source/VSCopy_x86.bat XEngine_Release/
+          cd XEngine_Release
+          ./VSCopy_x86.bat
+          ./XEngine_AuthorizeService.exe -t
+        shell: pwsh
+      - name: Conditional Step for x86 Debug
+        if: matrix.configuration == 'Debug' && matrix.platform == 'x86'
+        run: |
+          cp -r XEngine_Source/Debug/*.dll XEngine_Release/
+          cp -r XEngine_Source/Debug/*.exe XEngine_Release/
+          cp -r XEngine_Source/VSCopy_x86.bat XEngine_Release/
+          cd XEngine_Release
+          ./VSCopy_x86.bat
+          ./XEngine_AuthorizeService.exe -t
+        shell: pwsh

XEngine_Source/Makefile

@@ -23,10 +23,25 @@ XENGINE_MODULES = libjsoncpp.so libXEngine_InfoReport.so
 .PHONY:MakeAll 
 MakeAll:$(XENGINE_MODULES)
 
+
+ifeq ($(PLATFORM),linux)
+	FILEEXT = so
+else ifeq ($(PLATFORM),mac)
+	FILEEXT = dylib
+endif
+
 libjsoncpp.so:
-	make -C $(DEPEND_JSONCPP_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
+ifeq ($(FLAGS), InstallAll)
+	cp $(THIRD_JSONCPP_PATH)/libjsoncpp.$(FILEEXT) ../XEngine_Release/
+else
+	make -C $(THIRD_JSONCPP_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
+endif
 libXEngine_InfoReport.so:
-	make -C $(DEPEND_REPORT_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
+ifeq ($(FLAGS), InstallAll)
+	cp $(THIRD_REPORT_PATH)/libXEngine_InfoReport.$(FILEEXT) ../XEngine_Release/
+else
+	make -C $(THIRD_REPORT_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
+endif
 
 libAuthorizeModule_CDKey.so:
 	make -C $(AUTH_CDKEY_PATH) PLATFORM=$(PLATFORM) $(FLAGS)