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

update dos script

Browse Source
This commit is contained in:
Wengier 2022-06-22 13:14:38 -04:00
parent 2a354a5121
commit 5a49c72409
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/hxdos.yml vendored
View File

@ -46,6 +46,7 @@ jobs:
top=`pwd`
strip --strip-all $top/src/dosbox-x.exe
$top/build-scripts/mingw/hxdos/PESTUB.EXE -n $top/src/dosbox-x.exe
$top/vs/tool/upx.exe --lzma -9 $top/src/dosbox-x.exe
cp $top/src/dosbox-x.exe $top/package/dosbox-x.exe
cp $top/CHANGELOG $top/package/CHANGELOG.txt
cp $top/dosbox-x.reference.conf $top/package/dosbox-x.ref

5
build-scripts/mingw/make-mingw-hx-dos.sh
View File

@ -42,7 +42,7 @@ top=`pwd`
cd "$top" || exit 1
hxdosdir="dosbox-x-mingw-hx-dos"
ziptool="$top/$hxdosdir/vs/tool/zip.exe"
tooldir="$top/$hxdosdir/vs/tool"
cd "$top/$hxdosdir" || exit 1
git clean -dfx
@ -62,6 +62,7 @@ hxdir="build-scripts/mingw/hxdos"
strip src/dosbox-x.exe || exit 1
cp src/dosbox-x.exe dosbox-x.exe || exit 1
$hxdir/pestub.exe -n dosbox-x.exe
$tooldir/upx.exe --lzma -9 dosbox-x.exe
cp CHANGELOG CHANGELOG.txt || exit 1
cp dosbox-x.reference.conf dosbox-x.ref || exit 1
cp dosbox-x.reference.full.conf dosbox-x.ref.full || exit 1
@ -75,7 +76,7 @@ cp $hxdir/*.DLL . || exit 1
cd "$top/$hxdosdir" || exit 1
echo "Packing up now..."
$ziptool -r -9 ../"$name" {CHANGELOG.txt,dosbox-x.exe,dosbox-x.ref,dosbox-x.ref.full,DPMILD32.EXE,HDPMI32.EXE,HXGUIHLP.INI,README.TXT,WINSPOOL.DRV,*.DLL} || exit 1
$tooldir/zip.exe -r -9 ../"$name" {CHANGELOG.txt,dosbox-x.exe,dosbox-x.ref,dosbox-x.ref.full,DPMILD32.EXE,HDPMI32.EXE,HXGUIHLP.INI,README.TXT,WINSPOOL.DRV,*.DLL} || exit 1
cd ..
exit 0

19
src/dos/dos_programs.cpp
View File

@ -5243,15 +5243,14 @@ private:
else {
// convert dosbox-x filename to system filename
uint8_t dummy;
if (!DOS_MakeName(tmp, fullname, &dummy) || strncmp(Drives[dummy]->GetInfo(), "local directory", 15)) {
temp_line = tmp;
int res = get_expanded_files(temp_line, paths, readonly);
if (res) {
num += res - 1;
temp_line = paths[0];
continue;
} else if (!qmount)
WriteOut(MSG_Get(usedef?"PROGRAM_IMGMOUNT_DEFAULT_NOT_FOUND":"PROGRAM_IMGMOUNT_NON_LOCAL_DRIVE"));
temp_line = tmp;
int res = get_expanded_files(temp_line, paths, readonly);
if (res) {
num += res - 1;
temp_line = paths[0];
continue;
} else if ((!DOS_MakeName(tmp, fullname, &dummy) || strncmp(Drives[dummy]->GetInfo(), "local directory", 15)) && !qmount) {
WriteOut(MSG_Get(usedef?"PROGRAM_IMGMOUNT_DEFAULT_NOT_FOUND":"PROGRAM_IMGMOUNT_NON_LOCAL_DRIVE"));
return false;
}
@ -5261,7 +5260,7 @@ private:
return false;
}
ldp->GetSystemFilename(readonly?tmp+1:tmp, fullname);
if (readonly) tmp[0]=':';
if (readonly) tmp[0]=':';
commandLine = tmp;
if (pref_stat(readonly?tmp+1:tmp, &test)) {

BIN
vs/tool/upx.exe Normal file
View File

Binary file not shown.