Support MINGW build

caiiiycuk · Jan 22, 2024 · bf7e7dd · bf7e7dd
1 parent b3d596b
commit bf7e7dd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/native/config/config.h b/native/config/config.h
@@ -1,6 +1,8 @@
 #ifndef _JSDOS_CONFIG_H_
 #define _JSDOS_CONFIG_H_
 
+#include <stdint.h>
+
 #define jsthrow(msg) { printf("%s\n", msg);abort(); }
 
 /* Define if building universal (internal helper macro) */
@@ -83,7 +85,9 @@
 /* #undef C_SDL_SOUND */
 
 /* Define to 1 if you have setpriority support */
+#ifndef WIN32
 #define C_SET_PRIORITY 1
+#endif
 
 /* Define to 1 to enable movie recording, requires zlib built without Z_SOLO
    */

diff --git a/native/dosbox-x b/native/dosbox-x
diff --git a/native/jsdos/dosbox-x/jsdos-x-main.cpp b/native/jsdos/dosbox-x/jsdos-x-main.cpp
@@ -6398,11 +6398,6 @@ void SDL_OnSectionPropChange(Section *x) {
 
 static void show_warning(char const * const message) {
     bool textonly = true;
-#ifdef WIN32
-    textonly = false;
-    if ( !sdl.inioptionsInit(SDL_INIT_VIDEO|SDL_INIT_NOPARACHUTE) < 0 ) textonly = true;
-    sdl.inited = true;
-#endif
     LOG_MSG( "Warning: %s", message);
     if(textonly) return;
 #if defined(C_SDL2)

diff --git a/targets/dosbox-x-sdl2.cmake b/targets/dosbox-x-sdl2.cmake
@@ -14,7 +14,7 @@ set(DEFINITIONS_CORE_X
 
 if (${EMSCRIPTEN})
     list(APPEND DEFINITIONS_CORE_X -DC_EMSCRIPTEN)
-else ()
+elseif (!CMAKE_NO_FIND)
     find_package(SDL2 REQUIRED)
 endif ()
+1 −1		src/dos/dos_mscdex.cpp
+1 −1		src/hardware/RetroWaveLib/RetroWave_DOSBoX.cpp
+1 −1		src/hardware/serialport/libserial.cpp
+2 −0		src/libs/fluidsynth/fluidsynth_priv.h