early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,43 @@
diff --git a/src/Magnum/Platform/Sdl2Application.cpp b/src/Magnum/Platform/Sdl2Application.cpp
index 276c7ee55..90c52f3cb 100644
--- a/src/Magnum/Platform/Sdl2Application.cpp
+++ b/src/Magnum/Platform/Sdl2Application.cpp
@@ -34,7 +34,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpragma-pack"
#endif
-#include <SDL.h>
+#include <SDL2/SDL.h>
#ifdef CORRADE_TARGET_CLANG_CL
#pragma clang diagnostic pop
#endif
diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h
index b2426d513..176729fdb 100644
--- a/src/Magnum/Platform/Sdl2Application.h
+++ b/src/Magnum/Platform/Sdl2Application.h
@@ -57,11 +57,11 @@
#pragma clang diagnostic ignored "-Wpragma-pack"
#endif
/* SDL.h includes the world, adding 50k LOC. We don't want that either. */
-#include <SDL_keycode.h>
-#include <SDL_mouse.h>
-#include <SDL_version.h> /* huh, why is this not pulled in implicitly?! */
-#include <SDL_video.h>
-#include <SDL_scancode.h>
+#include <SDL2/SDL_keycode.h>
+#include <SDL2/SDL_mouse.h>
+#include <SDL2/SDL_version.h> /* huh, why is this not pulled in implicitly?! */
+#include <SDL2/SDL_video.h>
+#include <SDL2/SDL_scancode.h>
#ifdef CORRADE_TARGET_IOS
/* Including SDL_main.h unconditionally would mean it'd override Corrade::Main
@@ -74,7 +74,7 @@
#endif
#ifdef CORRADE_TARGET_WINDOWS_RT
-#include <SDL_main.h> /* For SDL_WinRTRunApp */
+#include <SDL2/SDL_main.h> /* For SDL_WinRTRunApp */
#include <wrl.h> /* For the WinMain entrypoint */
#endif
#ifdef CORRADE_TARGET_CLANG_CL

View File

@@ -0,0 +1,16 @@
diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake
index 8761448..17321af 100644
--- a/modules/FindMagnum.cmake
+++ b/modules/FindMagnum.cmake
@@ -647,9 +647,9 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
# GLFW application dependencies
elseif(_component STREQUAL GlfwApplication)
- find_package(GLFW)
+ find_package(glfw3 CONFIG REQUIRED)
set_property(TARGET Magnum::${_component} APPEND PROPERTY
- INTERFACE_LINK_LIBRARIES GLFW::GLFW)
+ INTERFACE_LINK_LIBRARIES glfw)
# Use the Foundation framework on Apple to query the DPI awareness
if(CORRADE_TARGET_APPLE)
find_library(_MAGNUM_APPLE_FOUNDATION_FRAMEWORK_LIBRARY Foundation)

40
externals/vcpkg/ports/magnum/magnumdeploy.ps1 vendored Executable file
View File

@@ -0,0 +1,40 @@
# Magnum's plugin deployment strategy is that each Magnum module has a hardcoded
# set of plugin directories. Each of these directories is deployed in
# full if that Module is referenced.
#
# Note: this function signature and behavior is depended upon by applocal.ps1
function deployPluginsIfMagnum([string]$targetBinaryDir, [string]$MagnumPluginsDir, [string]$targetBinaryName) {
Write-Verbose "Deploying magnum plugins"
$baseDir = Split-Path $MagnumPluginsDir -parent
$pluginsBase = Split-Path $MagnumPluginsDir -Leaf
$binDir = "$baseDir\bin"
function deployPlugins([string]$pluginSubdirName) {
if (Test-Path "$MagnumPluginsDir\$pluginSubdirName") {
Write-Verbose " Deploying plugins directory '$pluginSubdirName'"
New-Item "$targetBinaryDir\$pluginsBase\$pluginSubdirName" -ItemType Directory -ErrorAction SilentlyContinue | Out-Null
Get-ChildItem -Path "$MagnumPluginsDir\$pluginSubdirName\*" -Include "*.dll", "*.conf", "*.pdb" | % {
deployBinary "$targetBinaryDir\$pluginsBase\$pluginSubdirName" "$MagnumPluginsDir\$pluginSubdirName" $_.Name
resolve $_
}
} else {
Write-Verbose " Skipping plugins directory '$pluginSubdirName': doesn't exist"
}
}
# We detect Magnum modules in use via the DLLs that contain their
# plugin interfaces.
if ($targetBinaryName -like "MagnumAudio.dll" -or $targetBinaryName -like "MagnumAudio-d.dll") {
deployPlugins "audioimporters"
} elseif ($targetBinaryName -like "MagnumText.dll" -or $targetBinaryName -like "MagnumText-d.dll") {
deployPlugins "fonts"
deployPlugins "fontconverters"
} elseif ($targetBinaryName -like "MagnumTrade.dll" -or $targetBinaryName -like "MagnumTrade-d.dll") {
deployPlugins "importers"
deployPlugins "imageconverters"
deployPlugins "sceneconverters"
} elseif ($targetBinaryName -like "MagnumShaderTools.dll" -or $targetBinaryName -like "MagnumShaderTools-d.dll") {
deployPlugins "shaderconverters"
}
}

173
externals/vcpkg/ports/magnum/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,173 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mosra/magnum
REF v2020.06
SHA512 65b0c8a4520d1d282420c30ecd7c8525525d4dbb6e562e1e2e93d110f4eb686af43f098bf02460727fab1e1f9446dd00a99051e150c05ea40b1486a44fea1042
HEAD_REF master
PATCHES
002-sdl-includes.patch
003-fix-FindGLFW.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_PLUGINS_STATIC)
# Remove platform-specific feature that are not available
# on current target platform from all features.
# For documentation on VCPKG_CMAKE_SYSTEM_NAME see
# https://github.com/microsoft/vcpkg/blob/master/docs/users/triplets.md#vcpkg_cmake_system_name
set(ALL_SUPPORTED_FEATURES ${ALL_FEATURES})
# Windows Desktop
if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" STREQUAL "")
list(REMOVE_ITEM ALL_SUPPORTED_FEATURES wglcontext windowlesswglapplication)
endif()
# Universal Windows Platform
if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
# No UWP specific features
endif()
# Mac OSX
if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
list(REMOVE_ITEM ALL_SUPPORTED_FEATURES cglcontext windowlesscglapplication)
endif()
# Linux
if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
list(REMOVE_ITEM ALL_SUPPORTED_FEATURES glxcontext windowlessglxapplication)
endif()
# WebAssembly / Linux
if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" MATCHES "(Emscripten|Linux)")
list(REMOVE_ITEM ALL_SUPPORTED_FEATURES eglcontext windowlesseglapplication)
endif()
# Head only features
if(NOT VCPKG_USE_HEAD_VERSION)
list(REMOVE_ITEM ALL_SUPPORTED_FEATURES anyshaderconverter shadertools shaderconverter
vk-info)
message(WARNING "Features anyshaderconverter, shadertools, shaderconverter and vk-info are not avaliable when building non-head version.")
endif()
set(_COMPONENTS "")
# Generate cmake parameters from feature names
foreach(_feature IN LISTS ALL_SUPPORTED_FEATURES)
# Uppercase the feature name and replace "-" with "_"
string(TOUPPER "${_feature}" _FEATURE)
string(REPLACE "-" "_" _FEATURE "${_FEATURE}")
# Final feature is empty, ignore it
if(_feature)
list(APPEND _COMPONENTS ${_feature} WITH_${_FEATURE})
endif()
endforeach()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS})
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FEATURE_OPTIONS}
-DBUILD_STATIC=${BUILD_STATIC}
-DBUILD_PLUGINS_STATIC=${BUILD_PLUGINS_STATIC}
-DMAGNUM_PLUGINS_DEBUG_DIR=${CURRENT_INSTALLED_DIR}/debug/bin/magnum-d
-DMAGNUM_PLUGINS_RELEASE_DIR=${CURRENT_INSTALLED_DIR}/bin/magnum
)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
# Copy tools into vcpkg's tools directory
set(_TOOL_EXEC_NAMES "")
set(_TOOLS
al-info
distancefieldconverter
fontconverter
gl-info
imageconverter
sceneconverter)
if(VCPKG_USE_HEAD_VERSION)
list(APPEND _TOOLS
shaderconverter
vk-info)
endif()
foreach(_tool IN LISTS _TOOLS)
if("${_tool}" IN_LIST FEATURES)
list(APPEND _TOOL_EXEC_NAMES magnum-${_tool})
endif()
endforeach()
message(STATUS ${_TOOL_EXEC_NAMES})
if(_TOOL_EXEC_NAMES)
vcpkg_copy_tools(TOOL_NAMES ${_TOOL_EXEC_NAMES} AUTO_CLEAN)
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Special handling for plugins.
#
# For static plugins, in order to make MSBuild auto-linking magic work, where
# the linker implicitly takes everything from the root lib/ folder, the
# static libraries have to be moved out of lib/magnum/blah/ directly to lib/.
# Possibly would be enough to do this just for Windows, doing it also on other
# platforms for consistency.
#
# For dynamic plugins, auto-linking is not desirable as those are meant to be
# loaded dynamically at runtime instead. In order to prevent that, on Windows
# the *.lib files corresponding to the plugin *.dlls are removed. However, we
# cannot remove the *.lib files entirely here, as plugins from magnum-plugins
# are linked to them on Windows (e.g. AssimpImporter depends on
# AnyImageImporter). Thus the Any* plugin lib files are kept, but also not
# moved to the root lib/ folder, to prevent autolinking. A consequence of the
# *.lib file removal is that downstream projects can't implement Magnum plugins
# that would depend on (and thus link to) these, but that's considered a very
# rare use case and so it's fine.
#
# See https://github.com/microsoft/vcpkg/pull/1235#issuecomment-308805989 for
# futher info.
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
# move plugin libs to conventional place
file(GLOB_RECURSE LIB_TO_MOVE "${CURRENT_PACKAGES_DIR}/lib/magnum/*")
file(COPY ${LIB_TO_MOVE} DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum")
file(GLOB_RECURSE LIB_TO_MOVE_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/magnum/*")
file(COPY ${LIB_TO_MOVE_DBG} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum")
else()
if(WIN32)
file(GLOB_RECURSE LIB_TO_REMOVE "${CURRENT_PACKAGES_DIR}/lib/magnum/*")
file(GLOB_RECURSE LIB_TO_KEEP "${CURRENT_PACKAGES_DIR}/lib/magnum/*Any*")
if(LIB_TO_KEEP)
list(REMOVE_ITEM LIB_TO_REMOVE ${LIB_TO_KEEP})
endif()
if(LIB_TO_REMOVE)
file(REMOVE ${LIB_TO_REMOVE})
endif()
file(GLOB_RECURSE LIB_TO_REMOVE_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/*")
file(GLOB_RECURSE LIB_TO_KEEP_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/*Any*")
if(LIB_TO_KEEP_DBG)
list(REMOVE_ITEM LIB_TO_REMOVE_DBG ${LIB_TO_KEEP_DBG})
endif()
if(LIB_TO_REMOVE_DBG)
file(REMOVE ${LIB_TO_REMOVE_DBG})
endif()
# fonts and fontconverters don't have Any* plugins
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum/fonts")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum/fontconverters")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/fonts")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/fontconverters")
endif()
file(COPY "${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/bin/magnum")
file(COPY "${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/magnum-d")
endif()
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

533
externals/vcpkg/ports/magnum/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,533 @@
{
"name": "magnum",
"version-string": "2020.06",
"port-version": 9,
"description": "C++11/C++14 graphics middleware for games and data visualization",
"homepage": "https://magnum.graphics/",
"dependencies": [
{
"name": "corrade",
"features": [
"utility"
]
},
{
"name": "vcpkg-cmake",
"host": true
}
],
"default-features": [
"anyaudioimporter",
"anyimageconverter",
"anyimageimporter",
"anysceneconverter",
"anysceneimporter",
"anyshaderconverter",
"debugtools",
"gl",
"meshtools",
"primitives",
"scenegraph",
"sdl2application",
"shaders",
"shadertools",
"text",
"texturetools",
"trade"
],
"features": {
"al-info": {
"description": "magnum-al-info utility",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"audio"
]
}
]
},
"anyaudioimporter": {
"description": "AnyAudioImporter plugin",
"dependencies": [
{
"name": "corrade",
"features": [
"pluginmanager"
]
},
{
"name": "magnum",
"default-features": false,
"features": [
"audio"
]
}
]
},
"anyimageconverter": {
"description": "AnyImageConverter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"anyimageimporter": {
"description": "AnyImageImporter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"anysceneconverter": {
"description": "AnySceneConverter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"anysceneimporter": {
"description": "AnySceneImporter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"anyshaderconverter": {
"description": "AnyShaderConverter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"shadertools"
]
}
]
},
"audio": {
"description": "Audio library",
"dependencies": [
"openal-soft"
]
},
"cglcontext": {
"description": "CglContext library",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"gl"
]
}
]
},
"debugtools": {
"description": "DebugTools library"
},
"distancefieldconverter": {
"description": "magnum-distancefieldconverter utility",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"gl"
]
},
{
"name": "magnum",
"default-features": false,
"features": [
"texturetools"
]
}
]
},
"eglcontext": {
"description": "EglContext library",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"gl"
]
}
]
},
"fontconverter": {
"description": "magnum-fontconverter utility",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"gl"
]
},
{
"name": "magnum",
"default-features": false,
"features": [
"text"
]
}
]
},
"gl": {
"description": "GL library"
},
"gl-info": {
"description": "gl-info utility",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"gl"
]
}
]
},
"glfwapplication": {
"description": "GlfwApplication library",
"dependencies": [
"glfw3"
]
},
"glxcontext": {
"description": "GlxContext library",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"gl"
]
}
]
},
"imageconverter": {
"description": "magnum-imageconverter utility",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"magnumfont": {
"description": "MagnumFont plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"text"
]
}
]
},
"magnumfontconverter": {
"description": "MagnumFontConverter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"text"
]
},
{
"name": "magnum",
"default-features": false,
"features": [
"tgaimageconverter"
]
}
]
},
"meshtools": {
"description": "MeshTools library",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"objimporter": {
"description": "ObjImporter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"opengltester": {
"description": "OpenGLTester library",
"dependencies": [
{
"name": "corrade",
"features": [
"testsuite"
]
},
{
"name": "magnum",
"default-features": false,
"features": [
"gl"
]
}
]
},
"primitives": {
"description": "Primitives library",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"sceneconverter": {
"description": "magnum-sceneconverter utility",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"anysceneconverter"
]
}
]
},
"scenegraph": {
"description": "SceneGraph library"
},
"sdl2application": {
"description": "Sdl2Application library",
"dependencies": [
"sdl2"
]
},
"shaderconverter": {
"description": "magnum-shaderconverter utility",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"anyshaderconverter",
"shadertools"
]
}
]
},
"shaders": {
"description": "Shaders library",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"gl"
]
}
]
},
"shadertools": {
"description": "ShaderTools library"
},
"text": {
"description": "Text library",
"dependencies": [
{
"name": "corrade",
"features": [
"pluginmanager"
]
},
{
"name": "magnum",
"default-features": false,
"features": [
"gl"
]
},
{
"name": "magnum",
"default-features": false,
"features": [
"texturetools"
]
}
]
},
"texturetools": {
"description": "TextureTools library"
},
"tgaimageconverter": {
"description": "TgaImageConverter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"tgaimporter": {
"description": "TgaImporter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"trade": {
"description": "Trade library",
"dependencies": [
{
"name": "corrade",
"features": [
"pluginmanager"
]
}
]
},
"vk": {
"description": "Vk library",
"dependencies": [
"vulkan"
]
},
"vk-info": {
"description": "vk-info utility",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"vk"
]
}
]
},
"wavaudioimporter": {
"description": "WavAudioImporter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"audio"
]
}
]
},
"wglcontext": {
"description": "WglContext library",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"gl"
]
}
]
},
"windowlesscglapplication": {
"description": "WindowlessCglApplication library",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"gl"
]
}
]
},
"windowlesseglapplication": {
"description": "WindowlessEglApplication library",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"gl"
]
}
]
},
"windowlessglxapplication": {
"description": "WindowlessGlxApplication library",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"gl"
]
}
]
},
"windowlesswglapplication": {
"description": "WindowlessWglApplication library",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"gl"
]
}
]
}
}
}