Skip to content

Commit

Permalink
Merge pull request #254 from daid/ECS
Browse files Browse the repository at this point in the history
ECS
  • Loading branch information
daid authored Dec 11, 2024
2 parents af1daf4 + a1174ef commit 0f4b696
Show file tree
Hide file tree
Showing 103 changed files with 15,218 additions and 8,552 deletions.
34 changes: 26 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ set(source_files #All SeriousProton's objects to compile
src/audio/sound.cpp
src/audio/music.cpp
src/clipboard.cpp
src/collisionable.cpp
src/engine.cpp
src/event.cpp
src/graphics/font.cpp
Expand Down Expand Up @@ -171,9 +170,12 @@ set(source_files #All SeriousProton's objects to compile
src/random.cpp
src/Renderable.cpp
src/resources.cpp
src/scriptInterface.cpp
src/scriptInterfaceMagic.cpp
src/scriptInterfaceSandbox.cpp
src/script/environment.cpp
src/script/environment.h
src/script/conversion.h
src/script/component.h
src/script/callback.h
src/script/callback.cpp
src/shaderManager.cpp
src/soundManager.cpp
src/stringImproved.cpp
Expand Down Expand Up @@ -201,7 +203,6 @@ set(source_files #All SeriousProton's objects to compile
src/audio/sound.h
src/audio/music.h
src/clipboard.h
src/collisionable.h
src/dynamicLibrary.h
src/engine.h
src/event.h
Expand Down Expand Up @@ -251,9 +252,6 @@ set(source_files #All SeriousProton's objects to compile
src/rect.h
src/Renderable.h
src/resources.h
src/scriptInterface.h
src/scriptInterfaceMagic.h
src/scriptInterfaceSandbox.h
src/shaderManager.h
src/soundManager.h
src/stringImproved.h
Expand All @@ -266,6 +264,26 @@ set(source_files #All SeriousProton's objects to compile
src/vectorUtils.h
src/windowManager.h

src/container/sparseset.h
src/container/chunkedvector.h
src/container/bitset.h

src/ecs/entity.h
src/ecs/entity.cpp
src/ecs/component.h
src/ecs/component.cpp
src/ecs/query.h
src/ecs/multiplayer.h
src/ecs/system.h

src/components/collision.h
src/components/multiplayer.h
src/systems/collision.h
src/systems/collision.cpp

src/multiplayer/collision.h
src/multiplayer/collision.cpp

cmake/glDebug.inl.in
"${glDebug_inl}"
)
Expand Down
2 changes: 2 additions & 0 deletions libs/lua/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ set(source_files
ldump.c
lfunc.c
lgc.c
linit.c
llex.c
lmathlib.c
lmem.c
Expand All @@ -40,6 +41,7 @@ add_library(lua STATIC ${source_files})
target_include_directories(lua
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>)
target_compile_definitions(lua PRIVATE LUA_COMPAT_MATHLIB)

#--------------------------------Installation----------------------------------
install(
Expand Down
Loading

0 comments on commit 0f4b696

Please sign in to comment.