notaz.gp2x.de
/
pcsx_rearmed.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
f249ee4
)
Merge pull request #152 from kwyxz/master
author
Twinaphex
<libretro@gmail.com>
Sun, 28 Jan 2018 05:30:13 +0000
(06:30 +0100)
committer
GitHub
<noreply@github.com>
Sun, 28 Jan 2018 05:30:13 +0000
(06:30 +0100)
Fixed uname for Solaris + enabled Haiku build
Makefile.libretro
patch
|
blob
|
blame
|
history
diff --git
a/Makefile.libretro
b/Makefile.libretro
index
a82a13a
..
c9e27d8
100644
(file)
--- a/
Makefile.libretro
+++ b/
Makefile.libretro
@@
-28,7
+28,11
@@
ifneq ($(GIT_VERSION)," unknown")
endif
LIBZ := -lz
LIBPTHREAD := -lpthread
+ifneq ($(findstring Haiku,$(shell uname -s)),)
+LIBDL := -lroot -lnetwork
+else
LIBDL := -ldl
+endif
MMAP_WIN32=0
EXTRA_LDFLAGS =
@@
-36,7
+40,7
@@
EXTRA_LDFLAGS =
ifeq ($(platform), unix)
TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC
-ifneq ($(findstring SunOS,$(shell uname -
a
)),)
+ifneq ($(findstring SunOS,$(shell uname -
s
)),)
CC = gcc
endif