From 539f10725068eaaaee0bc21c3a2c15787d686037 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Fri, 10 Nov 2017 16:21:57 -0500 Subject: [PATCH] various build errors on Linux and Mac --- 4ed_os_comp_cracking.h | 2 ++ platform_mac/mac_error_box.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/4ed_os_comp_cracking.h b/4ed_os_comp_cracking.h index e7c43797..9be66712 100644 --- a/4ed_os_comp_cracking.h +++ b/4ed_os_comp_cracking.h @@ -44,8 +44,10 @@ # if defined(__gnu_linux__) /* OS */ # define IS_LINUX +# define CALL_CONVENTION # elif defined(__APPLE__) && defined(__MACH__) /* OS */ # define IS_MAC +# define CALL_CONVENTION #else # error This compiler/platform combo is not supported yet # endif diff --git a/platform_mac/mac_error_box.cpp b/platform_mac/mac_error_box.cpp index a1e53910..26b8b2ed 100644 --- a/platform_mac/mac_error_box.cpp +++ b/platform_mac/mac_error_box.cpp @@ -11,7 +11,7 @@ internal void system_error_box(char *msg, b32 shutdown = true){ - osx2_error_dialogue(msg); + osx_error_dialogue(msg); if (shutdown){ exit(1); }