From 0baf1c78c0310b5e00707f18166d2cf347d48638 Mon Sep 17 00:00:00 2001 From: Florent Castelli Date: Tue, 24 Jan 2017 03:51:07 +0100 Subject: [PATCH] vs: Move defines out of Common.h to the build system --- Source/Core/Common/Common.h | 7 ------- Source/VSProps/Base.props | 2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Source/Core/Common/Common.h b/Source/Core/Common/Common.h index df9970a962..8be79c3cdc 100644 --- a/Source/Core/Common/Common.h +++ b/Source/Core/Common/Common.h @@ -39,13 +39,6 @@ extern const std::string scm_distributor_str; // Since they are always around on Windows #define HAVE_WX 1 -#ifndef HAVE_OPENAL -#define HAVE_OPENAL 1 -#endif - -#ifndef HAVE_PORTAUDIO -#define HAVE_PORTAUDIO 1 -#endif // Debug definitions #if defined(_DEBUG) diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props index 66013cc4a9..0dbbdd59ff 100644 --- a/Source/VSProps/Base.props +++ b/Source/VSProps/Base.props @@ -55,6 +55,8 @@ PSAPI_VERSION=1;_M_X86=1;%(PreprocessorDefinitions) SFML_STATIC;%(PreprocessorDefinitions) CURL_STATICLIB;%(PreprocessorDefinitions) + HAVE_OPENAL=1;%(PreprocessorDefinitions) + HAVE_PORTAUDIO=1;%(PreprocessorDefinitions) _ARCH_64=1;_M_X86_64=1;%(PreprocessorDefinitions)