From f2be86a65e75de4b1ba9eb33f3c0cc90dd739620 Mon Sep 17 00:00:00 2001 From: Sandu Liviu Catalin Date: Fri, 1 May 2020 20:41:00 +0300 Subject: [PATCH] Allow API selection as a cmake option. --- CMakeLists.txt | 1 + module/Misc/Routine.hpp | 2 +- vcmp/CMakeLists.txt | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d5f5f376..035692a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,7 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) option(BUILTIN_RUNTIMES "Include the MinGW runtime into the binary itself." ON) option(FORCE_32BIT_BIN "Create a 32-bit executable binary if the compiler defaults to 64-bit." OFF) option(ENABLE_MYSQL "Enable the MySQL library." OFF) +option(ENABLE_API21 "Build for 2.1 API." OFF) # Default to c++14 standard if(CMAKE_VERSION VERSION_LESS "3.1") diff --git a/module/Misc/Routine.hpp b/module/Misc/Routine.hpp index 30e19a7f..7aba871b 100644 --- a/module/Misc/Routine.hpp +++ b/module/Misc/Routine.hpp @@ -39,7 +39,7 @@ private: bool mSuspended; // Whether this instance is allowed to receive calls. bool mQuiet; // Whether this instance is allowed to handle errors. bool mEndure; // Whether this instance is allowed to terminate itself on errors. - bool mTerminated; // Whether this instance is allowed to terminate itself on errors. + bool mTerminated; // Whether this instance was terminated once. Uint8 mArgc; // The number of arguments that the routine must forward. Argument mArgv[14]; // The arguments that the routine must forward. diff --git a/vcmp/CMakeLists.txt b/vcmp/CMakeLists.txt index 4269371a..2f4eb032 100644 --- a/vcmp/CMakeLists.txt +++ b/vcmp/CMakeLists.txt @@ -1,5 +1,8 @@ # Create the VCMP library add_library(VCMP STATIC vcmp.h vcmp.c vcmp20.h vcmp21.h) +# Checkf for API version +if (ENABLE_API21) + target_compile_definitions(VCMP PUBLIC VCMP_SDK_2_1=1) +endif() # Library includes target_include_directories(VCMP PUBLIC ${CMAKE_CURRENT_LIST_DIR}) -