update:ci and depend library

libxengine · Jan 22, 2025 · 5619fb3 · 5619fb3
1 parent 04f46e6
commit 5619fb3
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -3,7 +3,7 @@ name: CodeQL Advanced
 on:
   push:
     branches: 
-      - 'master1'
+      - 'master'
 
 jobs:
   analyze:

diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml
@@ -3,7 +3,7 @@ name: cpp check workflows
 on:
   push:
     branches: 
-      - 'master1'
+      - 'master'
     paths:
       - 'XEngine_Source/**'
       - 'XEngine_Release/**'

diff --git a/.github/workflows/macbuild.yml b/.github/workflows/macbuild.yml
@@ -3,7 +3,7 @@ name: macos build workflows
 on:
   push:
     branches: 
-      - 'master1'
+      - 'master'
     paths:
       - 'XEngine_Source/**'
       - 'XEngine_Release/**'

diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
@@ -3,7 +3,7 @@ name: windows build workflows
 on:
   push:
     branches: 
-      - 'master1'
+      - 'master'
     paths:
       - 'XEngine_Source/**'
       - 'XEngine_Release/**'

diff --git a/.github/workflows/ubuntu_Arm64_build.yml b/.github/workflows/ubuntu_Arm64_build.yml
@@ -3,7 +3,7 @@ name: ubuntu Arm64 build workflows
 on:
   push:
     branches: 
-      - 'master1'
+      - 'master'
     paths:
       - 'XEngine_Source/**'
       - 'XEngine_Release/**'

diff --git a/.github/workflows/ubuntu_x64_build.yml b/.github/workflows/ubuntu_x64_build.yml
@@ -3,7 +3,7 @@ name: ubuntu x86-64 build workflows
 on:
   push:
     branches: 
-      - 'master1'
+      - 'master'
     paths:
       - 'XEngine_Source/**'
       - 'XEngine_Release/**'

diff --git a/XEngine_Source/XEngine_Depend b/XEngine_Source/XEngine_Depend
+38 −0		.github/ISSUE_TEMPLATE/bug_report.md
+20 −0		.github/ISSUE_TEMPLATE/feature_request.md
+62 −0		.github/workflows/codeql.yml
+35 −0		.github/workflows/cppcheck.yml
+15 −0		.github/workflows/issue-translator.yml
+71 −0		.github/workflows/macbuild.yml
+79 −0		.github/workflows/msbuild.yml
+69 −0		.github/workflows/ubuntubuild.yml
+4 −4		README.en.md
+4 −4		README.md
+9 −0		XEngine.sln
+3 −3		XEngine_Application/XEngine_APPModuleTest/XEngine_APPModuleTest.cpp
+12 −0		XEngine_Application/XEngine_APPModuleTest/XEngine_APPModuleTest.vcxproj
+6 −2		XEngine_Application/XEngine_APPSocketTest/XEngine_APPSocketTest.vcxproj
+12 −0		XEngine_Example/AVCodec_APPPlayer/AVCodec_APPPlayer.cpp
+11 −3		XEngine_Example/AVCodec_APPPlayer/AVCodec_APPPlayer.vcxproj
+12 −0		XEngine_Example/InfoReport_APPExample/InfoReport_APPExample.cpp
+9 −0		XEngine_Example/InfoReport_APPExample/InfoReport_APPExample.vcxproj
+12 −0		XEngine_Example/TinyXML2_APPExample/TinyXML2_APPExample.cpp
+4 −0		XEngine_Example/TinyXML2_APPExample/TinyXML2_APPExample.vcxproj
+2 −0		XEngine_Module/XEngine_AVPlayer/Makefile
+85 −16		XEngine_Module/XEngine_InfoReport/InfoReport_APIMachine/InfoReport_APIMachine.cpp
+2 −1		XEngine_Module/XEngine_InfoReport/InfoReport_APIMachine/InfoReport_APIMachine.h
+26 −2		XEngine_Module/XEngine_InfoReport/InfoReport_Define.h
+2 −1		XEngine_Module/XEngine_InfoReport/XEngine_InfoReport.def
+6 −2		XEngine_Module/XEngine_InfoReport/pch.cpp