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

Merge pull request #1890 from rderooy/master

Browse Source 
Change to HTTPS
This commit is contained in:
Wengier
2020-09-29 12:55:29 -04:00
committed by GitHub
parent 5f6d98968e f0c7392f57
commit b5973d73e0
24 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -154,7 +154,7 @@ set(PACKAGE_STRING "dosbox-x 0.821" CACHE STRING "Define to the full name and ve
# set(PACKAGE_BUGREPORT "https://github.com/joncampbell123/dosbox-x/issues" CACHE STRING "Define to the address where bug reports for this package should be sent")
# set(PACKAGE_NAME "dosbox-x" CACHE STRING "Define to the full name of this package")
# set(PACKAGE_TARNAME "dosbox-x" CACHE STRING "Define to the one symbol short name of this package")
# set(PACKAGE_URL "http://dosbox-x.software" CACHE STRING "Define to the home page for this package")
# set(PACKAGE_URL "https://dosbox-x.com" CACHE STRING "Define to the home page for this package")
# set(PACKAGE_VERSION "0.821" CACHE STRING "Define to the version of this package")
# set(_FILE_OFFSET_BITS "64" CACHE STRING "Number of bits in a file offset, on hosts where this is settable")

2
CREDITS.md
View File

@@ -49,7 +49,7 @@ A list of features ported from vDosPlus by Wengier:
Features such as save & load states and Pentium MMX instructions were also ported from community contributions and have since been improved by the DOSBox-X project.
The [DOSBox-X website](http://dosbox-x.com) was designed and maintained by Wengier.
The [DOSBox-X website](https://dosbox-x.com) was designed and maintained by Wengier.
The [DOSBox-X Wiki](https://github.com/joncampbell123/dosbox-x/wiki) pages were created and updated by Wengier and rderooy.

18
Doxyfile
View File

@@ -18,7 +18,7 @@
# that follow. The default is UTF-8 which is also the encoding used for all
# text before the first occurrence of this tag. Doxygen uses libiconv (or the
# iconv built into libc) for the transcoding. See
# http://www.gnu.org/software/libiconv for the list of possible encodings.
# https://www.gnu.org/software/libiconv for the list of possible encodings.
DOXYFILE_ENCODING = UTF-8
@@ -242,7 +242,7 @@ EXTENSION_MAPPING =
# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
# comments according to the Markdown format, which allows for more readable
# documentation. See http://daringfireball.net/projects/markdown/ for details.
# documentation. See https://daringfireball.net/projects/markdown/ for details.
# The output of markdown processing is further processed by doxygen, so you
# can mix doxygen, HTML, and XML commands with Markdown formatting.
# Disable only in case of backward compatibilities issues.
@@ -595,7 +595,7 @@ LAYOUT_FILE =
# containing the references data. This must be a list of .bib files. The
# .bib extension is automatically appended if omitted. Using this command
# requires the bibtex tool to be installed. See also
# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
# https://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
# feature you need bibtex and perl available in the search path.
@@ -666,7 +666,7 @@ INPUT = include src
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
# also the default input encoding. Doxygen uses libiconv (or the iconv built
# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
# into libc) for the transcoding. See https://www.gnu.org/software/libiconv for
# the list of possible encodings.
INPUT_ENCODING = UTF-8
@@ -824,7 +824,7 @@ REFERENCES_LINK_SOURCE = YES
# If the USE_HTAGS tag is set to YES then the references to source code
# will point to the HTML generated by the htags(1) tool instead of doxygen
# built-in source browser. The htags tool is part of GNU's global source
# tagging system (see http://www.gnu.org/software/global/global.html). You
# tagging system (see https://www.gnu.org/software/global/global.html). You
# will need version 4.8.6 or higher.
USE_HTAGS = NO
@@ -919,7 +919,7 @@ HTML_EXTRA_FILES =
# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
# Doxygen will adjust the colors in the style sheet and background images
# according to this color. Hue is specified as an angle on a colorwheel,
# see http://en.wikipedia.org/wiki/Hue for more information.
# see https://en.wikipedia.org/wiki/Hue for more information.
# For instance the value 0 represents red, 60 is yellow, 120 is green,
# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
# The allowed range is 0 to 359.
@@ -1172,7 +1172,7 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
# (see http://www.mathjax.org) which uses client side Javascript for the
# (see https://www.mathjax.org) which uses client side Javascript for the
# rendering instead of using prerendered bitmaps. Use this if you do not
# have LaTeX installed or if you want to formulas look prettier in the HTML
# output. When enabled you may also need to install MathJax separately and
@@ -1188,7 +1188,7 @@ USE_MATHJAX = NO
# the MathJax Content Delivery Network so you can quickly see the result without
# installing MathJax.
# However, it is strongly recommended to install a local
# copy of MathJax from http://www.mathjax.org before deployment.
# copy of MathJax from https://www.mathjax.org before deployment.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1312,7 +1312,7 @@ LATEX_SOURCE_CODE = NO
# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
# http://en.wikipedia.org/wiki/BibTeX for more info.
# https://en.wikipedia.org/wiki/BibTeX for more info.
LATEX_BIB_STYLE = plain

4
INSTALL.md
View File

@@ -5,7 +5,7 @@ DOSBox-X is a cross-platform DOS emulator based on DOSBox, with the eventual goa
The current version of DOSBox-X at this time is DOSBox-X 0.83.5, which was released on September 1, 2020. Pre-compiled Windows binaries (both 32-bit and 64-bit), Linux RPM packages (64-bit), macOS packages (64-bit) and the special HX-DOS packages (for real DOS environments) are officially available, as well as the source code packages. You will find DOSBox-X versions that have been released so far (ZIP or RPM packages) and change logs for these versions in the [Releases](https://github.com/joncampbell123/dosbox-x/releases) page. The Windows installers are also available (see the next section for details).
See also: [DOSBox-X 0.83.5 Release Notes](http://dosbox-x.com/release-0.83.5.html)
See also: [DOSBox-X 0.83.5 Release Notes](https://dosbox-x.com/release-0.83.5.html)
Once you get DOSBox-X installed and running, you probably want to look at the DOSBox-X user guide in the [DOSBox-X Wiki](https://github.com/joncampbell123/dosbox-x/wiki) for usage information.
@@ -95,6 +95,6 @@ Full source code packages of DOSBox-X are also available in both zip and tar.gz
* [dosbox-x-v0.83.5.zip](https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v0.83.5.zip)
* [dosbox-x-v0.83.5.tar.gz](https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v0.83.5.tar.gz)
If you prefer you can compile DOSBox-X from the source code by yourself. The source code packages as listed in the Releases page contain the source code for that released version, and in this example the current DOSBox-X 0.83.5 version. On the other hand, if you are looking for the latest source code of DOSBox-X (including the most recent development changes in the source code), you may want to use the source code in the repository instead, or you can browse the latest source code using [Doxygen](http://dosbox-x.com/doxygen/html/index.html).
If you prefer you can compile DOSBox-X from the source code by yourself. The source code packages as listed in the Releases page contain the source code for that released version, and in this example the current DOSBox-X 0.83.5 version. On the other hand, if you are looking for the latest source code of DOSBox-X (including the most recent development changes in the source code), you may want to use the source code in the repository instead, or you can browse the latest source code using [Doxygen](https://dosbox-x.com/doxygen/html/index.html).
You could use either the released source code package or the latest source code according to your needs, and the source code may be compiled to run on the above-mentioned platforms (Windows, Linux, macOS and DOS) and possibly other operating systems too. Please see the [DOSBox-X source code description](README.source-code-description) file for detailed instructions on building the DOSBox-X source code and further information of the source code.

6
README.md
View File

@@ -1,7 +1,7 @@
**Welcome to the DOSBox-X project website located on GitHub.**
**Be sure to also visit DOSBox-X's homepage at [http://dosbox-x.com](http://dosbox-x.com)**
**Be sure to also visit DOSBox-X's homepage at [https://dosbox-x.com](https://dosbox-x.com)**
## Table of Contents
@@ -26,7 +26,7 @@ Like DOSBox, it emulates a PC necessary for running many MS-DOS games and applic
Our goal is to eventually make DOSBox-X a complete DOS emulation package, both fully-featured and easy to use, and give the users all the options to configure the DOS virtual machine. We implement new features with each official release, and also try our best to deliver a consistent cross-platform experience for users instead of focusing on a particular platform. In order to help improve the general DOS emulation and also to aid retro-development, it is our desire to maintain and implement more accurate emulation, but at the same time we are also making efforts to improve emulation quality, speed, and usability for end users. Furthermore, we hope to improve the out-of-the-box experience for new users who want to run DOS programs or games.
Please check out the [DOSBox-X homepage](http://dosbox-x.com) for common packages of the latest release for the supported platforms. Also see the [INSTALL](INSTALL.md) page for DOSBox-X installation instructions and other packages, and the [Releases](https://github.com/joncampbell123/dosbox-x/releases) page for archives of all released DOSBox-X versions. For more information about DOSBox-X, such as setting up and running DOSBox-X including its usage tips, please read the user guide in the [DOSBox-X Wiki](https://github.com/joncampbell123/dosbox-x/wiki).
Please check out the [DOSBox-X homepage](https://dosbox-x.com) for common packages of the latest release for the supported platforms. Also see the [INSTALL](INSTALL.md) page for DOSBox-X installation instructions and other packages, and the [Releases](https://github.com/joncampbell123/dosbox-x/releases) page for archives of all released DOSBox-X versions. For more information about DOSBox-X, such as setting up and running DOSBox-X including its usage tips, please read the user guide in the [DOSBox-X Wiki](https://github.com/joncampbell123/dosbox-x/wiki).
DOSBox-X is completely open-source and free of charge to use and distribute. It is released under the [GNU General Public License, version 2](COPYING).
@@ -88,7 +88,7 @@ DOSBox-X is a cross-platform DOS emulator, so all major host operating systems a
4. DOS (MS-DOS 5.0+ or compatible)
Windows binaries (both 32-bit and 64-bit), Linux RPM packages (64-bit), macOS packages (64-bit) and DOS versions are officially released periodically, typically on the last day of a month or the first day of the next month. Please check out the [DOSBox-X homepage](http://dosbox-x.com) and the [INSTALL](INSTALL.md) page for the latest DOSBox-X packages on these platforms and further installation instructions. You can also find ZIP (or Linux RPM) packages for all released versions and their change logs in the [Releases](https://github.com/joncampbell123/dosbox-x/releases) page.
Windows binaries (both 32-bit and 64-bit), Linux RPM packages (64-bit), macOS packages (64-bit) and DOS versions are officially released periodically, typically on the last day of a month or the first day of the next month. Please check out the [DOSBox-X homepage](https://dosbox-x.com) and the [INSTALL](INSTALL.md) page for the latest DOSBox-X packages on these platforms and further installation instructions. You can also find ZIP (or Linux RPM) packages for all released versions and their change logs in the [Releases](https://github.com/joncampbell123/dosbox-x/releases) page.
The latest version of DOSBox-X was released on September 1, 2020. If you use Windows, please note that the default Windows releases built with Visual Studio only support Windows Vista and later (Windows 7, 8, and 10); for Windows XP, the MinGW builds are required. Auto-installable Windows packages for DOSBox-X are available to ease the installation process, which are especially recommended for new and non-expert users. If you use the installers you will be able to start DOSBox-X as soon as the installation ends. The all-in-one Windows installer for the latest official version of DOSBox-X can be downloaded from: [DOSBox-X-Setup-Windows-latest.exe](https://github.com/Wengier/dosbox-x-wiki/raw/master/DOSBox-X-Setup-Windows-latest.exe)

14
README.source-code-description
View File

@@ -135,7 +135,7 @@ Libraries used by DOSBox-X
The following libraries are used by DOSBox-X:
SDL 1.2.x or SDL 2.0.x
The Simple DirectMedia Library available at http://www.libsdl.org
The Simple DirectMedia Library available at https://www.libsdl.org
The DLL distributed with the Windows SDL1 version of DOSBox-X had
been modified from the original. You can find the changes in the
source package of DOSBox-X (src/platform/sdl-win32.diff). If you
@@ -147,29 +147,29 @@ SDL 1.2.x or SDL 2.0.x
Curses (optional)
If you want to enable the debugger you need a curses library.
ncurses should be installed on just about every unix distro.
For win32 get pdcurses at http://pdcurses.sourceforge.net
For win32 get pdcurses at https://pdcurses.sourceforge.net
License: Open source
Libpng (optional)
Needed for the screenshots.
For win32 get libpng from http://gnuwin32.sourceforge.net/packages.html
For win32 get libpng from https://gnuwin32.sourceforge.net/packages.html
See http://www.libpng.org/pub/png/ for more details.
License: Open Source
Zlib (optional)
Needed by libpng.
For win32 get libz (rename to zlib) from http://gnuwin32.sourceforge.net/packages.html
For win32 get libz (rename to zlib) from https://gnuwin32.sourceforge.net/packages.html
See http://www.zlib.net for more details.
License: Open Source
SDL_Net (optional)
For modem/ipx support. Get it from http://www.libsdl.org/projects/SDL_net/
For modem/ipx support. Get it from https://www.libsdl.org/projects/SDL_net/
Licensed under LGPL
SDL_Sound
For compressed audio on diskimages. (optional)
This is for cue/bin CD-ROM images with compressed (MP3/OGG/FLAC) audio tracks.
Get it from http://icculus.org/SDL_sound
Get it from https://icculus.org/SDL_sound
Licenced under LGPL
ALSA_Headers
@@ -1322,7 +1322,7 @@ NOTE: To better understand the term "copper effects", read
the following links describing the original
Commodore Amiga video hardware:
http://eab.abime.net/showthread.php?t=21866
https://eab.abime.net/showthread.php?t=21866
https://en.wikipedia.org/wiki/Original_Chip_Set#Copper
PIC events are used in the VGA code to trigger rendering

8
config.guess vendored
View File

@@ -15,7 +15,7 @@ timestamp='2017-05-27'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
# along with this program; if not, see <https://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -27,7 +27,7 @@ timestamp='2017-05-27'
# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
#
# Please send patches to <config-patches@gnu.org>.
@@ -1432,9 +1432,9 @@ This script (version $timestamp), has failed to recognize the
operating system you are using. If your script is old, overwrite
config.guess and config.sub with the latest versions from:
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
and
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
If $0 has already been updated, send the following data and any
information you think might be pertinent to config-patches@gnu.org to

4
config.sub vendored
View File

@@ -15,7 +15,7 @@ timestamp='2017-04-02'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
# along with this program; if not, see <https://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -33,7 +33,7 @@ timestamp='2017-04-02'
# Otherwise, we print the canonical config type on stdout and succeed.
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases

2
configure.ac
View File

@@ -1,5 +1,5 @@
dnl Init.
AC_INIT(dosbox-x,0.83.6,[https://github.com/joncampbell123/dosbox-x/issues],[],[http://dosbox-x.software])
AC_INIT(dosbox-x,0.83.6,[https://github.com/joncampbell123/dosbox-x/issues],[],[https://dosbox-x.com])
AC_PREREQ(2.60)
AC_CONFIG_SRCDIR(README.md)

2
contrib/linux/dosbox-x.spec.in
View File

@@ -9,7 +9,7 @@ Version: @PACKAGE_VERSION@
Release: 0%{?dist}
Summary: DOS emulator for running DOS games and applications including Windows 3.x/9x
License: GPL
URL: http://dosbox-x.com
URL: https://dosbox-x.com
Group: Applications/Emulators
Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.xz
Source1: dosbox-x.desktop

2
contrib/windows/installer/DOSBox-X-setup.iss
View File

@@ -1,7 +1,7 @@
#define MyAppName "DOSBox-X"
#define MyAppVersion "0.83.6"
#define MyAppPublisher "joncampbell123"
#define MyAppURL "http://dosbox-x.com/"
#define MyAppURL "https://dosbox-x.com/"
#define MyAppExeName "dosbox-x.exe"
#define MyAppBuildDate GetDateTimeString('yyyymmdd_hhnnss', '', '')

4
contrib/windows/installer/readme.txt
View File

@@ -19,7 +19,7 @@ To change to the drive mounted like above, type "C:". If everything went fine, D
Further Information
===================
Please visit the DOSBox-X homepage for the latest information about DOSBox-X:
http://dosbox-x.com/
https://dosbox-x.com/
For a complete DOSBox-X user guide, including common ways to configure DOSBox-X and its usage tips, please visit the DOSBox-X Wiki:
https://github.com/joncampbell123/dosbox-x/wiki
@@ -28,4 +28,4 @@ If you have any issues or want to request new features, please feel free to post
https://github.com/joncampbell123/dosbox-x/issues
The source code of DOSBox-X is also available from the DOSBox-X GitHub site:
https://github.com/joncampbell123/dosbox-x/
https://github.com/joncampbell123/dosbox-x/

2
contrib/windows/installer/setup_epilogue.txt
View File

@@ -1,4 +1,4 @@
For the latest information about DOSBox-X, please visit the DOSBox-X homepage: http://dosbox-x.com/
For the latest information about DOSBox-X, please visit the DOSBox-X homepage: https://dosbox-x.com/
For a complete DOSBox-X user guide, including common ways to configure DOSBox-X and its usage tips, please visit the DOSBox-X Wiki: https://github.com/joncampbell123/dosbox-x/wiki

4
contrib/windows/installer/setup_preamble.txt
View File

@@ -5,9 +5,9 @@ Like DOSBox, it emulates a PC necessary for running many MS-DOS games and applic
As a general-purpose DOS emulator, DOSBox-X has many useful and unique features that do not exist in other emulators like DOSBox, such as GUI menu and configuration tool, the ability to save and load states, support for more DOS commands and utilities, better compatibility with DOS applications, as well as features like Windows clipboard and long filename support for a tighter integration with Windows. With DOSBox-X you can run most DOS applications and games reliably in a DOS virtual machine. Please read the README.TXT file in the installation directory for a quick start, or see the dosbox-x.conf file for more information about optional settings in DOSBox-X.
Please visit the DOSBox-X homepage for the latest information about DOSBox-X:
http://dosbox-x.com/
https://dosbox-x.com/
The issue tracker and source code for DOSBox-X are available from the DOSBox-X GitHub site. Please feel free to report issues or request new features in DOSBox-X:
https://github.com/joncampbell123/dosbox-x/issues
Note: Due to the way of how Windows works, access to the "Program Files" folder requires administrative permissions. Unless you have specific reasons, we recommend that you install DOSBox-X in a different folder that does not require administrative permissions.
Note: Due to the way of how Windows works, access to the "Program Files" folder requires administrative permissions. Unless you have specific reasons, we recommend that you install DOSBox-X in a different folder that does not require administrative permissions.

2
depcomp
View File

@@ -16,7 +16,7 @@ scriptversion=2013-05-30.07; # UTC
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a

8
missing
View File

@@ -17,7 +17,7 @@ scriptversion=2013-10-28.13; # UTC
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@ else
exit $st
fi
perl_URL=http://www.perl.org/
flex_URL=http://flex.sourceforge.net/
gnu_software_URL=http://www.gnu.org/software
perl_URL=https://www.perl.org/
flex_URL=https://flex.sourceforge.net/
gnu_software_URL=https://www.gnu.org/software
program_details ()
{

2
ref-nmake/config.h
View File

@@ -345,6 +345,6 @@ typedef double Real64;
#define PACKAGE_NAME "dosbox-x"
#define PACKAGE_STRING "dosbox-x 0.82.22"
#define PACKAGE_TARNAME "dosbox-x"
#define PACKAGE_URL "http://dosbox-x.software"
#define PACKAGE_URL "https://dosbox-x.com"
#define PACKAGE_VERSION "0.82.22"
#define VERSION "0.82.22"

2
ref-static-makefiles/make_em/config.h
View File

@@ -206,7 +206,7 @@
#define PACKAGE_TARNAME "dosbox-x"
/* Define to the home page for this package. */
#define PACKAGE_URL "http://dosbox-x.software"
#define PACKAGE_URL "https://dosbox-x.com"
/* Define to the version of this package. */
#define PACKAGE_VERSION "0.82.22"

2
ref-static-makefiles/make_mgw/config.h
View File

@@ -204,7 +204,7 @@
#define PACKAGE_TARNAME "dosbox-x"
/* Define to the home page for this package. */
#define PACKAGE_URL "http://dosbox-x.software"
#define PACKAGE_URL "https://dosbox-x.com"
/* Define to the version of this package. */
#define PACKAGE_VERSION "0.82.22"

6
src/dosbox.cpp
View File

@@ -163,7 +163,7 @@ bool dbg_zero_on_xms_allocmem = true;
bool dbg_zero_on_ems_allocmem = true;
/* the exact frequency of the NTSC color subcarrier ~3.579545454...MHz or 315/88 */
/* see: http://en.wikipedia.org/wiki/Colorburst */
/* see: https://en.wikipedia.org/wiki/Colorburst */
#define NTSC_COLOR_SUBCARRIER_NUM (315000000ULL)
#define NTSC_COLOR_SUBCARRIER_DEN (88ULL)
@@ -915,7 +915,7 @@ void PreviousSaveSlot_Run(void) { PreviousSaveSlot(true); }
/* TODO: move to utility header */
#ifdef _MSC_VER /* Microsoft C++ does not have strtoull */
# if _MSC_VER < 1800 /* But Visual Studio 2013 apparently does (http://www.vogons.org/viewtopic.php?f=41&t=31881&sid=49ff69ebc0459ed6523f5a250daa4d8c&start=400#p355770) */
# if _MSC_VER < 1800 /* But Visual Studio 2013 apparently does (https://www.vogons.org/viewtopic.php?f=41&t=31881&sid=49ff69ebc0459ed6523f5a250daa4d8c&start=400#p355770) */
unsigned long long strtoull(const char *s,char **endptr,int base) {
return _strtoui64(s,endptr,base); /* pfff... whatever Microsoft */
}
@@ -3908,7 +3908,7 @@ void DOSBOX_SetupConfigSections(void) {
"manually. You must use the -fdc option regardless if loading floppies into\n"
"drives attached to any other FDC than the primary controller");
/* FIXME: From http://wiki.osdev.org/Floppy_Disk_Controller#Configure
/* FIXME: From https://wiki.osdev.org/Floppy_Disk_Controller#Configure
*
* "The three modes are PC-AT mode, PS/2 mode, and Model 30 mode. The most likely mode ... is model 30 mode.
* You may find some pre-1996 Pentium machines using PS/2 mode. You can ignore PC-AT mode."

2
src/gui/sdl_gui.cpp
View File

@@ -108,7 +108,7 @@ const char *aboutmsg = "DOSBox-X version " VERSION " (" SDL_STRING ", "
#else
"32"
#endif
"-bit)\nBuild date: " UPDATED_STR "\nCopyright 2011-" COPYRIGHT_END_YEAR " The DOSBox-X Team\nProject maintainer: joncampbell123\nDOSBox-X homepage: http://dosbox-x.com";
"-bit)\nBuild date: " UPDATED_STR "\nCopyright 2011-" COPYRIGHT_END_YEAR " The DOSBox-X Team\nProject maintainer: joncampbell123\nDOSBox-X homepage: https://dosbox-x.com";
const char *intromsg = "Welcome to DOSBox-X, a complete open-source DOS emulator.\nDOSBox-X creates a DOS shell which looks like the plain DOS.\nYou can also run Windows 3.x and 9x inside the DOS machine.";

2
src/ints/bios.cpp
View File

@@ -8181,7 +8181,7 @@ private:
}
CALLBACK_HandlerObject cb_bios_startup_screen;
static Bitu cb_bios_startup_screen__func(void) {
const char *msg = "DOSBox-X (C) 2011-" COPYRIGHT_END_YEAR " The DOSBox-X Team\nDOSBox-X project maintainer: joncampbell123\nFor more information visit http://dosbox-x.com/\n\n";
const char *msg = "DOSBox-X (C) 2011-" COPYRIGHT_END_YEAR " The DOSBox-X Team\nDOSBox-X project maintainer: joncampbell123\nFor more information visit https://dosbox-x.com/\n\n";
int logo_x,logo_y,x,y,rowheight=8;
y = 2;

2
vs2015/config.h.backup
View File

@@ -325,5 +325,5 @@ typedef double Real64;
#define PACKAGE_NAME "dosbox-x"
#define PACKAGE_STRING "dosbox-x 0.801"
#define PACKAGE_TARNAME "dosbox-x"
#define PACKAGE_URL "http://dosbox-x.software"
#define PACKAGE_URL "https://dosbox-x.com"
#define PACKAGE_VERSION "0.801"

2
vs2015/config_package.h
View File

@@ -3,6 +3,6 @@
#define PACKAGE_NAME "dosbox-x"
#define PACKAGE_STRING "dosbox-x 0.83.6"
#define PACKAGE_TARNAME "dosbox-x"
#define PACKAGE_URL "http://dosbox-x.software"
#define PACKAGE_URL "https://dosbox-x.com"
#define PACKAGE_VERSION "0.83.6"
#define VERSION "0.83.6"