diff options
| author | Jonathan Bradley <jcb@pikum.xyz> | 2023-11-28 16:55:20 -0500 |
|---|---|---|
| committer | Jonathan Bradley <jcb@pikum.xyz> | 2023-11-28 16:55:20 -0500 |
| commit | d56ef32202ea5180aa8d1308418946d5467adf40 (patch) | |
| tree | 493adb247a59e971ad78a6558c0c0d609282a40f | |
| parent | 6d9bea3e71137a94ba64fd0b5661d341304b2dc1 (diff) | |
make pke a library and the editor its own executable
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | editor/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | editor/main.cpp (renamed from src/main.cpp) | 0 |
3 files changed, 12 insertions, 6 deletions
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/src/main.cpp b/editor/main.cpp index 0d4ef9f..0d4ef9f 100644 --- a/src/main.cpp +++ b/editor/main.cpp |