vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Build fixes

Browse Source
This commit is contained in:
Daniel Collin 2013-01-07 19:23:45 +01:00
parent 9e355122a5
commit ee04870f0c
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ogl_editor/emgui/src/Emgui.h
View File

@ -3,7 +3,7 @@
#define EMGUI_H_ #define EMGUI_H_
#include "Types.h" #include "Types.h"
#include "FontLayout.h" #include <emgui/FontLayout.h>
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

3
ogl_editor/emgui/src/Emgui_internal.h
View File

@ -1,9 +1,8 @@
#ifndef EMGUI_INTERNAL_H_ #ifndef EMGUI_INTERNAL_H_
#define EMGUI_INTERNAL_H_ #define EMGUI_INTERNAL_H_
#include "Types.h" #include <emgui/emgui.h>
#include "emgui_internal.h" #include "emgui_internal.h"
#include "FontLayout.h"
#include "External/stb_truetype.h" #include "External/stb_truetype.h"
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

2
ogl_editor/units.lua
View File

@ -31,7 +31,7 @@ StaticLibrary {
Name = "emgui", Name = "emgui",
Env = { Env = {
CPPPATH = { ".", "../../emgui/src", "../../../../emgui/src" }, CPPPATH = { ".", "emgui/src", "emgui/include" },
PROGOPTS = { PROGOPTS = {
{ "/SUBSYSTEM:WINDOWS", "/DEBUG"; Config = { "win32-*-*", "win64-*-*" } }, { "/SUBSYSTEM:WINDOWS", "/DEBUG"; Config = { "win32-*-*", "win64-*-*" } },
}, },