From 4426b416965b4d8a097817bb92d319426e24b7c3 Mon Sep 17 00:00:00 2001 From: Wengier Date: Tue, 3 Nov 2020 13:42:05 -0500 Subject: [PATCH] re-begin new version --- CHANGELOG | 2 ++ INSTALL.md | 9 ++------- configure.ac | 2 +- contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in | 2 +- dosbox-x.reference.conf | 2 +- dosbox-x.reference.full.conf | 2 +- include/build_timestamp.h | 4 ++-- 7 files changed, 10 insertions(+), 13 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 124cc87ae..29f07d3b2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +0.83.8 + - 0.83.7 - The primary DOSBox-X Wiki is now located at the URL: https://dosbox-x.com/wiki (Wengier) diff --git a/INSTALL.md b/INSTALL.md index 48760fef1..b53ed236e 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -30,16 +30,11 @@ Windows installers for the previous DOSBox-X versions are also available from: You can easily upgrade from a previous version of DOSBox-X to the new version with the Windows installer. The Windows installer in fact offers an option to automatically upgrade the config file (dosbox-x.conf) to the new version format while keeping all the user-customized settings already made. When you select this (recommended), the config file will include all options of the latest DOSBox-X version and also will keep all the changes already done previously by the user. -Apart from the Windows installers, you can usually find three zip packages for each DOSBox-X version for the Windows platform in the Releases page as an alternative way to install DOSBox-X. These zip files are portable packages containing binaries built with Visual Studio 2019, MinGW 32-bit and MinGW 64-bit (or mingw-w64). For the current DOSBox-X version 0.83.7, the portable zip packages for the Visual Studio 2019 builds and the MinGW 32-bit builds are separately available from: +Apart from the Windows installers, you can usually find three zip packages for each DOSBox-X version for the Windows platform in the Releases page as an alternative way to install DOSBox-X. These zip files are portable packages containing binaries built with Visual Studio 2019, MinGW 32-bit and MinGW 64-bit (or mingw-w64). For the current DOSBox-X version 0.83.7, these portable builds are separately available from: * [dosbox-x-vsbuild-win-20201101082314.zip](https://github.com/joncampbell123/dosbox-x/releases/download/dosbox-x-v0.83.7/dosbox-x-vsbuild-win-20201101082314.zip) * [dosbox-x-mingw-win32-20201103082126.zip](https://github.com/joncampbell123/dosbox-x/releases/download/dosbox-x-v0.83.7/dosbox-x-mingw-win32-20201103082126.zip) - -For the previous DOSBox-X version 0.83.6 all there portable zip packages are available from: - -* [dosbox-x-vsbuild-win-20200930224615.zip](https://github.com/joncampbell123/dosbox-x/releases/download/dosbox-x-v0.83.6/dosbox-x-vsbuild-win-20200930224615.zip) -* [dosbox-x-mingw-win32-20200930224903.zip](https://github.com/joncampbell123/dosbox-x/releases/download/dosbox-x-v0.83.6/dosbox-x-mingw-win32-20200930224903.zip) -* [dosbox-x-mingw-win64-20200930235023.zip](https://github.com/joncampbell123/dosbox-x/releases/download/dosbox-x-v0.83.6/dosbox-x-mingw-win64-20200930235023.zip) +* [dosbox-x-mingw-win64-20201103091449.zip](https://github.com/joncampbell123/dosbox-x/releases/download/dosbox-x-v0.83.7/dosbox-x-mingw-win64-20201103091449.zip) The Visual Studio builds are the default Windows builds to use, but they only run on Windows Vista and later (Windows 7, 8, and 10). The MinGW builds will be required if you are running Windows XP. You may also want to use one of the MinGW builds (plain, lowend, etc) if you encounter specific problem(s) with the Visual Studio builds. In addition, while the SDL1 version is the default version, the SDL2 version may be prefered over the SDL1 version for certain features (particularly related to input handling) such as touchscreen input support. diff --git a/configure.ac b/configure.ac index ccf6da9ac..97e058c91 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Init. -AC_INIT(dosbox-x,0.83.7,[https://github.com/joncampbell123/dosbox-x/issues],[],[https://dosbox-x.com]) +AC_INIT(dosbox-x,0.83.8,[https://github.com/joncampbell123/dosbox-x/issues],[],[https://dosbox-x.com]) AC_PREREQ(2.60) AC_CONFIG_SRCDIR(README.md) diff --git a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in index 4d5680502..4d9f7464c 100644 --- a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in +++ b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in @@ -10,7 +10,7 @@ Emulation - + diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf index e4f762720..3a2ae49f6 100644 --- a/dosbox-x.reference.conf +++ b/dosbox-x.reference.conf @@ -1,4 +1,4 @@ -# This is the configuration file for DOSBox-X 0.83.7. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 0.83.8. (Please use the latest version of DOSBox-X) # Lines starting with a # are comment lines and are ignored by DOSBox-X. # They are used to (briefly) document the effect of each option. # To write out ALL options, use command 'config -all' with -wc or -writeconf options. diff --git a/dosbox-x.reference.full.conf b/dosbox-x.reference.full.conf index 38b7791d2..a6609a3c0 100644 --- a/dosbox-x.reference.full.conf +++ b/dosbox-x.reference.full.conf @@ -1,4 +1,4 @@ -# This is the configuration file for DOSBox-X 0.83.7. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 0.83.8. (Please use the latest version of DOSBox-X) # Lines starting with a # are comment lines and are ignored by DOSBox-X. # They are used to (briefly) document the effect of each option. # To write out ALL options, use command 'config -all' with -wc or -writeconf options. diff --git a/include/build_timestamp.h b/include/build_timestamp.h index 40b87f1e1..7ce6a245d 100644 --- a/include/build_timestamp.h +++ b/include/build_timestamp.h @@ -1,4 +1,4 @@ /*auto-generated*/ -#define UPDATED_STR "Oct 31, 2020 11:52:47pm" -#define GIT_COMMIT_HASH "0b55b06" +#define UPDATED_STR "Nov 3, 2020 1:41:30pm" +#define GIT_COMMIT_HASH "e72e13a" #define COPYRIGHT_END_YEAR "2020"