зеркало из https://github.com/microsoft/vcpkg.git
[glew] Only set the base address on x86 (32bit) (#31084)
This commit is contained in:
Родитель
7e03daeb09
Коммит
a92f44a98c
|
@ -0,0 +1,13 @@
|
|||
--- a/build/cmake/CMakeLists.txt Mon Apr 24 15:54:00 2023
|
||||
+++ b/build/cmake/CMakeLists.txt Mon Apr 24 16:06:57 2023
|
||||
@@ -143,7 +143,9 @@
|
||||
# add options from visual studio project
|
||||
target_compile_definitions (glew PRIVATE "GLEW_BUILD;VC_EXTRALEAN")
|
||||
target_compile_definitions (glew_s PRIVATE "GLEW_STATIC;VC_EXTRALEAN")
|
||||
- target_link_libraries (glew LINK_PRIVATE -BASE:0x62AA0000)
|
||||
+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i?86|x86|x86_32)$")
|
||||
+ target_link_libraries (glew LINK_PRIVATE -BASE:0x62AA0000)
|
||||
+ endif()
|
||||
# kill security checks which are dependent on stdlib
|
||||
target_compile_options (glew PRIVATE -GS-)
|
||||
target_compile_options (glew_s PRIVATE -GS-)
|
|
@ -16,6 +16,7 @@ vcpkg_extract_source_archive(
|
|||
SOURCE_BASE glew
|
||||
PATCHES
|
||||
fix-LNK2019.patch
|
||||
base_address.patch # Accepted upstream as https://github.com/nigels-com/glew/commit/ef7d12ecb7f1f336f6d3a80cebd6163b2c094108
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
{
|
||||
"name": "glew",
|
||||
"version": "2.2.0",
|
||||
"port-version": 2,
|
||||
"port-version": 3,
|
||||
"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",
|
||||
"supports": "!(arm64 & windows)",
|
||||
"dependencies": [
|
||||
"opengl",
|
||||
{
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"name": "osgearth",
|
||||
"version": "3.3",
|
||||
"port-version": 6,
|
||||
"port-version": 7,
|
||||
"description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.",
|
||||
"homepage": "https://github.com/gwaldron/osgearth",
|
||||
"license": "LGPL-3.0-or-later",
|
||||
"supports": "!(x86 | wasm32)",
|
||||
"supports": "!(arm | x86 | wasm32)",
|
||||
"dependencies": [
|
||||
"basisu",
|
||||
"cfitsio",
|
||||
|
|
|
@ -2806,7 +2806,7 @@
|
|||
},
|
||||
"glew": {
|
||||
"baseline": "2.2.0",
|
||||
"port-version": 2
|
||||
"port-version": 3
|
||||
},
|
||||
"glfw3": {
|
||||
"baseline": "3.3.8",
|
||||
|
@ -5974,7 +5974,7 @@
|
|||
},
|
||||
"osgearth": {
|
||||
"baseline": "3.3",
|
||||
"port-version": 6
|
||||
"port-version": 7
|
||||
},
|
||||
"osi": {
|
||||
"baseline": "0.108.6",
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "cfd894e57985fdb9c772bbf28a4aa261759bb6ac",
|
||||
"version": "2.2.0",
|
||||
"port-version": 3
|
||||
},
|
||||
{
|
||||
"git-tree": "1fbf96a084cd511f49fa7f7009b56bd3d3361fb0",
|
||||
"version": "2.2.0",
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "c39e21352cff6e65fe8f6315ee9b7828143e0eb8",
|
||||
"version": "3.3",
|
||||
"port-version": 7
|
||||
},
|
||||
{
|
||||
"git-tree": "93f980541af3527f2940eede908836a7cfc63166",
|
||||
"version": "3.3",
|
||||
|
|
Загрузка…
Ссылка в новой задаче