From d56ef32202ea5180aa8d1308418946d5467adf40 Mon Sep 17 00:00:00 2001 From: Jonathan Bradley Date: Tue, 28 Nov 2023 16:55:20 -0500 Subject: make pke a library and the editor its own executable --- CMakeLists.txt | 8 ++------ editor/CMakeLists.txt | 10 ++++++++++ editor/main.cpp | 20 ++++++++++++++++++++ src/main.cpp | 20 -------------------- 4 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 editor/CMakeLists.txt create mode 100644 editor/main.cpp delete mode 100644 src/main.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index cf7d3e3..5af8339 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,11 +8,8 @@ project(pke VERSION 0.0) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED True) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -pthread") -set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g") -set(CMAKE_CXX_FLAGS_RELEASE "-O3 -s DNDEBUG") set(PKE_SOURCE_FILES - src/main.cpp src/macros.hpp src/camera.hpp src/camera.cpp @@ -36,7 +33,6 @@ set(PKE_SOURCE_FILES src/memory-type-defs.hpp src/memory.hpp src/memory.cpp - src/memory-allocator.hpp src/dynamic-array.hpp src/dynamic-array.cpp src/asset-manager.hpp @@ -95,7 +91,7 @@ if (Vulkan_FOUND) message(STATUS "Vulkan found: " ${Vulkan_INCLUDE_DIR}) endif (Vulkan_FOUND) -add_executable(pke +add_library(pke ${PKE_SOURCE_FILES} ) @@ -156,7 +152,6 @@ FetchContent_Declare(bullet ) FetchContent_GetProperties(bullet) if(NOT bullet_POPULATED) - set(BUILD_SHARED_LIBS 1 CACHE STRING "" FORCE) set(BUILD_BULLET2_DEMOS 0 CACHE STRING "" FORCE) set(BUILD_CPU_DEMOS 0 CACHE STRING "" FORCE) set(BUILD_UNIT_TESTS 0 CACHE STRING "" FORCE) @@ -181,4 +176,5 @@ target_link_libraries(pke PUBLIC imguidocked) add_dependencies(pke shaders) +add_subdirectory(editor) add_subdirectory(test) diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt new file mode 100644 index 0000000..0b1c228 --- /dev/null +++ b/editor/CMakeLists.txt @@ -0,0 +1,10 @@ +project(pke_editor VERSION 0.0) + +set(PKE_EDITOR_SOURCE_FILES + main.cpp +) +add_executable(pke_editor + ${PKE_EDITOR_SOURCE_FILES} +) +target_link_libraries(pke_editor PRIVATE pke imguidocked) +target_include_directories(pke_editor PRIVATE pke imguidocked) diff --git a/editor/main.cpp b/editor/main.cpp new file mode 100644 index 0000000..0d4ef9f --- /dev/null +++ b/editor/main.cpp @@ -0,0 +1,20 @@ +#include + +#include "game.hpp" +#include "game-settings.hpp" +#include "window-types.hpp" + +void signal_handler(int signal_num) { + fprintf(stdout, "Received signal: %d - shutting down\n", signal_num); + pkeSettings.isGameRunning = false; +} + +PKEWindowProperties windowProps{}; + +int main() { + signal(SIGTERM, signal_handler); + fprintf(stdout, "PKE ENTERING\n"); + Game_Main(&windowProps); + fprintf(stdout, "PKE EXITING\n"); + return 0; +} diff --git a/src/main.cpp b/src/main.cpp deleted file mode 100644 index 0d4ef9f..0000000 --- a/src/main.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include - -#include "game.hpp" -#include "game-settings.hpp" -#include "window-types.hpp" - -void signal_handler(int signal_num) { - fprintf(stdout, "Received signal: %d - shutting down\n", signal_num); - pkeSettings.isGameRunning = false; -} - -PKEWindowProperties windowProps{}; - -int main() { - signal(SIGTERM, signal_handler); - fprintf(stdout, "PKE ENTERING\n"); - Game_Main(&windowProps); - fprintf(stdout, "PKE EXITING\n"); - return 0; -} -- cgit v1.2.3