mirror of https://github.com/sm64pc/sm64pc.git
parent
59adb5c634
commit
fa49c7bc59
|
@ -78,3 +78,6 @@ sm64config.txt
|
||||||
!/sound/**/*custom*/**/*.aiff
|
!/sound/**/*custom*/**/*.aiff
|
||||||
!/assets/**/*custom*.bin
|
!/assets/**/*custom*.bin
|
||||||
!/assets/**/*custom*/**/*.bin
|
!/assets/**/*custom*/**/*.bin
|
||||||
|
|
||||||
|
# macOS bullcrap directory settings file thats autocreated
|
||||||
|
.DS_Store
|
||||||
|
|
7
Makefile
7
Makefile
|
@ -532,7 +532,12 @@ else ifeq ($(SDL1_USED),1)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(SDL1_USED)$(SDL2_USED),00)
|
ifneq ($(SDL1_USED)$(SDL2_USED),00)
|
||||||
BACKEND_CFLAGS += `$(SDLCONFIG) --cflags`
|
ifeq ($(OSX_BUILD),1)
|
||||||
|
MAC_PREFIX := `$(SDLCONFIG) --prefix`
|
||||||
|
BACKEND_CFLAGS +=-I$(MAC_PREFIX)/include `$(SDLCONFIG) --cflags` # macOS homebrew SDL2 has the config laid out differently so this makes it point to the correct folder + a failsafe for if it ever changes for some reason in the future.
|
||||||
|
else
|
||||||
|
BACKEND_CFLAGS += `$(SDLCONFIG) --cflags`
|
||||||
|
endif
|
||||||
ifeq ($(WINDOWS_BUILD),1)
|
ifeq ($(WINDOWS_BUILD),1)
|
||||||
BACKEND_LDFLAGS += `$(SDLCONFIG) --static-libs` -lsetupapi -luser32 -limm32 -lole32 -loleaut32 -lshell32 -lwinmm -lversion
|
BACKEND_LDFLAGS += `$(SDLCONFIG) --static-libs` -lsetupapi -luser32 -limm32 -lole32 -loleaut32 -lshell32 -lwinmm -lversion
|
||||||
else
|
else
|
||||||
|
|
|
@ -26,6 +26,11 @@ typedef unsigned int u32;
|
||||||
#define NORETURN __attribute__((noreturn))
|
#define NORETURN __attribute__((noreturn))
|
||||||
#define UNUSED __attribute__((unused))
|
#define UNUSED __attribute__((unused))
|
||||||
|
|
||||||
|
#ifdef __APPLE__
|
||||||
|
// even with -std=gnu99 vsnprintf seems to not be defined in stdio.h, why?
|
||||||
|
extern int vsnprintf(char * __restrict, size_t, const char * __restrict, va_list);
|
||||||
|
#endif
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
u32 start;
|
u32 start;
|
||||||
|
|
Loading…
Reference in New Issue