diff options
| author | driver1998 <driver1998@foxmail.com> | 2019-04-26 03:51:31 +0800 |
|---|---|---|
| committer | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-04-25 12:51:31 -0700 |
| commit | 7ec28764b6f3fb8ab5e182bc348d42ae159b90da (patch) | |
| tree | 503d9eae2d438083db7bc24c78b6e664fd3ea9ac | |
| parent | 6735932ad32af7cd20c18cefcae59368cd530ce1 (diff) | |
| download | vcpkg-7ec28764b6f3fb8ab5e182bc348d42ae159b90da.tar.gz vcpkg-7ec28764b6f3fb8ab5e182bc348d42ae159b90da.zip | |
[openal-soft] Fixes windows arm/arm64 build on vs2019 (#6115)
* fixes openal-soft arm/arm64 windows build, on vs2019
* bump openal-soft version to 1.19.1-2
| -rw-r--r-- | ports/openal-soft/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openal-soft/fix-arm-builds.patch | 30 | ||||
| -rw-r--r-- | ports/openal-soft/portfile.cmake | 3 |
3 files changed, 33 insertions, 2 deletions
diff --git a/ports/openal-soft/CONTROL b/ports/openal-soft/CONTROL index cc30df1de..3591a3f70 100644 --- a/ports/openal-soft/CONTROL +++ b/ports/openal-soft/CONTROL @@ -1,3 +1,3 @@ Source: openal-soft -Version: 1.19.1-1 +Version: 1.19.1-2 Description: OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API. diff --git a/ports/openal-soft/fix-arm-builds.patch b/ports/openal-soft/fix-arm-builds.patch new file mode 100644 index 000000000..87fecbca2 --- /dev/null +++ b/ports/openal-soft/fix-arm-builds.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 39b80250..e2a1ed76 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1409,6 +1409,7 @@ ELSE() + ELSEIF(CMAKE_COMPILER_IS_GNUCC) + SET(SUBSYS_FLAG ${SUBSYS_FLAG} "-mwindows") + ENDIF() ++ SET(COMMON_LIB ${COMMON_LIB} shell32 ole32) + ENDIF() + + IF(WIN32 AND ALSOFT_BUILD_ROUTER) +diff --git a/native-tools/CMakeLists.txt b/native-tools/CMakeLists.txt +index 5e816bba..16f3be12 100644 +--- a/native-tools/CMakeLists.txt ++++ b/native-tools/CMakeLists.txt +@@ -24,6 +24,11 @@ set_target_properties(bsincgen PROPERTIES OUTPUT_NAME bsincgen) + set_target_properties(bsincgen PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}") + set_target_properties(bsincgen PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}") + target_compile_definitions(bsincgen PRIVATE ${CPP_DEFS}) ++set(BSINCGEN_LIB ) + if(HAVE_LIBM) +- target_link_libraries(bsincgen m) ++ set(BSINCGEN_LIB ${BSINCGEN_LIB} m) + endif(HAVE_LIBM) ++if(WIN32) ++ set(BSINCGEN_LIB ${BSINCGEN_LIB} shell32) ++endif() ++target_link_libraries(bsincgen ${BSINCGEN_LIB}) +\ No newline at end of file diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake index 0af13af6c..a753030c8 100644 --- a/ports/openal-soft/portfile.cmake +++ b/ports/openal-soft/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_github( PATCHES dont-export-symbols-in-static-build.patch cmake-3-11.patch + fix-arm-builds.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") @@ -30,7 +31,6 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DLIBTYPE=${OPENAL_LIBTYPE} -DALSOFT_UTILS=OFF @@ -54,6 +54,7 @@ vcpkg_configure_cmake( -DALSOFT_REQUIRE_WINMM=${ALSOFT_REQUIRE_WINDOWS} -DALSOFT_REQUIRE_DSOUND=${ALSOFT_REQUIRE_WINDOWS} -DALSOFT_REQUIRE_MMDEVAPI=${ALSOFT_REQUIRE_WINDOWS} + -DALSOFT_CPUEXT_NEON=OFF ) vcpkg_install_cmake() |