Skip to content

Commit

Permalink
fix win static build
Browse files Browse the repository at this point in the history
static link ucrt and vcruntime

Co-Authored-By: WolframRhodium <[email protected]>
  • Loading branch information
MIRIMIRIM and WolframRhodium committed May 26, 2024
1 parent c256782 commit 128635d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
meson wrap install libpng
meson wrap install zlib
meson -Ddefault_library=static -Dbuildtype=release -Dasm=enabled build
meson -Ddefault_library=static -Dbuildtype=release -Dasm=enabled -Db_vscrt=static_from_buildtype build
meson compile -C build
meson install -C build
Expand All @@ -120,9 +120,9 @@ jobs:
- name: build (windows)
if: matrix.env.os == 'windows-latest'
run: |
cmake -B build -S .
cmake -B build -S . -D CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded
cd build
msbuild /t:Rebuild /m /p:Configuration=Release /p:RuntimeLibrary=MultiThreaded /p:Platform=${{ matrix.arch }} .\assrender.sln
msbuild /t:Rebuild /m /p:Configuration=Release /p:Platform=${{ matrix.arch }} .\assrender.sln
- name: set short version
shell: bash
Expand All @@ -133,7 +133,7 @@ jobs:
- name: upload
uses: actions/upload-artifact@v4
with:
name: assrender_${{ matrix.env.os }}-${{ matrix.arch }}_${{ env.VERSION }}
name: assrender_${{ matrix.env.identifier }}-${{ matrix.arch }}_${{ env.VERSION }}
path: |
build/src/libassrender.so
build/src/Release/assrender.dll
build/src/Release/assrender.dll
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.12)
cmake_minimum_required(VERSION 3.15)
project(assrender)

include(GNUInstallDirs)
Expand Down

0 comments on commit 128635d

Please sign in to comment.