mirror of
https://github.com/joncampbell123/dosbox-x.git
synced 2025-10-14 19:08:32 +08:00
Fix build error of nighlty builds of Windows ARM
This commit is contained in:
maron2000
5
.github/workflows/vsbuild32.yml
vendored
5
.github/workflows/vsbuild32.yml
vendored
@@ -136,7 +136,6 @@ jobs:
|
||||
- name: Prepare Visual Studio ARM32
|
||||
shell: bash
|
||||
run: |
|
||||
ls -1 vs/dosbox-x.vcxproj vs/freetype/builds/windows/vc2010/freetype.vcxproj vs/libpdcurses/libpdcurses.vcxproj vs/libpng/projects/vstudio/libpng/libpng.vcxproj vs/libpng/projects/vstudio/libpng/libpng.vcxproj vs/sdl/VisualC/SDL/SDL.vcxproj vs/sdl/VisualC/SDLmain/SDLmain.vcxproj vs/sdl2/VisualC/SDL/SDL.vcxproj vs/sdl2/VisualC/SDLmain/SDLmain.vcxproj vs/sdlnet/VisualC/SDL_net_VS2008.vcxproj vs/sdlnet/VisualC/SDL_net_VS2008.vcxproj vs/zlib/zlib/zlib.vcxproj | xargs sed -b -i 's/>10.0</>10.0.22621.0</g'
|
||||
echo "timestamp=`git show -s --format=%at | xargs -I# date -d @# +%Y%m%d%H%M%S`" >> $GITHUB_ENV
|
||||
export shortsha=`echo ${GITHUB_SHA} | cut -c1-7`
|
||||
export copyrightyear=`git show -s --format=%at | xargs -I# date -d @# +'%Y'`
|
||||
@@ -149,7 +148,7 @@ jobs:
|
||||
- name: Build Visual Studio ARM32 SDL1
|
||||
shell: pwsh
|
||||
run: |
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration=Release -p:Platform=ARM -p:PostBuildEventUseInBuild=false
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration=Release -p:Platform=ARM -p:PostBuildEventUseInBuild=false -p:PlatformToolset=v143
|
||||
if (-not(Test-Path -Path bin\ARM\Release\dosbox-x.exe -PathType Leaf)) {exit 1}
|
||||
- name: Package Visual Studio ARM32 SDL1
|
||||
shell: bash
|
||||
@@ -178,7 +177,7 @@ jobs:
|
||||
- name: Build Visual Studio ARM32 SDL2
|
||||
shell: pwsh
|
||||
run: |
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration="Release SDL2" -p:Platform=ARM -p:PostBuildEventUseInBuild=false
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration="Release SDL2" -p:Platform=ARM -p:PostBuildEventUseInBuild=false -p:PlatformToolset=v143
|
||||
if (-not(Test-Path -Path bin\ARM\"Release SDL2"\dosbox-x.exe -PathType Leaf)) {exit 1}
|
||||
- name: Package Visual Studio ARM32 SDL2
|
||||
shell: bash
|
||||
|
||||
13
.github/workflows/vsbuild64.yml
vendored
13
.github/workflows/vsbuild64.yml
vendored
@@ -148,7 +148,7 @@ jobs:
|
||||
- name: Build Visual Studio ARM64 SDL1
|
||||
shell: pwsh
|
||||
run: |
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration=Release -p:Platform=ARM64 -p:PostBuildEventUseInBuild=false -p:WindowsTargetPlatformVersion=10.0.22621.0
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration=Release -p:Platform=ARM64 -p:PostBuildEventUseInBuild=false -p:PlatformToolset=v143
|
||||
if (-not(Test-Path -Path bin\ARM64\Release\dosbox-x.exe -PathType Leaf)) {exit 1}
|
||||
- name: Package Visual Studio ARM64 SDL1
|
||||
shell: bash
|
||||
@@ -177,7 +177,7 @@ jobs:
|
||||
- name: Build Visual Studio ARM64 SDL2
|
||||
shell: pwsh
|
||||
run: |
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration="Release SDL2" -p:Platform=ARM64 -p:PostBuildEventUseInBuild=false -p:WindowsTargetPlatformVersion=10.0.22621.0
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration="Release SDL2" -p:Platform=ARM64 -p:PostBuildEventUseInBuild=false -p:PlatformToolset=v143
|
||||
if (-not(Test-Path -Path bin\ARM64\"Release SDL2"\dosbox-x.exe -PathType Leaf)) {exit 1}
|
||||
- name: Package Visual Studio ARM64 SDL2
|
||||
shell: bash
|
||||
@@ -237,7 +237,6 @@ jobs:
|
||||
shell: bash
|
||||
run: |
|
||||
echo "timestamp=`git show -s --format=%at | xargs -I# date -d @# +%Y%m%d%H%M%S`" >> $GITHUB_ENV
|
||||
ls -1 vs/dosbox-x.vcxproj vs/freetype/builds/windows/vc2010/freetype.vcxproj vs/libpdcurses/libpdcurses.vcxproj vs/libpng/projects/vstudio/libpng/libpng.vcxproj vs/libpng/projects/vstudio/libpng/libpng.vcxproj vs/sdl/VisualC/SDL/SDL.vcxproj vs/sdl/VisualC/SDLmain/SDLmain.vcxproj vs/sdl2/VisualC/SDL/SDL.vcxproj vs/sdl2/VisualC/SDLmain/SDLmain.vcxproj vs/sdlnet/VisualC/SDL_net_VS2008.vcxproj vs/sdlnet/VisualC/SDL_net_VS2008.vcxproj vs/zlib/zlib/zlib.vcxproj | xargs sed -b -i 's/v14[2-9]/v143/g'
|
||||
echo "timestamp=`git show -s --format=%at | xargs -I# date -d @# +%Y%m%d%H%M%S`" >> $GITHUB_ENV
|
||||
export shortsha=`echo ${GITHUB_SHA} | cut -c1-7`
|
||||
export copyrightyear=`git show -s --format=%at | xargs -I# date -d @# +'%Y'`
|
||||
@@ -250,22 +249,22 @@ jobs:
|
||||
- name: Build Visual Studio Win32 SDL1
|
||||
shell: pwsh
|
||||
run: |
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration=Release -p:Platform=Win32
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration=Release -p:Platform=Win32 -p:PlatformToolset=v143
|
||||
if (-not(Test-Path -Path bin\Win32\Release\dosbox-x.exe -PathType Leaf)) {exit 1}
|
||||
- name: Build Visual Studio Win32 SDL2
|
||||
shell: pwsh
|
||||
run: |
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration="Release SDL2" -p:Platform=Win32
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration="Release SDL2" -p:Platform=Win32 -p:PlatformToolset=v143
|
||||
if (-not(Test-Path -Path bin\Win32\"Release SDL2"\dosbox-x.exe -PathType Leaf)) {exit 1}
|
||||
- name: Build Visual Studio Win64 SDL1
|
||||
shell: pwsh
|
||||
run: |
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration=Release -p:Platform=x64
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration=Release -p:Platform=x64 -p:PlatformToolset=v143
|
||||
if (-not(Test-Path -Path bin\x64\Release\dosbox-x.exe -PathType Leaf)) {exit 1}
|
||||
- name: Build Visual Studio Win64 SDL2
|
||||
shell: pwsh
|
||||
run: |
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration="Release SDL2" -p:Platform=x64
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration="Release SDL2" -p:Platform=x64 -p:PlatformToolset=v143
|
||||
if (-not(Test-Path -Path bin\x64\"Release SDL2"\dosbox-x.exe -PathType Leaf)) {exit 1}
|
||||
- name: Package Visual Studio 2022 build
|
||||
shell: bash
|
||||
|
||||
9
.github/workflows/windows-installers.yml
vendored
9
.github/workflows/windows-installers.yml
vendored
@@ -26,7 +26,6 @@ jobs:
|
||||
- name: Prepare Visual Studio builds
|
||||
shell: bash
|
||||
run: |
|
||||
ls -1 vs/dosbox-x.vcxproj vs/freetype/builds/windows/vc2010/freetype.vcxproj vs/libpdcurses/libpdcurses.vcxproj vs/libpng/projects/vstudio/libpng/libpng.vcxproj vs/libpng/projects/vstudio/libpng/libpng.vcxproj vs/sdl/VisualC/SDL/SDL.vcxproj vs/sdl/VisualC/SDLmain/SDLmain.vcxproj vs/sdl2/VisualC/SDL/SDL.vcxproj vs/sdl2/VisualC/SDLmain/SDLmain.vcxproj vs/sdlnet/VisualC/SDL_net_VS2008.vcxproj vs/sdlnet/VisualC/SDL_net_VS2008.vcxproj vs/zlib/zlib/zlib.vcxproj | xargs sed -b -i 's/>10.0</>10.0.22621.0</g'
|
||||
echo "timestamp=`git show -s --format=%at | xargs -I# date -d @# +%Y%m%d%H%M%S`" >> $GITHUB_ENV
|
||||
export shortsha=`git show --format='%h' --no-patch`
|
||||
export copyrightyear=`git show -s --format=%at | xargs -I# date -d @# +'%Y'`
|
||||
@@ -63,22 +62,22 @@ jobs:
|
||||
- name: Build Visual Studio ARM64 SDL1
|
||||
shell: pwsh
|
||||
run: |
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration=Release -p:Platform=ARM64 -p:PostBuildEventUseInBuild=false
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration=Release -p:Platform=ARM64 -p:PostBuildEventUseInBuild=false -p:PlatformToolset=v143
|
||||
if (-not(Test-Path -Path bin\ARM64\Release\dosbox-x.exe -PathType Leaf)) {exit 1}
|
||||
- name: Build Visual Studio ARM64 SDL2
|
||||
shell: pwsh
|
||||
run: |
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration="Release SDL2" -p:Platform=ARM64 -p:PostBuildEventUseInBuild=false
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration="Release SDL2" -p:Platform=ARM64 -p:PostBuildEventUseInBuild=false -p:PlatformToolset=v143
|
||||
if (-not(Test-Path -Path bin\ARM64\"Release SDL2"\dosbox-x.exe -PathType Leaf)) {exit 1}
|
||||
- name: Build Visual Studio ARM32 SDL1
|
||||
shell: pwsh
|
||||
run: |
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration=Release -p:Platform=ARM -p:PostBuildEventUseInBuild=false
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration=Release -p:Platform=ARM -p:PostBuildEventUseInBuild=false -p:PlatformToolset=v143
|
||||
if (-not(Test-Path -Path bin\ARM\Release\dosbox-x.exe -PathType Leaf)) {exit 1}
|
||||
- name: Build Visual Studio ARM32 SDL2
|
||||
shell: pwsh
|
||||
run: |
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration="Release SDL2" -p:Platform=ARM -p:PostBuildEventUseInBuild=false
|
||||
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration="Release SDL2" -p:Platform=ARM -p:PostBuildEventUseInBuild=false -p:PlatformToolset=v143
|
||||
if (-not(Test-Path -Path bin\ARM\"Release SDL2"\dosbox-x.exe -PathType Leaf)) {exit 1}
|
||||
- name: Package Visual Studio x86/x64 builds
|
||||
shell: bash
|
||||
|
||||
Reference in New Issue
Block a user