From 7b28d12704d38b23d5eda4afdb894c66392b0f24 Mon Sep 17 00:00:00 2001 From: Roman Kharitonov Date: Sat, 24 May 2025 19:09:52 +1000 Subject: [PATCH 1/2] Add x86 to readme (closes #31) --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fe931d5..557770f 100644 --- a/README.md +++ b/README.md @@ -28,12 +28,12 @@ specific files as needed without having to unpack the entire archive. ### Prerequisites -- Installed **x64** version of [FAR Manager](https://farmanager.com/download.php?l=en) -- Installed **x64** version of [Observer](https://github.com/lazyhamster/Observer/releases) plugin +- [FAR Manager](https://farmanager.com/download.php?l=en) (x86 or x64) +- [Observer](https://github.com/lazyhamster/Observer/releases) plugin (x86 or x64) ### Module Installation -1. Download the [latest release](https://github.com/refaim/ObserverModules/releases/tag/nightly) of the module you're +1. Download the [latest release](https://github.com/refaim/ObserverModules/releases/latest) of the module you're interested in 2. Note that the archive contains an observer_user.ini file. If you're installing multiple modules or already have this file in your Observer modules folder, you'll need to manually merge these ini files to ensure all modules work From bc8f1e4e06bb1f24c27dbf03e6998cf82505eb62 Mon Sep 17 00:00:00 2001 From: Roman Kharitonov Date: Sat, 24 May 2025 19:10:51 +1000 Subject: [PATCH 2/2] Simplify CMake config --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7674aa1..f387421 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,8 +24,6 @@ set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") set(ZLIB_USE_STATIC_LIBS ON) find_package(ZLIB REQUIRED) find_path(ZSTR_INCLUDE_DIRS "zstr.hpp") -find_package(nlohmann_json REQUIRED) -find_package(xxHash CONFIG REQUIRED) set(ALL_MODULES renpy rpgmaker zanzarah) set(RELEASED_MODULES renpy zanzarah) @@ -51,6 +49,8 @@ endforeach () # === CTest === find_package(Catch2 REQUIRED) +find_package(nlohmann_json REQUIRED) +find_package(xxHash CONFIG REQUIRED) add_executable(tests src/tests/framework/observer.cpp src/tests/framework/testcase.cpp