From: Paul Cercueil <paul@crapouillou.net>
Date: Sat, 8 Feb 2020 16:00:30 +0000 (-0300)
Subject: Fix Linux build
X-Git-Tag: r24l~681^2
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=1532f1b13b79ed49927e886e5d526bb27dc5927c;hp=-c;p=pcsx_rearmed.git

Fix Linux build

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---

1532f1b13b79ed49927e886e5d526bb27dc5927c
diff --git a/Makefile b/Makefile
index 7afced68..d7f734f9 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ libpcsxcore/psxbios.o: CFLAGS += -Wno-nonnull
 # dynarec
 ifeq "$(DYNAREC)" "lightrec"
 CFLAGS += -Ideps/lightning/include -Ideps/lightrec \
-		  -I deps/mman -DLIGHTREC -DLIGHTREC_STATIC
+		  -DLIGHTREC -DLIGHTREC_STATIC
 OBJS += libpcsxcore/lightrec/plugin.o
 OBJS += deps/lightning/lib/jit_disasm.o \
 		deps/lightning/lib/jit_memory.o \
@@ -99,6 +99,7 @@ OBJS += deps/lightning/lib/jit_disasm.o \
 		deps/lightrec/regcache.o \
 		deps/lightrec/recompiler.o
 ifeq ($(MMAP_WIN32),1)
+CFLAGS += -Ideps/mman
 OBJS += deps/mman/mman.o
 endif
 else ifeq "$(DYNAREC)" "ari64"
diff --git a/deps/lightning/lib/jit_memory.c b/deps/lightning/lib/jit_memory.c
index e6b4c73f..33b1c35f 100644
--- a/deps/lightning/lib/jit_memory.c
+++ b/deps/lightning/lib/jit_memory.c
@@ -19,7 +19,11 @@
 
 #include <lightning.h>
 #include <lightning/jit_private.h>
-#include <mman.h>
+#ifdef _WIN32
+#  include <mman.h>
+#else
+#  include <sys/mman.h>
+#endif
 
 /*
  * Prototypes
diff --git a/deps/lightning/lib/lightning.c b/deps/lightning/lib/lightning.c
index 3f2ab409..507abb6f 100644
--- a/deps/lightning/lib/lightning.c
+++ b/deps/lightning/lib/lightning.c
@@ -19,7 +19,11 @@
 
 #include <lightning.h>
 #include <lightning/jit_private.h>
-#include <mman.h>
+#ifdef _WIN32
+#  include <mman.h>
+#else
+#  include <sys/mman.h>
+#endif
 #if defined(__sgi)
 #  include <fcntl.h>
 #endif