thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-03 07:22:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

src/CMakeLists.txt (don't forget to fix vanilla :P)

Browse source
This commit is contained in:
lachwright 2020-08-10 11:21:24 +08:00
parent 4cc3816350
commit dad03e0994
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/CMakeLists.txt
View file

@ -475,15 +475,9 @@ if(${SRB2_CONFIG_HAVE_CURL})
set(CURL_FOUND ON) set(CURL_FOUND ON)
set(CURL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/curl) set(CURL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/curl)
if(${SRB2_SYSTEM_BITS} EQUAL 64) if(${SRB2_SYSTEM_BITS} EQUAL 64)
<<<<<<< HEAD
set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib64 -lcurl") set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib64 -lcurl")
else() # 32-bit else() # 32-bit
set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib32 -lcurl") set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib32 -lcurl")
=======
set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib32 -lcurl")
else() # 32-bit
set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib64 -lcurl")
>>>>>>> srb2/next
endif() endif()
else() else()
find_package(CURL) find_package(CURL)
@ -492,11 +486,7 @@ if(${SRB2_CONFIG_HAVE_CURL})
set(SRB2_HAVE_CURL ON) set(SRB2_HAVE_CURL ON)
add_definitions(-DHAVE_CURL) add_definitions(-DHAVE_CURL)
else() else()
<<<<<<< HEAD
message(WARNING "You have specified that CURL is available but it was not found. SRB2Kart may not compile correctly.") message(WARNING "You have specified that CURL is available but it was not found. SRB2Kart may not compile correctly.")
=======
message(WARNING "You have specified that CURL is available but it was not found. SRB2 may not compile correctly.")
>>>>>>> srb2/next
endif() endif()
endif() endif()