ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5047 from ognevny/improve-mingw-build

Browse Source 
improve MinGW build
This commit is contained in:
CodingJellyfish 2024-06-25 20:35:41 +08:00 committed by GitHub
commit d9789726a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -36,7 +36,7 @@ if(APPLE)
endif() endif()
CMAKE_DEPENDENT_OPTION(USE_CRYPTO_OPENSSL "Use OpenSSL instead of MbedTLS for cryptography in STK." ON CMAKE_DEPENDENT_OPTION(USE_CRYPTO_OPENSSL "Use OpenSSL instead of MbedTLS for cryptography in STK." ON
"NOT USE_SWITCH;NOT WIN32" OFF) "NOT USE_SWITCH;NOT MSVC" OFF)
CMAKE_DEPENDENT_OPTION(BUILD_RECORDER "Build opengl recorder" ON CMAKE_DEPENDENT_OPTION(BUILD_RECORDER "Build opengl recorder" ON
"NOT SERVER_ONLY;NOT APPLE;NOT USE_SWITCH" OFF) "NOT SERVER_ONLY;NOT APPLE;NOT USE_SWITCH" OFF)
CMAKE_DEPENDENT_OPTION(USE_SYSTEM_SQUISH "Use system Squish library instead of the built-in version, when available." ON CMAKE_DEPENDENT_OPTION(USE_SYSTEM_SQUISH "Use system Squish library instead of the built-in version, when available." ON
@ -50,7 +50,7 @@ if (DLOPEN_MOLTENVK)
ADD_DEFINITIONS(-DDLOPEN_MOLTENVK) ADD_DEFINITIONS(-DDLOPEN_MOLTENVK)
endif() endif()
if((UNIX AND NOT APPLE) OR NINTENDO_SWITCH) if((UNIX AND NOT APPLE) OR NINTENDO_SWITCH OR MINGW)
include(FindPkgConfig) include(FindPkgConfig)
endif() endif()
@ -84,7 +84,7 @@ if (IOS)
endif() endif()
if((UNIX AND NOT APPLE) AND NOT SERVER_ONLY) if((UNIX AND NOT APPLE) AND NOT SERVER_ONLY)
if((${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") OR if((${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") OR
(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") OR
(${CMAKE_SYSTEM_PROCESSOR} MATCHES "riscv64")) (${CMAKE_SYSTEM_PROCESSOR} MATCHES "riscv64"))
option(USE_GLES2 "Use OpenGL ES2 renderer" ON) option(USE_GLES2 "Use OpenGL ES2 renderer" ON)
@ -200,7 +200,7 @@ if(UNIX OR MINGW)
endif() endif()
endif() endif()
if(UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS") if((UNIX AND NOT APPLE OR MINGW) AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
if(NOT PKGCONFIG_FOUND) if(NOT PKGCONFIG_FOUND)
@ -228,7 +228,7 @@ else()
endif() endif()
# Find system ENet library or build it if missing # Find system ENet library or build it if missing
if((UNIX AND NOT APPLE) AND USE_SYSTEM_ENET AND NOT USE_IPV6) if((UNIX AND NOT APPLE OR MINGW) AND USE_SYSTEM_ENET AND NOT USE_IPV6)
pkg_check_modules(ENET libenet>=1.3.4) pkg_check_modules(ENET libenet>=1.3.4)
endif() endif()
@ -617,7 +617,7 @@ else()
else() else()
add_executable(supertuxkart ${STK_SOURCES} ${STK_RESOURCES} ${STK_HEADERS}) add_executable(supertuxkart ${STK_SOURCES} ${STK_RESOURCES} ${STK_HEADERS})
endif() endif()
if (NOT WIN32) if (NOT MSVC)
target_link_libraries(supertuxkart ${PTHREAD_LIBRARY}) target_link_libraries(supertuxkart ${PTHREAD_LIBRARY})
endif() endif()
endif() endif()