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,23 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0af720..774e2d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,16 +107,8 @@ if( WIN32 )
set( LIB_PATH "lib" )
elseif( APPLE )
find_library( COREFOUNDATION_LIBRARY CoreFoundation )
- mark_as_advanced( COREFOUNDATION_LIBRARY )
-
- add_library( CoreFoundation SHARED IMPORTED )
- set_target_properties(
- CoreFoundation PROPERTIES
- IMPORTED_LOCATION "${COREFOUNDATION_LIBRARY}"
- INTERFACE_INCLUDE_DIRECTORIES "/System/Library/Frameworks/CoreFoundation.framework/Headers"
- )
-
- target_link_libraries( ${TARGET} PUBLIC CoreFoundation )
+
+ target_link_libraries( ${TARGET} PUBLIC ${COREFOUNDATION_LIBRARY} )
set( SHARE_PATH "${CMAKE_INSTALL_PREFIX}/share/SFGUI" )
set( LIB_PATH "lib" )
elseif( "${CMAKE_SYSTEM_NAME}" MATCHES "Linux" )

View File

@@ -0,0 +1,13 @@
diff --git a/src/SFGUI/ComboBox.cpp b/src/SFGUI/ComboBox.cpp
index a01937b..454ec3e 100644
--- a/src/SFGUI/ComboBox.cpp
+++ b/src/SFGUI/ComboBox.cpp
@@ -9,6 +9,8 @@
#include <SFML/System/String.hpp>
#include <SFML/Window/Event.hpp>
+#include <limits>
+
namespace sfg {
// Signals.

39
externals/vcpkg/ports/sfgui/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,39 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO TankOs/SFGUI
REF 0.4.0
SHA512 15456c6080b7095bcdcec08489b2b91b5cfc36cdf3c0b645b305072e7e835837eb4f95b59371ff176630b2b7ae51da475d8ea0bde5ff7fc0ba74c463bf5f54cf
HEAD_REF master
PATCHES
"001-fix-corefoundation-link.patch"
"002-add-limits-header.patch"
)
file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindSFML.cmake)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SFGUI_BUILD_SHARED_LIBS)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DSFGUI_BUILD_DOC=OFF
-DSFGUI_BUILD_EXAMPLES=OFF
-DSFGUI_BUILD_SHARED_LIBS=${SFGUI_BUILD_SHARED_LIBS}
)
vcpkg_install_cmake()
vcpkg_copy_pdbs()
if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
file(GLOB_RECURSE SFGUI_DOC_RELEASE ${CURRENT_PACKAGES_DIR}/*.md)
file(GLOB_RECURSE SFGUI_DOC_DEBUG ${CURRENT_PACKAGES_DIR}/debug/*.md)
file(REMOVE ${SFGUI_DOC_RELEASE} ${SFGUI_DOC_DEBUG})
else()
vcpkg_fixup_cmake_targets(CONFIG_PATH share/SFGUI/cmake)
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/sfgui RENAME copyright)

10
externals/vcpkg/ports/sfgui/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,10 @@
{
"name": "sfgui",
"version": "0.4.0",
"port-version": 5,
"description": "simple and fast graphical user interface library",
"homepage": "https://github.com/TankOs/SFGUI",
"dependencies": [
"sfml"
]
}