From ee04870f0ced0e372de785c24a4112e0fbb2aeb2 Mon Sep 17 00:00:00 2001 From: Daniel Collin Date: Mon, 7 Jan 2013 19:23:45 +0100 Subject: [PATCH] Build fixes --- ogl_editor/emgui/src/Emgui.h | 2 +- ogl_editor/emgui/src/Emgui_internal.h | 3 +-- ogl_editor/units.lua | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ogl_editor/emgui/src/Emgui.h b/ogl_editor/emgui/src/Emgui.h index 834b661..b51f7db 100644 --- a/ogl_editor/emgui/src/Emgui.h +++ b/ogl_editor/emgui/src/Emgui.h @@ -3,7 +3,7 @@ #define EMGUI_H_ #include "Types.h" -#include "FontLayout.h" +#include /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/ogl_editor/emgui/src/Emgui_internal.h b/ogl_editor/emgui/src/Emgui_internal.h index e64ca7d..082f94e 100644 --- a/ogl_editor/emgui/src/Emgui_internal.h +++ b/ogl_editor/emgui/src/Emgui_internal.h @@ -1,9 +1,8 @@ #ifndef EMGUI_INTERNAL_H_ #define EMGUI_INTERNAL_H_ -#include "Types.h" +#include #include "emgui_internal.h" -#include "FontLayout.h" #include "External/stb_truetype.h" /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/ogl_editor/units.lua b/ogl_editor/units.lua index 1ce214c..583cbdf 100644 --- a/ogl_editor/units.lua +++ b/ogl_editor/units.lua @@ -31,7 +31,7 @@ StaticLibrary { Name = "emgui", Env = { - CPPPATH = { ".", "../../emgui/src", "../../../../emgui/src" }, + CPPPATH = { ".", "emgui/src", "emgui/include" }, PROGOPTS = { { "/SUBSYSTEM:WINDOWS", "/DEBUG"; Config = { "win32-*-*", "win64-*-*" } }, },