From 12faf0b8c20f7cc1e80d404ee2423eb242872f55 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Sun, 19 Nov 2017 20:38:07 -0500 Subject: [PATCH] Got mac building again --- 4ed_file_view.cpp | 6 +++--- platform_mac/mac_4ed.m | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/4ed_file_view.cpp b/4ed_file_view.cpp index 54366893..37e1d347 100644 --- a/4ed_file_view.cpp +++ b/4ed_file_view.cpp @@ -4562,7 +4562,7 @@ step_file_view(System_Functions *system, View *view, Models *models, View *activ append(&m, "\" size:"); append_int_to_str(&m, settings->pt_size); append(&m, " hint:"); - append(&m, (settings->use_hinting)?"ON ":"OFF"); + append(&m, (char*)(settings->use_hinting?"ON ":"OFF")); if (i == font_id){ append(&m, " *"); @@ -4686,9 +4686,9 @@ step_file_view(System_Functions *system, View *view, Models *models, View *activ } copy(&m, "Turn Hinting "); - append(&m, settings->use_hinting?"Off":"On"); + append(&m, (char*)(settings->use_hinting?"Off":"On")); append(&m, " (it is currently "); - append(&m, settings->use_hinting?"On":"Off"); + append(&m, (char*)(settings->use_hinting?"On":"Off")); append(&m, ")"); ++id.id[0]; if (gui_do_button(target, id, m)){ diff --git a/platform_mac/mac_4ed.m b/platform_mac/mac_4ed.m index 87dacad3..026e4cfd 100644 --- a/platform_mac/mac_4ed.m +++ b/platform_mac/mac_4ed.m @@ -13,7 +13,7 @@ #include "4ed_defines.h" #undef inline #include "4coder_API/version.h" -#include "4coder_API/keycodes.h" +#include "4coder_generated/keycodes.h" #define IS_OBJC_LAYER #include "4ed_log.h"