Skip to content

Commit

Permalink
emulators-ws compilation fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
caiiiycuk committed Jan 19, 2024
1 parent a8c4934 commit b3d596b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions native/jsdos/jsdos-support.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion targets/dosbox.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()

Expand Down

0 comments on commit b3d596b

Please sign in to comment.