From a727fb4857d12fd499e934eb8d3174586fad0681 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Thu, 18 Dec 2014 02:44:16 +0300 Subject: [PATCH] Use more consistent name for an option --- CMakeLists.txt | 2 +- SDL2pp/Audio.hh | 2 +- SDL2pp/AudioDevice.cc | 2 +- SDL2pp/Config.hh.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c23d01e..8b6ed18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) # there are functions present on wiki, but not yet in stable SDL2 releases; # we hide these under following options -OPTION(SDL2PP_NEW_2_0_4 "Enable new SDL2 functions present since SDL2 2.0.4" OFF) +OPTION(SDL2PP_WITH_2_0_4 "Enable new functions available only in SDL2 2.0.4+" OFF) OPTION(SDL2PP_WITH_WERROR "Make warnings fatal" OFF) IF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) diff --git a/SDL2pp/Audio.hh b/SDL2pp/Audio.hh index 73c316a..2e62ad4 100644 --- a/SDL2pp/Audio.hh +++ b/SDL2pp/Audio.hh @@ -100,7 +100,7 @@ public: LockHandle Lock(); -#ifdef SDL2PP_NEW_2_0_4 +#ifdef SDL2PP_WITH_2_0_4 void QueueAudio(const void* data, Uint32 len); void ClearQueuedAudio(); Uint32 GetQueuedAudioSize() const; diff --git a/SDL2pp/AudioDevice.cc b/SDL2pp/AudioDevice.cc index 43da4cd..52582ff 100644 --- a/SDL2pp/AudioDevice.cc +++ b/SDL2pp/AudioDevice.cc @@ -79,7 +79,7 @@ AudioDevice::LockHandle AudioDevice::Lock() { return LockHandle(this); } -#ifdef SDL2PP_NEW_2_0_4 +#ifdef SDL2PP_WITH_2_0_4 void AudioDevice::QueueAudio(const void* data, Uint32 len) { if (SDL_QueueAudio(device_id_, data, len) == 0) throw Exception("SDL_QueueAudio failed"); diff --git a/SDL2pp/Config.hh.in b/SDL2pp/Config.hh.in index 394f4b3..a184a99 100644 --- a/SDL2pp/Config.hh.in +++ b/SDL2pp/Config.hh.in @@ -23,6 +23,6 @@ #define SDL2PP_CONFIG_HH #cmakedefine SDL2PP_WITH_IMAGE -#cmakedefine SDL2PP_NEW_2_0_4 +#cmakedefine SDL2PP_WITH_2_0_4 #endif