ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Got mac building again

This commit is contained in:
Allen Webster 2017-11-19 20:38:07 -05:00
parent f15c59c621
commit 12faf0b8c2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
4ed_file_view.cpp
View File

@ -4562,7 +4562,7 @@ step_file_view(System_Functions *system, View *view, Models *models, View *activ
append(&m, "\" size:"); append(&m, "\" size:");
append_int_to_str(&m, settings->pt_size); append_int_to_str(&m, settings->pt_size);
append(&m, " hint:"); append(&m, " hint:");
append(&m, (settings->use_hinting)?"ON ":"OFF"); append(&m, (char*)(settings->use_hinting?"ON ":"OFF"));
if (i == font_id){ if (i == font_id){
append(&m, " *"); append(&m, " *");
@ -4686,9 +4686,9 @@ step_file_view(System_Functions *system, View *view, Models *models, View *activ
} }
copy(&m, "Turn Hinting "); 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, " (it is currently ");
append(&m, settings->use_hinting?"On":"Off"); append(&m, (char*)(settings->use_hinting?"On":"Off"));
append(&m, ")"); append(&m, ")");
++id.id[0]; ++id.id[0];
if (gui_do_button(target, id, m)){ if (gui_do_button(target, id, m)){

2
platform_mac/mac_4ed.m
View File

@ -13,7 +13,7 @@
#include "4ed_defines.h" #include "4ed_defines.h"
#undef inline #undef inline
#include "4coder_API/version.h" #include "4coder_API/version.h"
#include "4coder_API/keycodes.h" #include "4coder_generated/keycodes.h"
#define IS_OBJC_LAYER #define IS_OBJC_LAYER
#include "4ed_log.h" #include "4ed_log.h"