diff --git a/.gitignore b/.gitignore index c878590..29f52fd 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ package/ oclint/ steamworks/ +build/ diff --git a/CMakeLists.txt b/CMakeLists.txt index e004597..b3e5309 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,6 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 3.5) Project(oneshot) -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) - ## Setup options ## option(STEAM "Build for Steam" OFF) @@ -287,20 +284,28 @@ add_executable(${PROJECT_NAME} MACOSX_BUNDLE WIN32 ${EMBEDDED_SOURCE} ) +find_package(SDL3) +find_package(SDL3_image) +find_package(SDL3_sound) +find_package(SDL3_ttf) +find_package(OpenAL) +find_package(Boost REQUIRED) +find_package(PhysFS) +find_path(PIXMAN_INCLUDE_DIR NAMES pixman.h PATH_SUFFIXES pixman-1) +find_library(PIXMAN_LIBRARY NAMES pixman-1 pixman-1_static pixman-1_staticd) +find_package(Ruby 3.3) +pkg_check_modules(SIGC2 REQUIRED sigc++-2.0) +find_package_handle_standard_args(pixman-1 DEFAULT_MSG PIXMAN_LIBRARY PIXMAN_INCLUDE_DIR) +if(PIXMAN-1_FOUND) + set(PIXMAN_LIBRARIES ${PIXMAN_LIBRARY}) + set(PIXMAN_INCLUDE_DIRS ${PIXMAN_INCLUDE_DIR}) +endif() + +mark_as_advanced(PIXMAN_INCLUDE_DIR PIXMAN_LIBRARY) + target_compile_definitions(${PROJECT_NAME} PRIVATE ${DEFINES}) -target_include_directories(${PROJECT_NAME} PRIVATE src) -target_link_libraries(${PROJECT_NAME} - CONAN_PKG::boost - CONAN_PKG::openal - CONAN_PKG::physfs - CONAN_PKG::pixman - CONAN_PKG::ruby - CONAN_PKG::sdl2 - CONAN_PKG::sdl2_image - CONAN_PKG::sdl2_ttf - CONAN_PKG::sdl_sound-mkxp - CONAN_PKG::sigc++ - ${PLATFORM_LIBRARIES}) +target_include_directories(${PROJECT_NAME} PRIVATE src ${PIXMAN_INCLUDE_DIRS} ${SIGC2_INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE SDL3::SDL3 SDL3_image::SDL3_image SDL3_sound::SDL3_sound SDL3_ttf::SDL3_ttf Boost::boost OpenAL::OpenAL physfs ${PIXMAN_LIBRARIES} ${SIGC2_INCLUDE_DIRS} ${PLATFORM_LIBRARIES}) IF(APPLE) add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND cmake -P "${CMAKE_SOURCE_DIR}/patches/mac/CompleteBundle.cmake" VERBATIM) diff --git a/binding-mri/binding-mri.cpp b/binding-mri/binding-mri.cpp index 5f4b3c1..d8f98c4 100644 --- a/binding-mri/binding-mri.cpp +++ b/binding-mri/binding-mri.cpp @@ -39,7 +39,7 @@ #include #include -#include +#include extern const char module_rpg1[]; diff --git a/binding-mri/journal-binding.cpp b/binding-mri/journal-binding.cpp index 7ca301f..72c4a8b 100644 --- a/binding-mri/journal-binding.cpp +++ b/binding-mri/journal-binding.cpp @@ -27,12 +27,12 @@ #include #endif -#include +#include #define BUFFER_SIZE 256 static SDL_Thread *thread = NULL; -static SDL_mutex *mutex = NULL; +static SDL_Mutex *mutex = NULL; static volatile char lang_buffer[BUFFER_SIZE]; static volatile char message_buffer[BUFFER_SIZE]; static volatile bool active = false; diff --git a/binding-mri/niko-binding.cpp b/binding-mri/niko-binding.cpp index 036900d..d10cd00 100644 --- a/binding-mri/niko-binding.cpp +++ b/binding-mri/niko-binding.cpp @@ -28,9 +28,8 @@ #include #endif -#include +#include namespace syswm { -#include } #define NIKO_X (320 - 16) @@ -39,7 +38,7 @@ namespace syswm { #define BUFFER_SIZE 256 static SDL_Thread *thread = NULL; -static SDL_mutex *mutex = NULL; +static SDL_Mutex *mutex = NULL; static volatile char message_buffer[BUFFER_SIZE]; static volatile bool active = false; static volatile int message_len = 0; diff --git a/binding-mri/oneshot-binding.cpp b/binding-mri/oneshot-binding.cpp index b305dc9..ed04aad 100644 --- a/binding-mri/oneshot-binding.cpp +++ b/binding-mri/oneshot-binding.cpp @@ -5,7 +5,7 @@ #include "binding-types.h" #include "eventthread.h" -#include +#include #include RB_METHOD(oneshotSetYesNo) diff --git a/scripts/Window_Settings.rb b/scripts/Window_Settings.rb index f483f6a..9e2866b 100644 --- a/scripts/Window_Settings.rb +++ b/scripts/Window_Settings.rb @@ -144,7 +144,7 @@ class Window_Settings tr('Frameskip'), tr('In-Game Timer'), tr('Language'), - tr('Debug mode(DEVELOPERS ONLY!)'), + tr('Debug mode(DEVS ONLY!)'), tr('Configure Controls (Press F1)'), ]