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

Merge pull request #113 from alkama/master

Browse Source 
Fixes for Linux build
This commit is contained in:
Daniel Collin 2016-02-07 23:23:21 +01:00
commit 5e4c1a185c
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ogl_editor/CMakeLists.txt
View File

@ -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

7
ogl_editor/src/Editor.c
View File

@ -18,7 +18,10 @@
#include "../../lib/base.h"
#include <emgui/Emgui.h>
#if defined(_WIN32)
#include <winsock2.h>
#include <winsock2.h>
#else
#include <netinet/in.h>
#include <arpa/inet.h>
#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())
{

2
ogl_editor/src/MinecraftiaFont.c
View File

@ -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,

2
ogl_editor/src/MinecraftiaFont.h
View File

@ -3,5 +3,5 @@
#include <emgui/Emgui.h>
extern EmguiFontLayout g_minecraftiaFontLayout[];
extern char g_minecraftiaFont[];
extern unsigned char g_minecraftiaFont[];
extern int g_minecraftiaFontSize;

1
ogl_editor/src/linux/main.c
View File

@ -1,6 +1,7 @@
#include "SDL.h"
#include <stdio.h>
#include <emgui/Emgui.h>
#include <emgui/GFXBackend.h>
#include "Editor.h"
#include "Menu.h"