From 7fe5f972e7e9334fe6a859108a9450b80d7ccffa Mon Sep 17 00:00:00 2001 From: Wengier Date: Tue, 9 Nov 2021 00:09:03 -0500 Subject: [PATCH] update for HX-DOS --- INSTALL.md | 4 ++-- build-mingw-hx-dos | 11 +++++++++++ src/cpu/core_dyn_x86/decoder.h | 1 + src/cpu/core_dynrec/decoder.h | 3 ++- src/cpu/core_dynrec/decoder_opcodes.h | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 8739d1649..1437a8d34 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -152,9 +152,9 @@ macOS versions earlier than 10.12 (Sierra) are not officially supported. If you Besides Windows, Linux and macOS packages, there are also packages released for the DOS operating system. Yes, DOSBox-X can officially run on DOS systems as well, as some DOS users seem to prefer to run DOS applications and games through a DOS emulator. With DOSBox-X running in DOS you are able to emulate another DOS system with a different PC configuration (such as different machine types, video and sound cards etc) that works better for the purpose of the users. But please note that due to the limitations of this environment not all features of DOSBox-X that are available in other platforms can be supported in the DOS version. -The official HX-DOS package is not available for the current DOSBox-X version 0.83.19, but for the previous DOSBox-X version 0.83.16, the official DOS version is available in the following zip package: +The official HX-DOS package for the current DOSBox-X version 0.83.19 is available in the following zip package: -* [dosbox-x-mingw-hx-dos-20210801212637.zip](https://github.com/joncampbell123/dosbox-x/releases/download/dosbox-x-v0.83.16/dosbox-x-mingw-hx-dos-20210801212637.zip) +* [dosbox-x-mingw-hx-dos-20211101234567.zip](https://github.com/joncampbell123/dosbox-x/releases/download/dosbox-x-v0.83.19/dosbox-x-mingw-hx-dos-20211101234567.zip) The HX-DOS package allows you to run DOSBox-X in a real DOS system (MS-DOS 5.0+ or compatible) with the help of the freely-available [HX DOS Extender](https://github.com/Baron-von-Riedesel/HX), which is already included in the recent DOS release packages. Once you unzip the package you can directly type ```DOSBOX-X``` to run in DOS. See the README.TXT file inside the DOS package for more information. diff --git a/build-mingw-hx-dos b/build-mingw-hx-dos index 846f067f2..168add407 100644 --- a/build-mingw-hx-dos +++ b/build-mingw-hx-dos @@ -39,6 +39,17 @@ export LDFLAGS="$nld$LDFLAGS" export CPPFLAGS="$new$CPPFLAGS" export CXXFLAGS="$new$CXXFLAGS" +# perfer to compile against our own freetype +echo Compiling our internal freetype +(cd vs2015/freetype && ./build-dosbox.sh) || exit 1 +new="-I$top/vs2015/freetype/linux-host/include/freetype2 " +nld="-L$top/vs2015/freetype/linux-host/lib -lfreetype " +export CFLAGS="$new$CFLAGS" +export LDFLAGS="$nld$LDFLAGS" +export CPPFLAGS="$new$CPPFLAGS" +export CXXFLAGS="$new$CXXFLAGS" +export INTERNAL_FREETYPE=1 + # now compile ourself echo Compiling DOSBox-X chmod +x configure diff --git a/src/cpu/core_dyn_x86/decoder.h b/src/cpu/core_dyn_x86/decoder.h index dca788d71..70beeaf72 100644 --- a/src/cpu/core_dyn_x86/decoder.h +++ b/src/cpu/core_dyn_x86/decoder.h @@ -17,6 +17,7 @@ */ #include "inout.h" +#include #define X86_DYNFPU_DH_ENABLED #define X86_INLINED_MEMACCESS diff --git a/src/cpu/core_dynrec/decoder.h b/src/cpu/core_dynrec/decoder.h index 17645d5e0..d9a95e5fb 100644 --- a/src/cpu/core_dynrec/decoder.h +++ b/src/cpu/core_dynrec/decoder.h @@ -22,7 +22,8 @@ #include "operators.h" #include "decoder_opcodes.h" -#include "dyn_fpu.h" +#include "dyn_fpu.h" +#include /* The function CreateCacheBlock translates the instruction stream diff --git a/src/cpu/core_dynrec/decoder_opcodes.h b/src/cpu/core_dynrec/decoder_opcodes.h index 8fa7f61ac..c55627b75 100644 --- a/src/cpu/core_dynrec/decoder_opcodes.h +++ b/src/cpu/core_dynrec/decoder_opcodes.h @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - +#include /* The functions in this file are called almost exclusively by decoder.h,