3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 06:28:00 +08:00
Code Issues Projects Releases Wiki Activity

Mingw port fixes (#12103)

Browse Source 
* [openal-soft] MinGW build fixes

* [glew] MinGW build fixes

* [protobuf] MinGW build fixes

* [protobuf] Update to 3.12.3

* [protobuf] Preserve existing cross-compilation behavior (e.g. android)

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
This commit is contained in:
Todor Prokopov 2020-07-31 08:37:02 +03:00 committed by GitHub
parent 5cdb92f010
commit fe19c5e411
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/glew/CONTROL
View File

@ -1,4 +1,4 @@
Source: glew
Version: 2.1.0-7
Version: 2.1.0-8
Description: The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.
Homepage: https://github.com/nigels-com/glew

2
ports/glew/portfile.cmake
View File

@ -26,7 +26,7 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/glew)
if(VCPKG_TARGET_IS_WINDOWS)
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
set(_targets_cmake_files)
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
list(APPEND _targets_cmake_files "${CURRENT_PACKAGES_DIR}/share/glew/glew-targets-debug.cmake")

2
ports/openal-soft/CONTROL
View File

@ -1,6 +1,6 @@
Source: openal-soft
Version: 1.20.1
Port-Version: 4
Port-Version: 5
Homepage: https://github.com/kcat/openal-soft
Description: OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.
Supports: !uwp

14
ports/openal-soft/fix-mingw-build.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/common/alstring.h b/common/alstring.h
index 194e54a1..5a5f87ed 100644
--- a/common/alstring.h
+++ b/common/alstring.h
@@ -4,6 +4,9 @@
#include <cstddef>
#include <string>
+// This fixes MinGW link errors. It defines strcasecmp and strncasecmp in string.h.
+#include <string.h>
+
#include "almalloc.h"

1
ports/openal-soft/portfile.cmake
View File

@ -9,6 +9,7 @@ vcpkg_from_github(
PATCHES
dont-export-symbols-in-static-build.patch
fix-arm-builds.patch
fix-mingw-build.patch
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")

2
ports/protobuf/portfile.cmake
View File

@ -12,7 +12,7 @@ vcpkg_from_github(
if(CMAKE_HOST_WIN32 AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
set(protobuf_BUILD_PROTOC_BINARIES OFF)
elseif(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME)
elseif(CMAKE_HOST_WIN32 AND NOT VCPKG_TARGET_IS_MINGW AND NOT (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP))
set(protobuf_BUILD_PROTOC_BINARIES OFF)
else()
set(protobuf_BUILD_PROTOC_BINARIES ON)