Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.6.x' into feature/backmerge

Browse Source
This commit is contained in:
Chris Thrasher 2023-07-07 11:13:10 -06:00
commit f65c0058b9
No known key found for this signature in database
GPG Key ID: 56FB686C9DFC8E2C
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/Config.cmake
View File

@ -92,6 +92,5 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
execute_process(COMMAND "${CMAKE_CXX_COMPILER}" "--version" OUTPUT_VARIABLE GCC_COMPILER_VERSION) execute_process(COMMAND "${CMAKE_CXX_COMPILER}" "--version" OUTPUT_VARIABLE GCC_COMPILER_VERSION)
string(REGEX MATCHALL ".*(tdm[64]*-[1-9]).*" SFML_COMPILER_GCC_TDM "${GCC_COMPILER_VERSION}") string(REGEX MATCHALL ".*(tdm[64]*-[1-9]).*" SFML_COMPILER_GCC_TDM "${GCC_COMPILER_VERSION}")
else() else()
message(FATAL_ERROR "Unsupported compiler") message(WARNING "Unrecognized compiler: ${CMAKE_CXX_COMPILER_ID}. Use at your own risk.")
return()
endif() endif()

2
src/SFML/CMakeLists.txt
View File

@ -32,7 +32,7 @@ elseif(SFML_OS_ANDROID)
endif() endif()
# define the path of our additional CMake modules # define the path of our additional CMake modules
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/Modules/") list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/Modules/")
# set the output directory for SFML libraries # set the output directory for SFML libraries
set(LIBRARY_OUTPUT_PATH "${PROJECT_BINARY_DIR}/lib") set(LIBRARY_OUTPUT_PATH "${PROJECT_BINARY_DIR}/lib")

3
src/SFML/Graphics/Texture.cpp
View File

@ -880,6 +880,9 @@ unsigned int Texture::getMaximumSize()
GLint value = 0; GLint value = 0;
// Make sure that extensions are initialized
sf::priv::ensureExtensionsInit();
glCheck(glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value)); glCheck(glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value));
return static_cast<unsigned int>(value); return static_cast<unsigned int>(value);