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,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f440884..f1a9190 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -559,6 +559,8 @@ if(APPLE)
endif()
elseif(UNIX)
target_link_libraries(LLGL X11 pthread Xxf86vm Xrandr)
+elseif(WIN32)
+ target_link_libraries(LLGL gdi32 shell32)
endif()
set_target_properties(LLGL PROPERTIES LINKER_LANGUAGE CXX DEBUG_POSTFIX "D")

View File

@@ -0,0 +1,44 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f440884..d1b0c2f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -614,6 +614,12 @@ if(LLGL_BUILD_RENDERER_OPENGL)
target_link_libraries(LLGL_OpenGL LLGL ${OPENGL_LIBRARIES})
ADD_DEFINE(LLGL_BUILD_RENDERER_OPENGL)
+
+ install(TARGETS LLGL_OpenGL
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+ )
else()
message("Missing OpenGL -> LLGL_OpenGL renderer will be excluded from project")
endif()
@@ -681,6 +687,12 @@ if(WIN32)
target_link_libraries(LLGL_Direct3D11 LLGL d3d11 dxgi D3DCompiler)
ADD_DEFINE(LLGL_BUILD_RENDERER_DIRECT3D11)
+
+ install(TARGETS LLGL_Direct3D11
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+ )
endif()
if(LLGL_BUILD_RENDERER_DIRECT3D12)
@@ -821,4 +833,13 @@ if(LLGL_ENABLE_SPIRV_REFLECT)
message("Including Submodule: SPIRV")
endif()
+# Install targets
+install(TARGETS ${PROJECT_NAME}
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+)
+# Install headers
+install(DIRECTORY ${PROJECT_INCLUDE_DIR} DESTINATION .)
+

38
externals/vcpkg/ports/llgl/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,38 @@
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
message(FATAL_ERROR "${PORT} currently doesn't supports UWP.")
endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO LukasBanana/LLGL
REF 8f28437960ed60622e94f4f97b24e842b5a0e9e6
SHA512 8a6bd4109e977f9def0f04a3d31f7bd4beebbe162c52eaa08a54daf8335871615215ece166e5a9d5b5475b834fd53a26ff9638ff270a2f00c88bab21ed156760
HEAD_REF master
PATCHES
fix-install-error.patch
fix-arm64-build-error.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
opengl LLGL_BUILD_RENDERER_OPENGL
direct3d11 LLGL_BUILD_RENDERER_DIRECT3D11
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS ${FEATURE_OPTIONS}
)
vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()
vcpkg_copy_pdbs()
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

16
externals/vcpkg/ports/llgl/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,16 @@
{
"name": "llgl",
"version-string": "2019-08-15",
"port-version": 2,
"description": "Low Level Graphics Library (LLGL) is a thin abstraction layer for the modern graphics APIs OpenGL, Direct3D, Vulkan, and Metal.",
"homepage": "https://github.com/LukasBanana/LLGL",
"supports": "!uwp",
"features": {
"direct3d11": {
"description": "Support for direct3d11"
},
"opengl": {
"description": "Support for opengl"
}
}
}