diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-06-02 22:59:56 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-06-02 22:59:56 +0300 |
| commit | 815b1f24fa298784d9204b9248bc69ceb2b3d762 (patch) | |
| tree | 588894743c41097540b3ac2d11b0338474b30024 /build_files/build_environment/patches | |
| parent | 2ef695fabf33e227d742aa5adf39490a2a87f58b (diff) | |
build_environment: support for msvc2017 and newer cmake.
-expanded build_deps.cmd with 2017 support, it can't locate msvc2017 so needs to be run from developer prompt.
-Newer cmake was unhappy with openal's cmakelists.txt
-collada has warning as error on and errored out on new msvc2017 warnings.
Diffstat (limited to 'build_files/build_environment/patches')
| -rw-r--r-- | build_files/build_environment/patches/openal.diff | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/build_files/build_environment/patches/openal.diff b/build_files/build_environment/patches/openal.diff new file mode 100644 index 00000000000..2c9862b95a0 --- /dev/null +++ b/build_files/build_environment/patches/openal.diff @@ -0,0 +1,13 @@ +diff -Naur external_openal_original/CMakeLists.txt external_openal/CMakeLists.txt +--- external_openal_original/CMakeLists.txt 2016-01-24 20:12:39 -0700 ++++ external_openal/CMakeLists.txt 2018-06-02 12:16:52 -0600 +@@ -885,7 +885,8 @@ + OPTION(ALSOFT_REQUIRE_MMDEVAPI "Require MMDevApi backend" OFF) + IF(HAVE_WINDOWS_H) + # Check MMSystem backend +- CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H -D_WIN32_WINNT=0x0502) ++ set(CMAKE_REQUIRED_FLAGS "-D_WIN32_WINNT=0x0502") ++ CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H) + IF(HAVE_MMSYSTEM_H) + CHECK_SHARED_FUNCTION_EXISTS(waveOutOpen "windows.h;mmsystem.h" winmm "" HAVE_LIBWINMM) + IF(HAVE_LIBWINMM) |