From 7dd72722394be99e778949cb77b5267dd798e443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Tue, 10 Mar 2020 17:42:46 +0100 Subject: [PATCH] moving vertex files in ismotry folder --- CMakeLists.txt | 8 ++++---- lib/gamacon | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d063000..0ea151e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,7 +69,7 @@ add_executable(My3D lib/gamacon/src/components/parallax_component.c lib/gamacon/src/components/renderer.c lib/gamacon/src/components/transform_component.c - lib/gamacon/src/components/renderers/vertex_component.c + lib/gamacon/src/components/isometry/vertex_component.c lib/gamacon/src/deserializer/deserialize_entity.c lib/gamacon/src/deserializer/prefab.c lib/gamacon/src/engine/discard_player.c @@ -211,7 +211,7 @@ add_executable(My3D lib/my/my/my_str_replace.c lib/gamacon/src/sfml_renderer/sfml_init.c lib/gamacon/src/sfml_renderer/sfml_events.c - lib/gamacon/src/components/renderers/map_managment.c + lib/gamacon/src/components/isometry/map_managment.c lib/gamacon/include/components/map_managment.h lib/xmlparser/src/otherget.c src/options.c @@ -242,14 +242,14 @@ add_executable(My3D src/systems/game_manager_system.c include/systems/game_manager_system.h lib/gamacon/include/keybindings.h - lib/gamacon/src/components/renderers/map_interactions.c + lib/gamacon/src/components/isometry/map_interactions.c lib/gamacon/include/map_interactions.h lib/gamacon/include/keybindings.h lib/gamacon/src/ui/tooltip.c lib/gamacon/src/components/tooltip_component.c lib/gamacon/include/components/tooltip_component.h lib/gamacon/src/systems/tooltip_system.c -) + lib/gamacon/src/components/isometry/vertex_data_loader.c) add_compile_options(-W -Wall -Wextra -Wshadow) diff --git a/lib/gamacon b/lib/gamacon index 15fd9ad..dfda973 160000 --- a/lib/gamacon +++ b/lib/gamacon @@ -1 +1 @@ -Subproject commit 15fd9ad989e210b7874e1ef44ef8670cd56c350e +Subproject commit dfda973a2846c4942f68fe4cb246b9fdc4e5d6f6