diff --git a/ogl_editor/CMakeLists.txt b/ogl_editor/CMakeLists.txt index f9619e8..94cf9d5 100755 --- a/ogl_editor/CMakeLists.txt +++ b/ogl_editor/CMakeLists.txt @@ -23,12 +23,6 @@ elseif (MSVC) endif () ############################################################################## -# SDL (linux only) -if (UNIX AND NOT APPLE) - -endif () - -############################################################################## # MXML file(GLOB RKT_MXML_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/external/mxml/*.c diff --git a/ogl_editor/src/Editor.c b/ogl_editor/src/Editor.c index 9bfe48e..2db9dcd 100644 --- a/ogl_editor/src/Editor.c +++ b/ogl_editor/src/Editor.c @@ -18,7 +18,10 @@ #include "../../lib/base.h" #include #if defined(_WIN32) -#include + #include +#else + #include + #include #endif enum { @@ -290,7 +293,7 @@ void Editor_create() { int id; Emgui_create(); - id = Emgui_loadFontBitmap(g_minecraftiaFont, g_minecraftiaFontSize, EMGUI_LOCATION_MEMORY, 32, 128, g_minecraftiaFontLayout); + id = Emgui_loadFontBitmap((char*)g_minecraftiaFont, g_minecraftiaFontSize, EMGUI_LOCATION_MEMORY, 32, 128, g_minecraftiaFontLayout); if (!RemoteConnection_createListner()) { diff --git a/ogl_editor/src/MinecraftiaFont.c b/ogl_editor/src/MinecraftiaFont.c index 953576e..074c77d 100644 --- a/ogl_editor/src/MinecraftiaFont.c +++ b/ogl_editor/src/MinecraftiaFont.c @@ -5,7 +5,7 @@ int g_minecraftiaFontSize = 713; /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -char g_minecraftiaFont[] = +unsigned char g_minecraftiaFont[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, diff --git a/ogl_editor/src/MinecraftiaFont.h b/ogl_editor/src/MinecraftiaFont.h index 7ae19bf..9dbcd4b 100644 --- a/ogl_editor/src/MinecraftiaFont.h +++ b/ogl_editor/src/MinecraftiaFont.h @@ -3,5 +3,5 @@ #include extern EmguiFontLayout g_minecraftiaFontLayout[]; -extern char g_minecraftiaFont[]; +extern unsigned char g_minecraftiaFont[]; extern int g_minecraftiaFontSize; diff --git a/ogl_editor/src/linux/main.c b/ogl_editor/src/linux/main.c index 6a9946c..45275b4 100644 --- a/ogl_editor/src/linux/main.c +++ b/ogl_editor/src/linux/main.c @@ -1,6 +1,7 @@ #include "SDL.h" #include #include +#include #include "Editor.h" #include "Menu.h"