diff options
author | Twinaphex | 2018-01-28 06:30:13 +0100 |
---|---|---|
committer | GitHub | 2018-01-28 06:30:13 +0100 |
commit | ea4f4384c24996e839106d515f000269b5cfc792 (patch) | |
tree | bdc9a7ccbf5f2ecfa5f4f4d7a586683b786208a1 | |
parent | f249ee4ae8972f52b88aa90939c935db47745b41 (diff) | |
parent | 2085a86501e4c4aadd36deb935d41ff5eeec706f (diff) | |
download | pcsx_rearmed-ea4f4384c24996e839106d515f000269b5cfc792.tar.gz pcsx_rearmed-ea4f4384c24996e839106d515f000269b5cfc792.tar.bz2 pcsx_rearmed-ea4f4384c24996e839106d515f000269b5cfc792.zip |
Merge pull request #152 from kwyxz/master
Fixed uname for Solaris + enabled Haiku build
-rw-r--r-- | Makefile.libretro | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.libretro b/Makefile.libretro index a82a13a..c9e27d8 100644 --- 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 |