Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cmake-multi-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
run: |
sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse"
sudo apt-get update -y -qq
sudo apt-get install libsdl2-dev libglm-dev libvulkan-volk-dev nlohmann-json3-dev libvulkan-dev libstb-dev
sudo apt-get install libsdl2-dev libglm-dev libvulkan-volk-dev nlohmann-json3-dev libvulkan-dev libstb-dev glslc doxygen


- name: Set reusable strings
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ CMakeFiles/
Makefile
cmake_install.cmake
install_manifest.txt
*.dir/

# vcpkg
vcpkg/
Expand Down Expand Up @@ -50,7 +49,6 @@ vcpkg-installed/
*.log
*.swp
*.swo
*~

# OS-specific files
.DS_Store
Expand Down
10 changes: 10 additions & 0 deletions scripts/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,16 @@
# Find Python interpreter
find_package(Python3 COMPONENTS Interpreter REQUIRED)

if(CMAKE_BUILD_TYPE)
set(BUILD_CONFIG "${CMAKE_BUILD_TYPE}")
elseif(CMAKE_CONFIGURATION_TYPES)
# For multi-config generators, use the current config from the --config flag
# This requires CMake 3.15+ for proper generator expressions
set(BUILD_CONFIG "$<CONFIG>")
else()
set(BUILD_CONFIG "Release")
endif()
Comment thread
kimkulling marked this conversation as resolved.

# Get the build configuration (Debug/Release)
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
set(BUILD_CONFIG "Debug")
Expand Down
2 changes: 1 addition & 1 deletion src/contrib/vcpkg
Submodule vcpkg updated 4469 files
2 changes: 2 additions & 0 deletions src/editor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ target_link_libraries(segfault_editor
SDL2::SDL2
glm::glm
)

add_dependencies(segfault_editor compile_all_assets)
1 change: 1 addition & 0 deletions src/examples/behaviortree_sample/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
add_executable(behaviortree_sample behaviortree_sample.cpp)
target_link_libraries(behaviortree_sample example_common)
add_dependencies(behaviortree_sample compile_all_assets)

set_target_properties(behaviortree_sample PROPERTIES FOLDER examples )
1 change: 1 addition & 0 deletions src/examples/hello_world/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
add_executable(hello_world hello_world.cpp)
target_link_libraries(hello_world example_common)
add_dependencies(hello_world compile_all_assets)

set_target_properties(hello_world PROPERTIES FOLDER examples )
1 change: 1 addition & 0 deletions src/examples/scene_sample/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
add_executable(scene_sample scene_sample.cpp)
target_link_libraries(scene_sample example_common)
add_dependencies(scene_sample compile_all_assets)

set_target_properties(scene_sample PROPERTIES FOLDER examples )
1 change: 1 addition & 0 deletions src/examples/scene_sample_2d/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
add_executable(scene_sample_2d scene_sample_2d.cpp)
target_link_libraries(scene_sample_2d example_common)
add_dependencies(scene_sample_2d compile_all_assets)

set_target_properties(scene_sample_2d PROPERTIES FOLDER examples )
6 changes: 6 additions & 0 deletions src/runtime/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ SET(segfault_core_src

set (segfault_scene_src
scene/camera.h
scene/scene.h
scene/scene2d.h
scene/scene2d.cpp
scene/scene2dmanager.h
scene/scene2dmanager.cpp
)

SET(segfault_renderer_src
Expand Down Expand Up @@ -50,6 +55,7 @@ source_group(ai FILES ${segfault_ai_src} )
source_group(core FILES ${segfault_core_src} )
source_group(application FILES ${segfault_application_src} )
source_group(renderer FILES ${segfault_renderer_src} )
source_group(scene FILES ${segfault_scene_src} )

ADD_LIBRARY(segfault_runtime SHARED
${segfault_ai_src}
Expand Down
Loading
Loading