add switch for different backends

CMakeLists.txt

@@ -107,7 +107,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
-find_package(MariaDB)
+if(${DLU_MYSQL_DATABASE} EQUAL 1)
+	find_package(MariaDB)
+endif()
 
 # Create a /resServer directory
 make_directory(${CMAKE_BINARY_DIR}/resServer)

dCommon/CMakeLists.txt

@@ -37,7 +37,6 @@ target_include_directories(dCommon
 	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase"
 	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables"
 	"${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase"
-	"${PROJECT_SOURCE_DIR}/thirdparty/mariadb-connector-cpp/include"
 )
 
 if (UNIX)

dDatabase/GameDatabase/CMakeLists.txt

@@ -2,17 +2,22 @@ set(DDATABASE_GAMEDATABASE_SOURCES
 	"Database.cpp"
 )
 
-# add_subdirectory(MySQL)
-# 
-# foreach(file ${DDATABSE_DATABSES_MYSQL_SOURCES})
-# 	set(DDATABASE_GAMEDATABASE_SOURCES ${DDATABASE_GAMEDATABASE_SOURCES} "MySQL/${file}")
-# endforeach()
-
-add_subdirectory(SQLite)
-
-foreach(file ${DDATABSE_DATABSES_SQLITE_SOURCES})
-	set(DDATABASE_GAMEDATABASE_SOURCES ${DDATABASE_GAMEDATABASE_SOURCES} "SQLite/${file}")
-endforeach()
+if(${DLU_MYSQL_DATABASE} EQUAL 1)
+	add_subdirectory(MySQL)
+
+	foreach(file ${DDATABSE_DATABSES_MYSQL_SOURCES})
+		set(DDATABASE_GAMEDATABASE_SOURCES ${DDATABASE_GAMEDATABASE_SOURCES} "MySQL/${file}")
+	endforeach()
+	set(LinkingWithMySQL true)
+elseif(${DLU_SQLITE_DATABASE} EQUAL 1)
+	add_subdirectory(SQLite)
+
+	foreach(file ${DDATABSE_DATABSES_SQLITE_SOURCES})
+		set(DDATABASE_GAMEDATABASE_SOURCES ${DDATABASE_GAMEDATABASE_SOURCES} "SQLite/${file}")
+	endforeach()
+else()
+	message(FATAL_ERROR "No database specified. Please use DLU_SQLITE_DATABASE or DLU_MYSQL_DATABASE.")
+endif()
 
 add_subdirectory(TestSQL)
 
@@ -26,9 +31,13 @@ target_include_directories(dDatabaseGame PUBLIC "."
 	"${PROJECT_SOURCE_DIR}/dCommon"
 	"${PROJECT_SOURCE_DIR}/dCommon/dEnums"
 )
+
 target_link_libraries(dDatabaseGame
-	PUBLIC MariaDB::ConnCpp
-	INTERFACE dCommon)
+	INTERFACE dCommon PRIVATE sqlite3)
+
+if(${DLU_MYSQL_DATABASE} EQUAL 1)
+	target_link_libraries(dDatabaseGame PUBLIC MariaDB::ConnCpp)
+endif()
 
 # Glob together all headers that need to be precompiled
 file(
@@ -37,7 +46,7 @@ file(
 	ITables/*.h
 )
 
-target_compile_definitions(dDatabaseGame PRIVATE DLU_SQLITE_DATABASE="${DLU_SQLITE_DATABASE}" DLU_MYSQL_DATABASE="${DLU_MYSQL_DATABASE}")
+target_compile_definitions(dDatabaseGame PRIVATE DLU_SQLITE_DATABASE=${DLU_SQLITE_DATABASE} DLU_MYSQL_DATABASE=${DLU_MYSQL_DATABASE})
 
 # Need to specify to use the CXX compiler language here or else we get errors including <string>.
 target_precompile_headers(

dDatabase/GameDatabase/Database.cpp

@@ -5,10 +5,10 @@
 #include "SQLiteDatabase.h"
 #include "DluAssert.h"
 
-#if defined(DLU_SQLITE_DATABASE)
+#if DLU_SQLITE_DATABASE == 1
 #	define DluGameDatabase SQLiteDatabase
 #	include "SQLiteDatabase.h"
-#elif defined(DLU_MYSQL_DATABASE)
+#elif DLU_MYSQL_DATABASE == 1
 #	define DluGameDatabase MySQLDatabase
 #	include "MySQLDatabase.h"
 #else

dGame/CMakeLists.txt

@@ -26,7 +26,6 @@ target_include_directories(dGameBase PUBLIC "." "dEntity"
 	"${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/CDClientTables"
 	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase"
 	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables"
-	"${PROJECT_SOURCE_DIR}/thirdparty/mariadb-connector-cpp/include"
 	# dPhysics
 	"${PROJECT_SOURCE_DIR}/thirdparty/recastnavigation/Recast/Include"
 	"${PROJECT_SOURCE_DIR}/thirdparty/recastnavigation/Detour/Include"

dGame/dComponents/CMakeLists.txt

@@ -65,7 +65,6 @@ target_include_directories(dComponents PUBLIC "."
 	"${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/CDClientTables"
 	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase"
 	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables"
-	"${PROJECT_SOURCE_DIR}/thirdparty/mariadb-connector-cpp/include"
 	# dPhysics (via dpWorld.h)
 	"${PROJECT_SOURCE_DIR}/thirdparty/recastnavigation/Recast/Include"
 	"${PROJECT_SOURCE_DIR}/thirdparty/recastnavigation/Detour/Include"

dNet/CMakeLists.txt

@@ -19,7 +19,6 @@ target_include_directories(dNet PRIVATE
 	"${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/CDClientTables"
 	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase"
 	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables"
-	"${PROJECT_SOURCE_DIR}/thirdparty/mariadb-connector-cpp/include"
 
 	"${PROJECT_SOURCE_DIR}/dGame" # UserManager.h
 	"${PROJECT_SOURCE_DIR}/dGame/dComponents"

tests/CMakeLists.txt

@@ -10,8 +10,10 @@ if(APPLE)
 	set(CMAKE_INSTALL_RPATH "@executable_path")
 endif()
 
-add_custom_target(conncpp_tests
-	${CMAKE_COMMAND} -E copy $<TARGET_FILE:MariaDB::ConnCpp> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+if(${DLU_MYSQL_DATABASE} EQUAL 1)
+	add_custom_target(conncpp_tests
+		${CMAKE_COMMAND} -E copy $<TARGET_FILE:MariaDB::ConnCpp> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+endif()
 
 # Add the subdirectories
 add_subdirectory(dCommonTests)

tests/dCommonTests/CMakeLists.txt

@@ -17,10 +17,13 @@ list(APPEND DCOMMONTEST_SOURCES ${DENUMS_TESTS})
 
 # Set our executable
 add_executable(dCommonTests ${DCOMMONTEST_SOURCES})
-add_dependencies(dCommonTests conncpp_tests)
+
+if(${DLU_MYSQL_DATABASE} EQUAL 1)
+	add_dependencies(dCommonTests conncpp_tests)
+endif()
 
 # Apple needs some special linkage for the mariadb connector for tests.
-if(APPLE)
+if(APPLE AND ${DLU_MYSQL_DATABASE} EQUAL 1)
 add_custom_command(TARGET dCommonTests POST_BUILD
 	COMMAND otool ARGS -l dCommonTests
 	COMMAND otool ARGS -L dCommonTests

tests/dGameTests/CMakeLists.txt

@@ -13,10 +13,13 @@ file(COPY ${COMPONENT_TEST_DATA} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
 # Add the executable.  Remember to add all tests above this!
 add_executable(dGameTests ${DGAMETEST_SOURCES})
-add_dependencies(dGameTests conncpp_tests)
+
+if(${DLU_MYSQL_DATABASE} EQUAL 1)
+	add_dependencies(dGameTests conncpp_tests)
+endif()
 
 # Apple needs some special linkage for the mariadb connector for tests.
-if(APPLE)
+if(APPLE AND ${DLU_MYSQL_DATABASE} EQUAL 1)
 add_custom_command(TARGET dGameTests POST_BUILD
 	COMMAND install_name_tool ARGS -change libmariadbcpp.dylib @rpath/libmariadbcpp.dylib dGameTests
 	COMMAND otool ARGS -L dGameTests

thirdparty/SQLite/CMakeLists.txt

@@ -3,7 +3,7 @@ set (SQLITE3_SOURCES
 	"sqlite3.c"
 )
 
-add_library (sqlite3 ${SQLITE3_SOURCES})
+add_library(sqlite3 ${SQLITE3_SOURCES})
 
 if(UNIX)
 	# Add warning disable flags and link Unix libraries to sqlite3