mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-21 14:53:02 +01:00
Code Issues Releases Wiki Activity

Require OpenSSL in all but network-less builds (#3829)

Browse Source
This commit is contained in:
Michał Janiszewski
2016-06-05 22:57:28 +02:00
committed by Ted John
parent 3b8f98c86b
commit f8fa637b68
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
CMakeLists.txt
View File

@@ -39,17 +39,9 @@ if (DISABLE_HTTP_TWITCH)
endif (DISABLE_HTTP_TWITCH) endif (DISABLE_HTTP_TWITCH)
option(DISABLE_NETWORK "Disable multiplayer functionality. Mainly for testing.") option(DISABLE_NETWORK "Disable multiplayer functionality. Mainly for testing.")
if (DISABLE_NETWORK)
add_definitions(-DDISABLE_NETWORK)
else (DISABLE_NETWORK)
if (WIN32)
SET(NETWORKLIBS ${NETWORKLIBS} ws2_32)
endif (WIN32)
endif (DISABLE_NETWORK)
option(STATIC "Create a static build.") option(STATIC "Create a static build.")
option(FORCE64 "Force native (x86-64) build. Do not use, for experimental purposes only.") option(FORCE64 "Force native (x86-64) build. Do not use, for experimental purposes only.")
if (FORCE64) if (FORCE64)
set(TARGET_M "-m64") set(TARGET_M "-m64")
set(OBJ_FORMAT "elf64-x86-64") set(OBJ_FORMAT "elf64-x86-64")
@@ -61,6 +53,17 @@ else ()
set(LINKER_SCRIPT "ld_script_i386.xc") set(LINKER_SCRIPT "ld_script_i386.xc")
endif () endif ()
if (DISABLE_NETWORK)
add_definitions(-DDISABLE_NETWORK)
else (DISABLE_NETWORK)
if (WIN32)
SET(NETWORKLIBS ${NETWORKLIBS} ws2_32)
endif (WIN32)
# If you are on OS X, CMake might try using system-provided OpenSSL.
# This is too old and will not work.
PKG_CHECK_MODULES(SSL REQUIRED openssl>=1.0.0)
endif (DISABLE_NETWORK)
PKG_CHECK_MODULES(PNG libpng>=1.6) PKG_CHECK_MODULES(PNG libpng>=1.6)
if (NOT PNG_FOUND) if (NOT PNG_FOUND)
PKG_CHECK_MODULES(PNG libpng16) PKG_CHECK_MODULES(PNG libpng16)
@@ -174,24 +177,21 @@ else (STATIC)
endif (STATIC) endif (STATIC)
if (STATIC) if (STATIC)
SET(REQUIREDLIBS ${PNG_STATIC_LIBRARIES} ${JANSSON_STATIC_LIBRARIES} ${ZLIB_STATIC_LIBRARIES}) SET(REQUIREDLIBS ${PNG_STATIC_LIBRARIES} ${JANSSON_STATIC_LIBRARIES} ${ZLIB_STATIC_LIBRARIES} ${SSL_STATIC_LIBRARIES})
else (STATIC) else (STATIC)
SET(REQUIREDLIBS ${PNG_LIBRARIES} ${JANSSON_LIBRARIES} ${ZLIB_LIBRARIES}) SET(REQUIREDLIBS ${PNG_LIBRARIES} ${JANSSON_LIBRARIES} ${ZLIB_LIBRARIES} ${SSL_LIBRARIES})
endif (STATIC) endif (STATIC)
if (NOT DISABLE_HTTP_TWITCH) if (NOT DISABLE_HTTP_TWITCH)
PKG_CHECK_MODULES(LIBCURL REQUIRED libcurl) PKG_CHECK_MODULES(LIBCURL REQUIRED libcurl)
# If you are on OS X, CMake might try using system-provided OpenSSL.
# This is too old and will not work.
PKG_CHECK_MODULES(SSL REQUIRED openssl>=1.0.0)
if (WIN32) if (WIN32)
# Curl depends on openssl and ws2 in mingw builds, but is not wired up in pkg-config # Curl depends on openssl and ws2 in mingw builds, but is not wired up in pkg-config
set(WSLIBS ws2_32) set(WSLIBS ws2_32)
endif (WIN32) endif (WIN32)
if (STATIC) if (STATIC)
SET(HTTPLIBS ${LIBCURL_STATIC_LIBRARIES} ${SSL_STATIC_LIBRARIES} ${WSLIBS}) SET(HTTPLIBS ${LIBCURL_STATIC_LIBRARIES} ${WSLIBS})
else (STATIC) else (STATIC)
SET(HTTPLIBS ${LIBCURL_LIBRARIES} ${SSL_LIBRARIES} ${WSLIBS}) SET(HTTPLIBS ${LIBCURL_LIBRARIES} ${WSLIBS})
endif (STATIC) endif (STATIC)
endif (NOT DISABLE_HTTP_TWITCH) endif (NOT DISABLE_HTTP_TWITCH)