Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove headers from CMakeLists #593

Merged
merged 2 commits into from
Sep 26, 2023
Merged

Remove headers from CMakeLists #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
421573d
fix: remove headers from CMakeLists
luishfonseca Sep 26, 2023
ab3d73a
apply clang-format
Sep 26, 2023
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
82 changes: 1 addition & 81 deletions core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,89 +85,9 @@ set(CUBOS_CORE_SOURCE
"src/cubos/core/ecs/registry.cpp"
)

set(CUBOS_CORE_INCLUDE
"include/cubos/core/log.hpp"
"include/cubos/core/thread_pool.hpp"

"include/cubos/core/memory/move.hpp"
"include/cubos/core/memory/stream.hpp"
"include/cubos/core/memory/standard_stream.hpp"
"include/cubos/core/memory/buffer_stream.hpp"
"include/cubos/core/memory/endianness.hpp"
"include/cubos/core/memory/type_map.hpp"
"include/cubos/core/memory/guards.hpp"

"include/cubos/core/reflection/reflect.hpp"
"include/cubos/core/reflection/type.hpp"
"include/cubos/core/reflection/traits/constructible.hpp"
"include/cubos/core/reflection/external/primitives.hpp"

"include/cubos/core/data/serializer.hpp"
"include/cubos/core/data/deserializer.hpp"
"include/cubos/core/data/debug_serializer.hpp"
"include/cubos/core/data/json_serializer.hpp"
"include/cubos/core/data/json_deserializer.hpp"
"include/cubos/core/data/binary_serializer.hpp"
"include/cubos/core/data/binary_deserializer.hpp"
"include/cubos/core/data/serialization_map.hpp"
"include/cubos/core/data/package.hpp"
"include/cubos/core/data/fs/file.hpp"
"include/cubos/core/data/fs/file_stream.hpp"
"include/cubos/core/data/fs/file_system.hpp"
"include/cubos/core/data/fs/archive.hpp"
"include/cubos/core/data/fs/standard_archive.hpp"
"include/cubos/core/data/fs/embedded_archive.hpp"
"include/cubos/core/data/qb_parser.hpp"
"include/cubos/core/data/context.hpp"

"include/cubos/core/io/window.hpp"
"include/cubos/core/io/keyboard.hpp"
"include/cubos/core/io/cursor.hpp"
"include/cubos/core/io/gamepad.hpp"

"include/cubos/core/geom/box.hpp"
"include/cubos/core/geom/capsule.hpp"
"include/cubos/core/geom/simplex.hpp"
"include/cubos/core/geom/plane.hpp"

"include/cubos/core/gl/debug.hpp"
"include/cubos/core/gl/render_device.hpp"
"include/cubos/core/gl/material.hpp"
"include/cubos/core/gl/palette.hpp"
"include/cubos/core/gl/grid.hpp"
"include/cubos/core/gl/vertex.hpp"
"include/cubos/core/gl/camera.hpp"
"include/cubos/core/gl/util.hpp"

"include/cubos/core/al/audio_device.hpp"

"include/cubos/core/ui/imgui.hpp"
"include/cubos/core/ui/serialization.hpp"
"include/cubos/core/ui/ecs.hpp"

"include/cubos/core/ecs/entity_manager.hpp"
"include/cubos/core/ecs/resource_manager.hpp"
"include/cubos/core/ecs/component_manager.hpp"
"include/cubos/core/ecs/blueprint.hpp"
"include/cubos/core/ecs/commands.hpp"
"include/cubos/core/ecs/storage.hpp"
"include/cubos/core/ecs/vec_storage.hpp"
"include/cubos/core/ecs/map_storage.hpp"
"include/cubos/core/ecs/null_storage.hpp"
"include/cubos/core/ecs/world.hpp"
"include/cubos/core/ecs/query.hpp"
"include/cubos/core/ecs/system.hpp"
"include/cubos/core/ecs/registry.hpp"
"include/cubos/core/ecs/dispatcher.hpp"
"include/cubos/core/ecs/event_pipe.hpp"
"include/cubos/core/ecs/event_reader.hpp"
"include/cubos/core/ecs/event_writer.hpp"
"include/cubos/core/ecs/accessors.hpp"
)

# Create core library

add_library(cubos-core ${CUBOS_CORE_SOURCE} ${CUBOS_CORE_INCLUDE})
add_library(cubos-core ${CUBOS_CORE_SOURCE})
target_include_directories(cubos-core PUBLIC "include" PRIVATE "src")
target_compile_definitions(cubos-core PUBLIC
-DCUBOS_CORE_ECS_MAX_COMPONENTS=${CUBOS_CORE_ECS_MAX_COMPONENTS}
Expand Down
67 changes: 1 addition & 66 deletions engine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,73 +61,8 @@ set(CUBOS_ENGINE_SOURCE
"src/cubos/engine/renderer/pps/pass.cpp"
)

set(CUBOS_ENGINE_INCLUDE
"include/cubos/engine/cubos.hpp"

"include/cubos/engine/settings/plugin.hpp"

"include/cubos/engine/window/plugin.hpp"

"include/cubos/engine/imgui/plugin.hpp"

"include/cubos/engine/tools/asset_explorer/plugin.hpp"
"include/cubos/engine/tools/settings_inspector/plugin.hpp"
"include/cubos/engine/tools/entity_selector/plugin.hpp"
"include/cubos/engine/tools/world_inspector/plugin.hpp"
"include/cubos/engine/tools/entity_inspector/plugin.hpp"
"include/cubos/engine/tools/scene_editor/plugin.hpp"

"include/cubos/engine/transform/position.hpp"
"include/cubos/engine/transform/rotation.hpp"
"include/cubos/engine/transform/scale.hpp"
"include/cubos/engine/transform/local_to_world.hpp"
"include/cubos/engine/transform/plugin.hpp"

"include/cubos/engine/assets/plugin.hpp"
"include/cubos/engine/assets/assets.hpp"
"include/cubos/engine/assets/bridge.hpp"
"include/cubos/engine/assets/asset.hpp"
"include/cubos/engine/assets/meta.hpp"
"include/cubos/engine/assets/bridges/file.hpp"
"include/cubos/engine/assets/bridges/json.hpp"
"include/cubos/engine/assets/bridges/binary.hpp"

"include/cubos/engine/scene/plugin.hpp"
"include/cubos/engine/scene/scene.hpp"
"include/cubos/engine/scene/bridge.hpp"

"include/cubos/engine/voxels/plugin.hpp"

"include/cubos/engine/collisions/plugin.hpp"
"include/cubos/engine/collisions/broad_phase_collisions.hpp"
"include/cubos/engine/collisions/aabb.hpp"
"include/cubos/engine/collisions/colliders/box.hpp"
"include/cubos/engine/collisions/colliders/capsule.hpp"
"include/cubos/engine/collisions/colliders/plane.hpp"
"include/cubos/engine/collisions/colliders/simplex.hpp"

"include/cubos/engine/input/plugin.hpp"
"include/cubos/engine/input/input.hpp"
"include/cubos/engine/input/bindings.hpp"
"include/cubos/engine/input/action.hpp"
"include/cubos/engine/input/axis.hpp"

"include/cubos/engine/renderer/plugin.hpp"
"include/cubos/engine/renderer/frame.hpp"
"include/cubos/engine/renderer/renderer.hpp"
"include/cubos/engine/renderer/deferred_renderer.hpp"
"include/cubos/engine/renderer/environment.hpp"
"include/cubos/engine/renderer/spot_light.hpp"
"include/cubos/engine/renderer/directional_light.hpp"
"include/cubos/engine/renderer/point_light.hpp"
"include/cubos/engine/renderer/pps/bloom.hpp"
"include/cubos/engine/renderer/pps/copy_pass.hpp"
"include/cubos/engine/renderer/pps/manager.hpp"
"include/cubos/engine/renderer/pps/pass.hpp"
)

# Create cubos engine
add_library(cubos-engine ${CUBOS_ENGINE_SOURCE} ${CUBOS_ENGINE_INCLUDE})
add_library(cubos-engine ${CUBOS_ENGINE_SOURCE})
target_include_directories(cubos-engine PUBLIC "include" PRIVATE "src")
target_link_libraries(cubos-engine PUBLIC cubos-core)
cubos_common_target_options(cubos-engine)
Expand Down
2 changes: 1 addition & 1 deletion engine/samples/events/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ struct State
};

/// [Event reader system]
static void firstSystem(EventReader<MyEvent> reader)
static void firstSystem(EventReader<MyEvent> reader)
{
for (const auto& event : reader)
{
Expand Down
Loading