From 484962ff2c4651ce7b51360501f48722f95f0fb9 Mon Sep 17 00:00:00 2001 From: MysterD Date: Sat, 12 Mar 2022 22:38:13 -0800 Subject: [PATCH] Fix Mac compile --- Makefile | 3 ++- src/pc/logfile.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fd3901b8..319c5c21 100644 --- a/Makefile +++ b/Makefile @@ -609,7 +609,7 @@ SDL1_USED := 0 SDL2_USED := 0 # suppress warnings -BACKEND_CFLAGS += -Wno-format-truncation -Wno-format-security -Wno-trigraphs +BACKEND_CFLAGS += -Wno-format-security -Wno-trigraphs BACKEND_CFLAGS += $(EXTRA_CFLAGS) # for now, it's either SDL+GL or DXGI+DirectX, so choose based on WAPI @@ -627,6 +627,7 @@ else ifeq ($(findstring SDL,$(WINDOW_API)),SDL) BACKEND_LDFLAGS += -lGLESv2 else ifeq ($(OSX_BUILD),1) BACKEND_LDFLAGS += -framework OpenGL `pkg-config --libs glew` + EXTRA_CPP_FLAGS += -stdlib=libc++ -std=c++0x else BACKEND_LDFLAGS += -lGL endif diff --git a/src/pc/logfile.h b/src/pc/logfile.h index de08e88a..06b6875c 100644 --- a/src/pc/logfile.h +++ b/src/pc/logfile.h @@ -11,6 +11,7 @@ struct LogFile { bool firstOpen; FILE* file; }; +#pragma pack() enum LogFileType { LFT_HANG,