From 67fb566dfbbb5888ffafe320eac2c6a794d3c520 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Sat, 13 May 2023 20:03:42 +0200 Subject: [PATCH] Compile launcher as separate library again --- r5dev/CMakeLists.txt | 1 + r5dev/core/CMakeLists.txt | 1 + r5dev/engine/CMakeLists.txt | 8 -------- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/r5dev/CMakeLists.txt b/r5dev/CMakeLists.txt index 33ca6f05..cfc2ccd5 100644 --- a/r5dev/CMakeLists.txt +++ b/r5dev/CMakeLists.txt @@ -5,6 +5,7 @@ add_subdirectory( vpc ) # VPC and Tier0 must be the first as this creates the sh add_subdirectory( tier0 ) add_subdirectory( tier1 ) add_subdirectory( tier2 ) +add_subdirectory( launcher ) add_subdirectory( protoc ) add_subdirectory( appframework ) diff --git a/r5dev/core/CMakeLists.txt b/r5dev/core/CMakeLists.txt index 6f6640db..3ac7e2da 100644 --- a/r5dev/core/CMakeLists.txt +++ b/r5dev/core/CMakeLists.txt @@ -45,6 +45,7 @@ target_link_libraries( ${PROJECT_NAME} PRIVATE "tier0" "tier1" "tier2" + "launcher" "appframework" "vstdlib" diff --git a/r5dev/engine/CMakeLists.txt b/r5dev/engine/CMakeLists.txt index c72715d6..2a17f30d 100644 --- a/r5dev/engine/CMakeLists.txt +++ b/r5dev/engine/CMakeLists.txt @@ -143,14 +143,6 @@ add_sources( SOURCE_GROUP "GameUI" ) endif() -add_sources( SOURCE_GROUP "Launcher" - "${ENGINE_SOURCE_DIR}/launcher/launcher.cpp" - "${ENGINE_SOURCE_DIR}/launcher/launcher.h" - "${ENGINE_SOURCE_DIR}/launcher/launcherdefs.h" - "${ENGINE_SOURCE_DIR}/launcher/prx.cpp" - "${ENGINE_SOURCE_DIR}/launcher/prx.h" -) - add_sources( SOURCE_GROUP "Windows" "${ENGINE_SOURCE_DIR}/windows/console.cpp" "${ENGINE_SOURCE_DIR}/windows/console.h"