Merge branch 'main' of https://git.efi.th-nuernberg.de/gitea/guballaro99746/Stone_Development

2025-10-20 15:24:04 +02:00 · 2025-10-20 15:24:04 +02:00 · 653f9c48c2
commit 653f9c48c2
parent 1b11d757c3 48d77aee23
2 changed files with 5 additions and 1 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -18,7 +18,7 @@ set(SRC_FILES
 )

 set(INCLUDE_DIRS
-        ${CMAKE_CURRENT_LIST_DIR}/linux
+        ${CMAKE_CURRENT_LIST_DIR}/OS_NAME
 )

 add_executable(${EXECUTABLE_NAME} ${SRC_FILES})
--- a/gamecube.cpp
+++ b/gamecube.cpp
@ -3,6 +3,10 @@
 gamecube::gamecube(const Vec3 &pos, Color col)
    : position(pos), color(col) {}

+
+// hallo hier ist robert
+//hallo Robert hier ist Niklas
+    //test
 void gamecube::Update(float flipSpeed)
 {
    if (flippingForward)