Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Mac compile

This commit is contained in:
MysterD 2022-03-12 22:38:13 -08:00
parent 52ea3a8ff7
commit 484962ff2c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -609,7 +609,7 @@ SDL1_USED := 0
SDL2_USED := 0 SDL2_USED := 0
# suppress warnings # suppress warnings
BACKEND_CFLAGS += -Wno-format-truncation -Wno-format-security -Wno-trigraphs BACKEND_CFLAGS += -Wno-format-security -Wno-trigraphs
BACKEND_CFLAGS += $(EXTRA_CFLAGS) BACKEND_CFLAGS += $(EXTRA_CFLAGS)
# for now, it's either SDL+GL or DXGI+DirectX, so choose based on WAPI # 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 BACKEND_LDFLAGS += -lGLESv2
else ifeq ($(OSX_BUILD),1) else ifeq ($(OSX_BUILD),1)
BACKEND_LDFLAGS += -framework OpenGL `pkg-config --libs glew` BACKEND_LDFLAGS += -framework OpenGL `pkg-config --libs glew`
EXTRA_CPP_FLAGS += -stdlib=libc++ -std=c++0x
else else
BACKEND_LDFLAGS += -lGL BACKEND_LDFLAGS += -lGL
endif endif

1
src/pc/logfile.h
View File

@ -11,6 +11,7 @@ struct LogFile {
bool firstOpen; bool firstOpen;
FILE* file; FILE* file;
}; };
#pragma pack()
enum LogFileType { enum LogFileType {
LFT_HANG, LFT_HANG,