From 17bccc671dbd9724551bff89845658071de8c0b4 Mon Sep 17 00:00:00 2001
From: SteelT <steeltitanium1@gmail.com>
Date: Thu, 6 Aug 2020 01:08:42 -0400
Subject: [PATCH] Merge CMakeLists.txt and src/CMakeLists.txt

---
 CMakeLists.txt     |  9 ---------
 src/CMakeLists.txt | 14 +++-----------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1a645aea..4c3b843d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,11 +2,7 @@ cmake_minimum_required(VERSION 3.0)
 # DO NOT CHANGE THIS SRB2 STRING! Some variable names depend on this string.
 # Version change is fine.
 project(SRB2
-<<<<<<< HEAD
 	VERSION 2.0
-=======
-	VERSION 2.2.4
->>>>>>> srb2/next
 	LANGUAGES C)
 
 if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR})
@@ -98,12 +94,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 set(CMAKE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
 # Set EXE names so the assets CMakeLists can refer to its target
-<<<<<<< HEAD
 set(SRB2_SDL2_EXE_NAME srb2kart CACHE STRING "Executable binary output name")
-set(SRB2_WIN_EXE_NAME srb2kartdd CACHE STRING "Executable binary output name for DirectDraw build")
-=======
-set(SRB2_SDL2_EXE_NAME srb2 CACHE STRING "Executable binary output name")
->>>>>>> srb2/next
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 14a5a2cc2..5671765e7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -245,13 +245,10 @@ set(SRB2_CONFIG_HAVE_ZLIB ON CACHE BOOL
 	"Enable zlib support.")
 set(SRB2_CONFIG_HAVE_GME ON CACHE BOOL
 	"Enable GME support.")
-<<<<<<< HEAD
 set(SRB2_CONFIG_HAVE_CURL ON CACHE BOOL
-	"Enable curl support, used for downloading files via HTTP.")
-=======
+	"Enable cURL support, used for downloading files via HTTP.")
 set(SRB2_CONFIG_HAVE_OPENMPT ON CACHE BOOL
 	"Enable OpenMPT support.")
->>>>>>> srb2/next
 set(SRB2_CONFIG_HWRENDER ON CACHE BOOL
 	"Enable hardware rendering through OpenGL.")
 set(SRB2_CONFIG_USEASM OFF CACHE BOOL
@@ -264,7 +261,7 @@ set(SRB2_CONFIG_STATIC_OPENGL OFF CACHE BOOL
 ### use internal libraries?
 if(${CMAKE_SYSTEM} MATCHES "Windows") ###set on Windows only
 	set(SRB2_CONFIG_USE_INTERNAL_LIBRARIES OFF CACHE BOOL
-	"Use SRB2's internal copies of required dependencies (SDL2, PNG, zlib, GME, OpenMPT).")
+	"Use SRB2Kart's internal copies of required dependencies (SDL2, PNG, zlib, GME, OpenMPT, cURL).")
 endif()
 
 set(SRB2_LUA_SOURCES
@@ -563,15 +560,10 @@ add_definitions(-DCMAKECONFIG)
 
 add_subdirectory(sdl)
 
-<<<<<<< HEAD
 if(${CMAKE_SYSTEM} MATCHES Windows)
 	add_subdirectory(win32)
 endif()
 
-if(NOT ${SRB2_SDL2_AVAILABLE} AND NOT ${SRB2_WIN32_AVAILABLE})
-	message(FATAL_ERROR "There are no targets available to build an SRB2Kart executable. :(")
-=======
 if(NOT ${SRB2_SDL2_AVAILABLE})
-	message(FATAL_ERROR "There are no targets available to build an SRB2 executable. :(")
->>>>>>> srb2/next
+	message(FATAL_ERROR "There are no targets available to build an SRB2Kart executable. :(")
 endif()