joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 03:41:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

update Windows CI

Browse Source
This commit is contained in:
Wengier 2022-07-30 21:22:54 -04:00
parent a4f5006fde
commit fd6c0ff14b
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/vsbuild32.yml vendored
View File

@ -12,7 +12,7 @@ jobs:
actions: write # for styfle/cancel-workflow-action to cancel/stop running workflows
contents: write # for actions/checkout to fetch code and softprops/action-gh-release
if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
runs-on: windows-2019
runs-on: windows-latest
defaults:
run:
shell: pwsh
@ -27,7 +27,7 @@ jobs:
shell: bash
run: |
echo "timestamp=`date +%F-%T | sed -e 's/:/-/g' | sed -e 's/-//g'`" >> $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/v142/v141/g;s/>10.0</>10.0.19041.0</g'
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/v142/v141/g;s/>10.0</>10.0.22000.0</g'
- name: Build Visual Studio Win32 SDL1
shell: pwsh
run: |
@ -112,7 +112,7 @@ jobs:
actions: write # for styfle/cancel-workflow-action to cancel/stop running workflows
contents: write # for actions/checkout to fetch code and softprops/action-gh-release
if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
runs-on: windows-2019
runs-on: windows-latest
defaults:
run:
shell: pwsh

7
.github/workflows/vsbuild64.yml vendored
View File

@ -12,7 +12,7 @@ jobs:
actions: write # for styfle/cancel-workflow-action to cancel/stop running workflows
contents: write # for actions/checkout to fetch code and softprops/action-gh-release
if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
runs-on: windows-2019
runs-on: windows-latest
defaults:
run:
shell: pwsh
@ -27,10 +27,12 @@ jobs:
shell: bash
run: |
echo "timestamp=`date +%F-%T | sed -e 's/:/-/g' | sed -e 's/-//g'`" >> $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/v142/v141/g;s/>10.0</>10.0.22000.0</g'
- 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
contrib\windows\installer\PatchPE.exe bin\x64\Release\dosbox-x.exe
- name: Package Visual Studio Win64 SDL1
shell: bash
run: |
@ -62,6 +64,7 @@ jobs:
shell: pwsh
run: |
msbuild -m vs/dosbox-x.sln -t:dosbox-x:Rebuild -p:Configuration="Release SDL2" -p:Platform=x64
contrib\windows\installer\PatchPE.exe bin\x64\"Release SDL2"\dosbox-x.exe
- name: Package Visual Studio Win64 SDL2
shell: bash
run: |
@ -109,7 +112,7 @@ jobs:
actions: write # for styfle/cancel-workflow-action to cancel/stop running workflows
contents: write # for actions/checkout to fetch code and softprops/action-gh-release
if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
runs-on: windows-2019
runs-on: windows-latest
defaults:
run:
shell: pwsh

2
src/cpu/core_dyn_x86.cpp
View File

@ -169,7 +169,7 @@ static struct {
} decoder_pagefault;
#if defined(X86_DYNFPU_DH_ENABLED)
static struct dyn_dh_fpu {
static struct dyn_dh_fpu_struct {
uint16_t cw,host_cw;
bool state_used;
// some fields expanded here for alignment purposes

8
src/cpu/core_dyn_x86/risc_x64.h
View File

@ -1353,13 +1353,13 @@ static void gen_dh_fpu_saveInit(void) {
else opcode(0).set64().setimm(addr,8).Emit8Reg(0xB8);
// fnsave [dyn_dh_fpu.state]
opcode(6).setea(0,-1,0,offsetof(struct dyn_dh_fpu,state)).Emit8(0xdd);
opcode(6).setea(0,-1,0,offsetof(dyn_dh_fpu_struct,state)).Emit8(0xdd);
// fldcw [dyn_dh_fpu.host_cw]
opcode(5).setea(0,-1,0,offsetof(struct dyn_dh_fpu,host_cw)).Emit8(0xd9);
opcode(5).setea(0,-1,0,offsetof(dyn_dh_fpu_struct,host_cw)).Emit8(0xd9);
// mov byte [dyn_dh_fpu.state_used], 0
opcode(0).setimm(0,1).setea(0,-1,0,offsetof(struct dyn_dh_fpu,state_used)).Emit8(0xc6);
opcode(0).setimm(0,1).setea(0,-1,0,offsetof(dyn_dh_fpu_struct,state_used)).Emit8(0xc6);
// or byte [dyn_dh_fpu.state.cw], 0x3F
opcode(1).setimm(0x3F,1).setea(0,-1,0,offsetof(struct dyn_dh_fpu,state.cw)).Emit8(0x80);
opcode(1).setimm(0x3F,1).setea(0,-1,0,offsetof(dyn_dh_fpu_struct,state.cw)).Emit8(0x80);
cache_addb(0xC3); // RET
cache.pos = oldpos;

2
src/dos/drive_iso.cpp
View File

@ -2083,7 +2083,7 @@ bool isoDrive :: loadImage() {
dataCD = true;
return true;
} else if (dos.version.major < 7 || (dos.version.major == 7 && dos.version.minor < 10)) {
const char *msg = "This is a UDF image which requires a reported DOS version of 7.10 to mount.\r\n";
const char *msg = "Found UDF image which requires a reported DOS version of 7.10 to mount.\r\n";
uint16_t n = (uint16_t)strlen(msg);
DOS_WriteFile (STDOUT,(uint8_t *)msg, &n);
}