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

fix for mingw32 build

Browse Source
This commit is contained in:
Wengier
2021-12-06 22:25:15 -05:00
parent d9b5bc587b
commit f955d4944b
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build-mingw-lowend
View File

@@ -58,6 +58,6 @@ export INTERNAL_FREETYPE=1
echo Compiling DOSBox-X echo Compiling DOSBox-X
chmod +x configure chmod +x configure
# FIXME: I would like MinGW builds to enable the debugger, eventually # FIXME: I would like MinGW builds to enable the debugger, eventually
./configure --enable-core-inline --disable-mt32 --disable-libfluidsynth --disable-libslirp --enable-d3d9 --enable-d3d-shaders --prefix=/usr "$@" || exit 1 ./configure --enable-core-inline --disable-libfluidsynth --disable-libslirp --enable-d3d9 --enable-d3d-shaders --prefix=/usr "$@" || exit 1
make -j3 || exit 1 make -j3 || exit 1

2
src/dos/cdrom_image.cpp
View File

@@ -69,7 +69,7 @@
#include "src/libs/libchdr/FLAC/lpc.c" #include "src/libs/libchdr/FLAC/lpc.c"
#include "src/libs/libchdr/FLAC/md5.c" #include "src/libs/libchdr/FLAC/md5.c"
#include "src/libs/libchdr/FLAC/memory.c" #include "src/libs/libchdr/FLAC/memory.c"
#if defined(WIN32) && !defined(HX_DOS) #if defined(WIN32) && !defined(HX_DOS) && !(defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR))
#include "src/libs/libchdr/FLAC/windows_unicode_filenames.c" #include "src/libs/libchdr/FLAC/windows_unicode_filenames.c"
#endif #endif
#include "src/libs/libchdr/lzma/LzmaDec.c" #include "src/libs/libchdr/lzma/LzmaDec.c"

2
src/libs/libchdr/FLAC/share/compat.h
View File

@@ -138,7 +138,7 @@
#define FLUIDINC #define FLUIDINC
#include "config.h" #include "config.h"
#if defined(_WIN32) && !defined(C_HX_DOS) #if defined(_WIN32) && !defined(C_HX_DOS) && !(defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR))
/* All char* strings are in UTF-8 format. Added to support Unicode files on Windows */ /* All char* strings are in UTF-8 format. Added to support Unicode files on Windows */
#include "win_utf8_io.h" #include "win_utf8_io.h"

4
vs/sdlnet/SDLnet.c
View File

@@ -27,7 +27,9 @@
#include "SDLnetsys.h" #include "SDLnetsys.h"
#include "SDL_net.h" #include "SDL_net.h"
#if defined(__WIN32__)
#include "winerror.h"
#endif
const SDL_version *SDLNet_Linked_Version(void) const SDL_version *SDLNet_Linked_Version(void)
{ {