remove submodules

AmusementClub · May 26, 2024 · 47e1240 · 47e1240
1 parent 128635d
commit 47e1240
Show file tree

Hide file tree

Showing 15 changed files with 64 additions and 743 deletions.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -3,22 +3,22 @@ name: C/C++ CI
 on: [push]
 
 jobs:
-  build-linux:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: install deps
-        run: |
-          sudo apt-get update && sudo apt-get install -y --no-install-recommends build-essential g++ gcc libass-dev pkg-config
-      - name: build
-        run: |
-          cmake -B build -S .
-          cmake --build build --clean-first
+  # build-linux:
+  #   runs-on: ubuntu-20.04
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - name: install deps
+  #       run: |
+  #         sudo apt-get update && sudo apt-get install -y --no-install-recommends build-essential g++ gcc libass-dev pkg-config
+  #     - name: build
+  #       run: |
+  #         cmake -B build -S .
+  #         cmake --build build --clean-first
 
   build-macos:
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: install deps
         run: |
           brew install cmake libass
@@ -27,54 +27,54 @@ jobs:
           cmake -B build -S .
           cmake --build build --clean-first
 
-  build-mingw:
-    runs-on: windows-2019
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: msys2/setup-msys2@v2
-        with:
-          update: true
-          install: base-devel git mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-libass
-          msystem: MINGW64
-          path-type: inherit
-      - name: build
-        run: |
-          cmake -G "MSYS Makefiles" -B build -S .
-          cmake --build build --clean-first
+  # build-mingw:
+  #   runs-on: windows-2019
+  #   defaults:
+  #     run:
+  #       shell: msys2 {0}
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - uses: msys2/setup-msys2@v2
+  #       with:
+  #         update: true
+  #         install: base-devel git mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-libass
+  #         msystem: MINGW64
+  #         path-type: inherit
+  #     - name: build
+  #       run: |
+  #         cmake -G "MSYS Makefiles" -B build -S .
+  #         cmake --build build --clean-first
 
-  build-win:
-    runs-on: windows-2019
-    strategy:
-      matrix:
-        include:
-        - target: 'x86'
-          platform: 'Win32'
-        - target: 'x64'
-          platform: 'x64'
-    steps:
-      - uses: actions/checkout@v2
-      - name: install submodules and nasm
-        shell: cmd
-        run: |
-          git submodule update --init --recursive --remote
-          git clone https://github.com/ShiftMediaProject/VSNASM.git --branch 0.9
-          .\VSNASM\install_script.bat
-      - name: force /MT build
-        shell: bash
-        run: |
-          sed -i -e 's|<ClCompile>|&<RuntimeLibrary>MultiThreaded</RuntimeLibrary>|g' SMP/*/SMP/*.vcxproj
-          sed -i -e 's|<ClCompile>|&<RuntimeLibrary>MultiThreaded</RuntimeLibrary>|g' assrender.vcxproj
-      - name: add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1
-      - name: build
-        run: MSBuild.exe /t:Rebuild /p:WindowsTargetPlatformVersion=10.0.19041.0 /p:PlatformToolset=v142 /m /p:Configuration=Release /p:Platform=${{matrix.target}}
-      - name: copy
-        run: cmake -E copy "bin\Release_${{matrix.platform}}\assrender.dll" dist\${{matrix.target}}\assrender.dll
-      - name: upload
-        uses: actions/upload-artifact@v2
-        with:
-          name: assrender_bin
-          path: dist
+  # build-win:
+  #   runs-on: windows-2019
+  #   strategy:
+  #     matrix:
+  #       include:
+  #       - target: 'x86'
+  #         platform: 'Win32'
+  #       - target: 'x64'
+  #         platform: 'x64'
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - name: install submodules and nasm
+  #       shell: cmd
+  #       run: |
+  #         git submodule update --init --recursive --remote
+  #         git clone https://github.com/ShiftMediaProject/VSNASM.git --branch 0.9
+  #         .\VSNASM\install_script.bat
+  #     - name: force /MT build
+  #       shell: bash
+  #       run: |
+  #         sed -i -e 's|<ClCompile>|&<RuntimeLibrary>MultiThreaded</RuntimeLibrary>|g' SMP/*/SMP/*.vcxproj
+  #         sed -i -e 's|<ClCompile>|&<RuntimeLibrary>MultiThreaded</RuntimeLibrary>|g' assrender.vcxproj
+  #     - name: add msbuild to PATH
+  #       uses: microsoft/setup-msbuild@v1
+  #     - name: build
+  #       run: MSBuild.exe /t:Rebuild /p:WindowsTargetPlatformVersion=10.0.19041.0 /p:PlatformToolset=v142 /m /p:Configuration=Release /p:Platform=${{matrix.target}}
+  #     - name: copy
+  #       run: cmake -E copy "bin\Release_${{matrix.platform}}\assrender.dll" dist\${{matrix.target}}\assrender.dll
+  #     - name: upload
+  #       uses: actions/upload-artifact@v2
+  #       with:
+  #         name: assrender_bin
+  #         path: dist
diff --git a/.gitignore b/.gitignore
@@ -24,6 +24,7 @@ install_manifest.txt
 SMP/
 
 #*/build/.vs
+build/*
 */build/Win32
 */build/x64
 Test

diff --git a/SMP/fontconfig b/SMP/fontconfig
diff --git a/SMP/freetype2 b/SMP/freetype2
diff --git a/SMP/fribidi b/SMP/fribidi
diff --git a/SMP/harfbuzz b/SMP/harfbuzz
diff --git a/SMP/libass b/SMP/libass
diff --git a/SMP/libiconv b/SMP/libiconv
diff --git a/SMP/liblzma b/SMP/liblzma
diff --git a/SMP/libxml2 b/SMP/libxml2
diff --git a/SMP/zlib b/SMP/zlib
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,7 @@ install_manifest.txt @@
     SMP/
     #*/build/.vs
+    build/*
     */build/Win32
     */build/x64
     Test
@@ Expand Down @@