vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #486 from mmuman/haiku-nightly 

Haiku port
This commit is contained in:
fgsfds 2021-11-14 18:13:50 +03:00 committed by GitHub
parent fc5cb66f07 24423cccc9
commit 697a0b06e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -640,6 +640,9 @@ else ifeq ($(TARGET_RPI),1)
else ifeq ($(OSX_BUILD),1) else ifeq ($(OSX_BUILD),1)
LDFLAGS := -lm $(BACKEND_LDFLAGS) -no-pie -lpthread LDFLAGS := -lm $(BACKEND_LDFLAGS) -no-pie -lpthread
else ifeq ($(HOST_OS),Haiku)
LDFLAGS := $(BACKEND_LDFLAGS) -no-pie
else else
LDFLAGS := $(BITS) -march=$(TARGET_ARCH) -lm $(BACKEND_LDFLAGS) -lpthread -ldl LDFLAGS := $(BITS) -march=$(TARGET_ARCH) -lm $(BACKEND_LDFLAGS) -lpthread -ldl
ifeq ($(NO_PIE), 1) ifeq ($(NO_PIE), 1)

2
include/PR/os_libc.h
View File

@ -5,7 +5,7 @@
// old bstring functions that aren't present on some platforms // old bstring functions that aren't present on some platforms
#if defined(__APPLE__) #if defined(__APPLE__) || defined(__HAIKU__)
// macOS libc has them // macOS libc has them
#include <strings.h> #include <strings.h>