Fixed include paths as emgui was moved. Fixed some more stuff in tundra scripts to remove deprecated warning

ogl_editor/emgui/include/emgui/Emgui.h

@@ -5,6 +5,8 @@
 #include "Types.h"
 #include "FontLayout.h"
 
+struct EmguiFontLayout;
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 enum EmguiSliderDirection
@@ -111,7 +113,7 @@ bool Emgui_setFontByName(const char* ttfFontname);
 
 int Emgui_loadFontTTF(const char* ttfFontname, float fontHeight);
 int Emgui_loadFontBitmap(const char* buffer, int len, enum EmguiMemoryLocation location, 
-						 int rangeStart, int rangeEnd, EmguiFontLayout* layout);
+						 int rangeStart, int rangeEnd, struct EmguiFontLayout* layout);
 uint32_t Emgui_getTextSize(const char* text);
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

ogl_editor/emgui/include/emgui/FontLayout.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include "Types.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+typedef struct EmguiFontLayout
+{
+	int16_t id;
+	int16_t x;
+	int16_t y;
+	int16_t width;
+	int16_t height;
+	int16_t xoffset;
+	int16_t yoffset;
+	int16_t xadvance;
+
+} EmguiFontLayout;
+

ogl_editor/src/Commands.c

@@ -1,11 +1,11 @@
 #include "Commands.h"
 #include "RemoteConnection.h"
 #include "TrackData.h"
-#include "Types.h"
 #include "../../sync/sync.h"
 #include "../../sync/track.h"
 #include <stdlib.h>
 #include <stdio.h>
+#include <emgui/Types.h>
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 

ogl_editor/src/Editor.c

@@ -1,11 +1,10 @@
+#include "Editor.h"
 #include <string.h>
 #include <stdlib.h>
-#include <Emgui.h>
 #include <stdio.h>
 #include <math.h>
 #include "Menu.h"
 #include "Dialog.h"
-#include "Editor.h"
 #include "LoadSave.h"
 #include "TrackView.h"
 #include "rlog.h"
@@ -17,6 +16,7 @@
 #include "../../sync/sync.h"
 #include "../../sync/base.h"
 #include "../../sync/data.h"
+#include <emgui/emgui.h>
 
 extern void Window_setTitle(const text_t* title);
 extern void Window_populateRecentList(const text_t** files);

ogl_editor/src/Editor.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Types.h"
+#include <emgui/types.h>
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 

ogl_editor/src/Menu.c

@@ -1,5 +1,5 @@
 #include "Menu.h"
-#include <Emgui.h>
+#include <emgui/emgui.h>
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // On win32 (where we use unicode for text-strings) this is defined already

ogl_editor/src/MinecraftiaFont.c

@@ -1,4 +1,4 @@
-#include <Emgui.h>
+#include <emgui/emgui.h>
 #include "MinecraftiaFont.h"
 
 int g_minecraftiaFontSize = 713;

ogl_editor/src/MinecraftiaFont.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Emgui.h>
+#include <emgui/emgui.h>
 
 extern EmguiFontLayout g_minecraftiaFontLayout[];
 extern char g_minecraftiaFont[];

ogl_editor/src/RemoteConnection.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Types.h>
+#include <emgui/types.h>
 
 struct track_key;
 struct sync_track;

ogl_editor/src/TrackData.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Types.h"
+#include <emgui/types.h>
 #include "../../sync/data.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

ogl_editor/src/TrackView.c

@@ -1,5 +1,5 @@
 #include "trackview.h"
-#include <Emgui.h>
+#include <emgui/emgui.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

ogl_editor/src/TrackView.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Types.h"
+#include <emgui/types.h>
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 

ogl_editor/src/loadsave.c

@@ -4,9 +4,9 @@
 #include "../external/mxml/mxml.h"
 #include "RemoteConnection.h"
 #include "../../sync/data.h"
-#include <Types.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <emgui/types.h>
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 

ogl_editor/src/loadsave.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Emgui.h>
+#include <emgui/types.h>
 
 struct TrackData;
 

ogl_editor/src/minmax.h

@@ -1,6 +1,6 @@
 #pragma once 
 
-#include "Types.h"
+#include <emgui/types.h>
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 

ogl_editor/src/windows/RocketWindow.c

@@ -5,8 +5,8 @@
 #include "resource.h"
 #include "afxres.h"
 #include <string.h>
-#include <Emgui.h>
+#include <emgui/emgui.h>
-#include <GFXBackend.h> 
+#include <emgui/gfxbackend.h> 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -157,6 +157,7 @@ bool createWindow(const wchar_t* title, int width, int height)
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+/*
 static void buildSubMenu(HMENU menu, MenuDescriptor menuDesc[])
 {
 	MenuDescriptor* desc = &menuDesc[0];
@@ -180,13 +181,16 @@ static void buildSubMenu(HMENU menu, MenuDescriptor menuDesc[])
 
 	}
 }
+*/
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+/*
 void Window_buildMenu()
 {
 	HMENU menu = GetMenu(s_window);
 }
+*/
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 

ogl_editor/tundra.lua

@@ -27,8 +27,6 @@ local win32 = {
 Build {
 	Units = "units.lua",
 
-	SyntaxExtensions = { "tundra.syntax.glob", "tundra.syntax.osx-bundle" },
-
 	Configs = {
 		Config { Name = "macosx-clang", DefaultOnHost = "macosx", Inherit = macosx, Tools = { "clang-osx" } },
 		Config { Name = "win32-msvc", DefaultOnHost = { "windows" }, Inherit = win32, Tools = { "msvc" } },

ogl_editor/units.lua

@@ -1,8 +1,11 @@
+require "tundra.syntax.glob"
+require "tundra.syntax.osx-bundle"
+
 StaticLibrary {
 	Name = "mxml",
 
 	Env = {
-		CPPPATH = { ".", "ogl_rocket/external/mxml" },
+		CPPPATH = { ".", "external/mxml" },
 		PROGOPTS = {
 			{ "/SUBSYSTEM:WINDOWS", "/DEBUG"; Config = { "win32-*-*", "win64-*-*" } },
 		},
@@ -18,7 +21,7 @@ StaticLibrary {
 
 	Sources = { 
 		Glob {
-			Dir = "ogl_editor/external/mxml",
+			Dir = "external/mxml",
 			Extensions = { ".c" },
 		},
 	},
@@ -45,7 +48,7 @@ StaticLibrary {
 
 	Sources = { 
 		FGlob {
-			Dir = "../emgui/src",
+			Dir = "emgui/src",
 			Extensions = { ".c" },
 			Filters = {
 				{ Pattern = "macosx"; Config = "macosx-*-*" },
@@ -61,7 +64,7 @@ StaticLibrary {
 
 	Sources = { 
 		Glob {
-			Dir = "sync",
+			Dir = "../sync",
 			Extensions = { ".c" },
 		},
 	},
@@ -72,10 +75,9 @@ Program {
 	Name = "editor",
 
 	Env = {
-		CPPPATH = { ".", "ogl_editor/src", 
+		CPPPATH = { ".", "src", 
-						 "../emgui/src", 
+						 "emgui/include", 
-						 "../../../../../emgui/src",
+					     "External/mxml" },
-					     "ogl_editor/External/mxml" },
 		PROGOPTS = {
 			{ "/SUBSYSTEM:WINDOWS", "/DEBUG"; Config = { "win32-*-*", "win64-*-*" } },
 		},
@@ -92,8 +94,7 @@ Program {
 
 	Sources = { 
 		FGlob {
-			Dir = "ogl_editor/src",
+			Dir = "src",
-			--Extensions = { ".c", { ".m"; Config = "macosx-*-*" } },
 			Extensions = { ".c", ".m" },
 			Filters = {
 				{ Pattern = "macosx"; Config = "macosx-*-*" },
@@ -101,7 +102,7 @@ Program {
 			},
 		},
 
-		{ "ogl_editor/data/windows/editor.rc" ; Config = { "win32-*-*", "win64-*-*" } },
+		{ "data/windows/editor.rc" ; Config = { "win32-*-*", "win64-*-*" } },
 	},
 
 	Depends = { "sync", "mxml", "emgui" },
@@ -116,11 +117,11 @@ local rocketBundle = OsxBundle
 {
 	Depends = { "editor" },
 	Target = "$(OBJECTDIR)/RocketEditor.app",
-	InfoPList = "ogl_editor/data/macosx/Info.plist",
+	InfoPList = "data/macosx/Info.plist",
 	Executable = "$(OBJECTDIR)/editor",
 	Resources = {
-		CompileNib { Source = "ogl_editor/data/macosx/appnib.xib", Target = "appnib.nib" },
+		CompileNib { Source = "data/macosx/appnib.xib", Target = "appnib.nib" },
-		"ogl_editor/data/macosx/icon.icns",
+		"data/macosx/icon.icns",
 	},
 }