1
0
Fork 0
No description
Find a file
Patryk Obara 94b987b5b5 Update MSF conversion functions
All usecases, that required these functions to pass 3 values separately
are now gone, we can simply pass/return a struct now.
2019-12-18 22:31:19 +01:00
.github Fixed --enabled-debug on Windows MSYS2 2019-12-14 17:51:11 +01:00
contrib Contribute a static-opus builder 2019-11-28 09:41:43 +01:00
docs Remove all physical CD-ROM references from manual 2019-12-18 22:31:19 +01:00
include Remove code ifdefed for OS/2 2019-12-09 16:27:11 +01:00
scripts Reverse sort by count and item name in the summary 2019-12-12 21:24:40 +01:00
src Update MSF conversion functions 2019-12-18 22:31:19 +01:00
vs Create dos_mscdex header 2019-12-18 22:31:19 +01:00
.gitignore Refactor the build and list-packages scripts 2019-11-24 15:16:44 +01:00
.pylint Allow maximum-issues to be set via command-line 2019-11-24 15:16:44 +01:00
acinclude.m4 Move definition out of autoconfig 2019-12-03 05:12:28 +01:00
AUTHORS Update authors 2010-04-20 12:51:03 +00:00
autogen.sh Allow less beautiful version numbers. 2007-02-04 10:46:34 +00:00
configure.ac Fixed --enabled-debug on Windows MSYS2 2019-12-14 17:51:11 +01:00
COPYING Update year and address of FSF 2019-01-25 14:09:58 +00:00
INSTALL Fixed --enabled-debug on Windows MSYS2 2019-12-14 17:51:11 +01:00
Makefile.am Rename directory with Visual Studio solution 2019-12-09 07:22:15 +01:00
README Remove all physical CD-ROM references from manual 2019-12-18 22:31:19 +01:00
README.md Add URLs for branches to README.md 2019-12-10 14:17:27 +01:00
THANKS Updated 2010-05-09 11:07:51 +00:00

dosbox-staging

This repository attempts to modernize the DOSBox project by using current development practices and tools, fixing issues, adding features that better support today's systems, and sending patches upstream. Read more at Vogons thread.

Summary of differences compared to upstream:

dosbox-staging DOSBox
Version control Git SVN
Language C++11 C++031
CI Yes No
Static analysis Yes2,3 No
Dynamic analysis Yes No
Automated regression tests No (planned)4 No
SDL 1.2 (2.0 WIP)5 1.2

Codecs supported for CD Digital Audio emulation (loading CD music via cue sheets):

dosbox-staging DOSBox
Opus Yes (libopus) No
OGG/Vorbis Yes (built-in) Yes - SDL_sound 1.2 (libvorbis)6,
MP3 Yes (built-in) Yes - SDL_sound 1.2 (libmpg123)6,
FLAC Yes (built-in) No§
WAV Yes (built-in) Yes - SDL_sound 1.2 (internal)7,
AIFF No Yes - SDL_sound 1.2 (internal)7,

- SDL 1.2 is not actively maintained any more.
† - 22.05 kHz, 44.1 kHz, 48 kHz; mono, stereo
‡ - 44.1 kHz stereo only
§ - SDL_sound supports it, but the feature might be broken or DOSBox does not indicate support.

Development snapshot builds

Pre-release builds can be downloaded from CI build artifacts. Go to Linux or Windows, select a build you are interested in, click "Artifacts" button (in the top right), and download the package.

Linux

Snapshots are dynamically-linked x86_64 builds, you'll need additional packages installed via your package manager. Different dependencies might be necessary for specific snapshots (check included README file).

Fedora

$ sudo dnf install SDL SDL_net opusfile

Debian, Ubuntu

$ sudo apt install libsdl1.2 sdl-net1.2 opusfile

Arch, Manjaro

$  sudo pacman -S sdl sdl_net opusfile

Windows

A dosbox.exe file in a snapshot package is not signed, therefore Windows 10 might prevent the program from starting.

If Windows displays the message "Windows Defender SmartScreen prevented an unrecognised app from starting", you have two options to dismiss it:

  1. Click "More info", and button "Run anyway" will appear.
  2. Right-click on dosbox.exe, select: Properties → General → Security → Unblock

Windows packages are built for "x86" architecture (in practice it means i686).

macOS

macOS snapshots are not available at the moment.

Build instructions

Linux, macOS, MSYS2, MinGW, other OSes

Read INSTALL file for a general summary about dependencies and configure options. Read build.md for the comprehensive compilation guide.

$ git clone https://github.com/dreamer/dosbox-staging.git
$ cd dosbox-staging
$ ./autogen.sh
$ ./configure
$ make

You can also use a helper script ./scripts/build.sh, that performs builds for many useful scenarios (LTO, FDO, sanitizer builds, many others).

Visual Studio (2019 or newer)

First, you need to setup vcpkg to install build dependencies. Once vcpkg is installed and bootstrapped, open PowerShell, and run:

PS> .\vcpkg integrate install
PS> .\vcpkg install libpng sdl1 sdl1-net opusfile

These two steps will ensure that MSVC finds and links all dependencies.

Start Visual Studio, open file: vs\dosbox.sln and build all projects (Ctrl+Shift+B).

Interop with SVN

This repository is (deliberately) NOT git-svn compatible, this is a pure Git repo.

Commits landing in SVN upstream are imported to this repo in a timely manner, to the branches matching svn/* pattern. You can safely use those branches to rebase your changes, and prepare patches using Git format-patch for sending upstream (it is easier and faster, than preparing patches manually).

Other branch name patterns are also in use, e.g. vogons/* for various patches posted on the Vogons forum.

Git tags matching pattern svn/* are pointing to the commits referenced by SVN "tag" paths at the time of creation.

Additionally, we attach some optional metadata to the commits imported from SVN in the form of Git notes. To fetch them, run:

$ git fetch origin "refs/notes/*:refs/notes/*"