From dad03e099411fa56a011581fa5d2795f9d762b6b Mon Sep 17 00:00:00 2001 From: lachwright Date: Mon, 10 Aug 2020 11:21:24 +0800 Subject: [PATCH] src/CMakeLists.txt (don't forget to fix vanilla :P) --- src/CMakeLists.txt | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0006f6f85..130d0a325 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -475,15 +475,9 @@ if(${SRB2_CONFIG_HAVE_CURL}) set(CURL_FOUND ON) set(CURL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/curl) if(${SRB2_SYSTEM_BITS} EQUAL 64) -<<<<<<< HEAD set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib64 -lcurl") 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") - else() # 32-bit - set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib64 -lcurl") ->>>>>>> srb2/next endif() else() find_package(CURL) @@ -492,11 +486,7 @@ if(${SRB2_CONFIG_HAVE_CURL}) set(SRB2_HAVE_CURL ON) add_definitions(-DHAVE_CURL) 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. SRB2 may not compile correctly.") ->>>>>>> srb2/next endif() endif()