diff --git a/native/jsdos/jsdos-support.cpp b/native/jsdos/jsdos-support.cpp index 9cabac26..71d1df25 100644 --- a/native/jsdos/jsdos-support.cpp +++ b/native/jsdos/jsdos-support.cpp @@ -10,22 +10,22 @@ namespace { #ifndef EMSCRIPTEN - std::atomic_bool _exit(false); + std::atomic_bool jsdos_exit(false); #else - bool _exit = false; + bool jsdos_exit = false; #endif } void jsdos::init() { - _exit = false; + jsdos_exit = false; } bool jsdos::isExitRequested() { - return _exit; + return jsdos_exit; } void jsdos::requestExit() { - _exit = true; + jsdos_exit = true; } void jsdos::cout(const char* data, int amount) { diff --git a/targets/dosbox.cmake b/targets/dosbox.cmake index 34fd6f0f..8794a5f8 100644 --- a/targets/dosbox.cmake +++ b/targets/dosbox.cmake @@ -172,7 +172,7 @@ target_include_directories(libdosbox-core PUBLIC ${INCLUDE_DIRECTORIES_CORE}) add_library(libdosbox OBJECT ${SOURCES_JSDOS_CXX11} ${SOURCES_JSDOS_NET_C}) target_link_libraries(libdosbox libdosbox-core) -if (MINGW) +if (MINGW AND TARGET dosbox) target_compile_definitions(dosbox PUBLIC -DWIN32) endif ()