Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/glew/CONTROL
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 1 deletion ports/glew/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion ports/openal-soft/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: openal-soft
Version: 1.20.1-2
Version: 1.20.1-3
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 changes: 14 additions & 0 deletions ports/openal-soft/fix-mingw-build.patch
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions ports/openal-soft/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
dont-export-symbols-in-static-build.patch
fix-mingw-build.patch
)

if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
Expand Down
2 changes: 1 addition & 1 deletion ports/protobuf/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: protobuf
Version: 3.12.0-2
Version: 3.12.3
Homepage: https://github.com/google/protobuf
Description: Protocol Buffers - Google's data interchange format

Expand Down
6 changes: 3 additions & 3 deletions ports/protobuf/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO protocolbuffers/protobuf
REF v3.12.0
SHA512 2a5448651db557505ad0ad88e681b88c956de7a7b8b029f8685416629d55b09dd35a0d1219311c524b9981067c3685178d89918d4fc2540d30669e9ad0c7c2d0
REF v3.12.3
SHA512 1d17a9d728443b42104b1b2bc473825efa49e0838ac5a29085cbf3da641ebae2f9a46f83de916dfccdf30eb075489759b53c48295a3632748e66debe58788997
HEAD_REF master
PATCHES
fix-uwp.patch
Expand All @@ -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 VCPKG_TARGET_IS_UWP)
set(protobuf_BUILD_PROTOC_BINARIES OFF)
else()
set(protobuf_BUILD_PROTOC_BINARIES ON)
Expand Down
6 changes: 1 addition & 5 deletions scripts/cmake/vcpkg_fixup_cmake_targets.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,7 @@ function(vcpkg_fixup_cmake_targets)
set(_vfct_TARGET_PATH share/${PORT})
endif()

if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
set(EXECUTABLE_SUFFIX "\\.exe")
else()
set(EXECUTABLE_SUFFIX)
endif()
string(REPLACE "." "\\." EXECUTABLE_SUFFIX "${VCPKG_TARGET_EXECUTABLE_SUFFIX}")

set(DEBUG_SHARE ${CURRENT_PACKAGES_DIR}/debug/${_vfct_TARGET_PATH})
set(RELEASE_SHARE ${CURRENT_PACKAGES_DIR}/${_vfct_TARGET_PATH})
Expand Down
3 changes: 3 additions & 0 deletions triplets/community/arm-mingw.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ set(VCPKG_LIBRARY_LINKAGE static)
set(VCPKG_ENV_PASSTHROUGH PATH)

set(VCPKG_CMAKE_SYSTEM_NAME MinGW)

# Missing import libs check does not work with MinGW.
set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
3 changes: 3 additions & 0 deletions triplets/community/arm64-mingw.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ set(VCPKG_LIBRARY_LINKAGE static)
set(VCPKG_ENV_PASSTHROUGH PATH)

set(VCPKG_CMAKE_SYSTEM_NAME MinGW)

# Missing import libs check does not work with MinGW.
set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
3 changes: 3 additions & 0 deletions triplets/community/x64-mingw.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ set(VCPKG_LIBRARY_LINKAGE static)
set(VCPKG_ENV_PASSTHROUGH PATH)

set(VCPKG_CMAKE_SYSTEM_NAME MinGW)

# Missing import libs check does not work with MinGW.
set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
3 changes: 3 additions & 0 deletions triplets/community/x86-mingw.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ set(VCPKG_LIBRARY_LINKAGE static)
set(VCPKG_ENV_PASSTHROUGH PATH)

set(VCPKG_CMAKE_SYSTEM_NAME MinGW)

# Missing import libs check does not work with MinGW.
set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)