diff --git a/native/config/config.h b/native/config/config.h index d2f4b059..995a6ce2 100644 --- a/native/config/config.h +++ b/native/config/config.h @@ -1,6 +1,8 @@ #ifndef _JSDOS_CONFIG_H_ #define _JSDOS_CONFIG_H_ +#include + #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 index 1163d00d..54523fab 160000 --- a/native/dosbox-x +++ b/native/dosbox-x @@ -1 +1 @@ -Subproject commit 1163d00d547be8026cb25cfc7c750b38b594e6b0 +Subproject commit 54523fab532dde034985ec4bf9064f0c2a393ca1 diff --git a/native/jsdos/dosbox-x/jsdos-x-main.cpp b/native/jsdos/dosbox-x/jsdos-x-main.cpp index 4cb0fd10..3847734b 100644 --- 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 index 2f258ba6..d65dd931 100644 --- 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 ()