Lightemerald/windows-user-space-emulator
2
0
Fork 0
mirror of https://github.com/momo5502/emulator.git synced 2026-01-31 16:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
momo5502
2025-04-14 20:01:00 +02:00
parent d9fc5457bc
commit 68022ef501
6 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/windows-emulator/CMakeLists.txt
View File

@@ -14,9 +14,11 @@ if(NOT MOMO_ENABLE_CLANG_TIDY)
target_precompile_headers(windows-emulator PRIVATE std_include.hpp)
endif()
if (NOT CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
target_link_libraries(windows-emulator PRIVATE
unicorn-emulator
)
endif()
if (MOMO_ENABLE_RUST_CODE)
target_link_libraries(windows-emulator PRIVATE

8
src/windows-emulator/windows_emulator.cpp
View File

@@ -3,7 +3,9 @@
#include "cpu_context.hpp"
#ifndef OS_EMSCRIPTEN
#include <unicorn_x64_emulator.hpp>
#endif
#if MOMO_ENABLE_RUST_CODE
#include <icicle_x64_emulator.hpp>
@@ -263,6 +265,10 @@ namespace
std::unique_ptr<x64_emulator> create_default_x64_emulator()
{
#ifdef OS_EMSCRIPTEN
return icicle::create_x64_emulator();
#else
#if MOMO_ENABLE_RUST_CODE
const auto* env = getenv("EMULATOR_ICICLE");
if (env && (env == "1"sv || env == "true"sv))
@@ -270,8 +276,8 @@ std::unique_ptr<x64_emulator> create_default_x64_emulator()
return icicle::create_x64_emulator();
}
#endif
return unicorn::create_x64_emulator();
#endif
}
windows_emulator::windows_emulator(application_settings app_settings, const emulator_settings& settings,