diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/main/engine/engine.c | 2 | ||||
| -rw-r--r-- | src/main/engine/ui/ui.h (renamed from src/main/ui/ui.h) | 0 | ||||
| -rw-r--r-- | src/main/engine/ui/x11/ui.c (renamed from src/main/ui/x11/ui.c) | 2 | ||||
| -rw-r--r-- | src/main/main.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5443132..865f37f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,8 +27,8 @@ add_definitions(-DX11) add_executable(tris src/main/main.c - src/main/ui/ui.h - src/main/ui/x11/ui.c + src/main/engine/ui/ui.h + src/main/engine/ui/x11/ui.c src/main/util.h src/main/util.c src/main/engine/engine.h diff --git a/src/main/engine/engine.c b/src/main/engine/engine.c index 8db206a..46b34cb 100644 --- a/src/main/engine/engine.c +++ b/src/main/engine/engine.c @@ -22,7 +22,7 @@ #include <time.h> #include <GL/gl.h> #include "engine.h" -#include "../ui/ui.h" +#include "ui/ui.h" #include "../util/list.h" #ifdef X11 diff --git a/src/main/ui/ui.h b/src/main/engine/ui/ui.h index 06cd515..06cd515 100644 --- a/src/main/ui/ui.h +++ b/src/main/engine/ui/ui.h diff --git a/src/main/ui/x11/ui.c b/src/main/engine/ui/x11/ui.c index 69bd5be..76adaac 100644 --- a/src/main/ui/x11/ui.c +++ b/src/main/engine/ui/x11/ui.c @@ -24,7 +24,7 @@ #include <X11/Xlib.h> #include <unistd.h> #include <time.h> -#include "../../util.h" +#include "../../../util.h" static Display *display; static Window window; diff --git a/src/main/main.c b/src/main/main.c index ea2bc91..6a252c0 100644 --- a/src/main/main.c +++ b/src/main/main.c @@ -21,7 +21,7 @@ #include <GL/glx.h> #include <stdio.h> #include <stdlib.h> -#include "ui/ui.h" +#include "engine/ui/ui.h" #include "engine/engine.h" #include "game/game.h" |