Remove some hopefully unneeded macros
This commit is contained in:
+1
-7
@@ -91,7 +91,7 @@ SET(LINKER_FLAGS )
|
||||
SET(EXTRA_LIBS )
|
||||
|
||||
IF(WIN32)
|
||||
SET(CPP_DEFS ${CPP_DEFS} _WIN32 _WIN32_WINNT=0x0502)
|
||||
SET(CPP_DEFS ${CPP_DEFS} _WIN32)
|
||||
|
||||
OPTION(ALSOFT_BUILD_ROUTER "Build the router (EXPERIMENTAL; creates OpenAL32.dll and soft_oal.dll)" OFF)
|
||||
|
||||
@@ -851,9 +851,6 @@ IF(WIN32)
|
||||
get_windowssdk_include_dirs(${WINDOWSSDK_PREFERRED_DIR} WINSDK_INCLUDE_DIRS)
|
||||
ENDIF()
|
||||
|
||||
SET(OLD_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS})
|
||||
SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_WIN32_WINNT=0x0502)
|
||||
|
||||
# Check MMSystem backend
|
||||
CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H)
|
||||
FIND_LIBRARY(WINMM_LIBRARY NAMES winmm
|
||||
@@ -892,9 +889,6 @@ IF(WIN32)
|
||||
SET(ALC_OBJS ${ALC_OBJS} alc/backends/wasapi.cpp alc/backends/wasapi.h)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
SET(CMAKE_REQUIRED_DEFINITIONS ${OLD_REQUIRED_DEFINITIONS})
|
||||
UNSET(OLD_REQUIRED_DEFINITIONS)
|
||||
ENDIF()
|
||||
IF(ALSOFT_REQUIRE_WINMM AND NOT HAVE_WINMM)
|
||||
MESSAGE(FATAL_ERROR "Failed to enabled required WinMM backend")
|
||||
|
||||
+1
-9
@@ -18,14 +18,6 @@
|
||||
* Or go to http://www.gnu.org/copyleft/lgpl.html
|
||||
*/
|
||||
|
||||
#ifdef _WIN32
|
||||
#ifdef __MINGW32__
|
||||
#define _WIN32_IE 0x501
|
||||
#else
|
||||
#define _WIN32_IE 0x400
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include "alconfig.h"
|
||||
@@ -33,7 +25,7 @@
|
||||
#include <cstdlib>
|
||||
#include <cctype>
|
||||
#include <cstring>
|
||||
#ifdef _WIN32_IE
|
||||
#ifdef _WIN32
|
||||
#include <windows.h>
|
||||
#include <shlobj.h>
|
||||
#endif
|
||||
|
||||
@@ -18,17 +18,6 @@
|
||||
* Or go to http://www.gnu.org/copyleft/lgpl.html
|
||||
*/
|
||||
|
||||
/* Define this first since Windows' system headers may include headers affected
|
||||
* by it (is it even still needed?).
|
||||
*/
|
||||
#ifdef _WIN32
|
||||
#ifdef __MINGW32__
|
||||
#define _WIN32_IE 0x501
|
||||
#else
|
||||
#define _WIN32_IE 0x400
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
Reference in New Issue
Block a user