diff options
| author | Autechre <libretro@gmail.com> | 2021-05-14 17:45:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-14 17:45:10 +0200 |
| commit | 50b6210dd08d1015276f668b347d6b75df60902c (patch) | |
| tree | 31f6c5ffffa567ceba4d68016aa5b276aed29a54 | |
| parent | c380ef9af74398589e74def142a042b6e035f621 (diff) | |
| parent | f5a4bd8c61bcc5bfea494c28db9fec53ab1f7c45 (diff) | |
Merge pull request #30 from kwyxz/libretro
Fix 32bit Haiku build
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | Makefile.libretro | 12 |
2 files changed, 17 insertions, 0 deletions
@@ -177,6 +177,11 @@ CPU:=i686 endif endif +#Haiku uses a different name for 32bit +ifeq ($(CPU),BePC) +CPU:=i686 +endif + TRANSOBJS=gen.o backend.o $(MEM) arena.o tern.o M68KOBJS=68kinst.o diff --git a/Makefile.libretro b/Makefile.libretro index b48532d..3650a9b 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -29,6 +29,18 @@ else ifneq ($(findstring Darwin,$(UNAME)),) ABI := x86_64 target = libblastem.dylib libname = blastem_libretro.dylib +else ifneq ($(findstring Haiku,$(UNAME)),) + platform = haiku + OS :=Haiku +ifeq ($(UNAMEM),x86_64) + ABI :=x86_64 + CC ?=gcc +else + ABI :=i686 + CC :=gcc-x86 +endif + target = libblastem.so + libname = blastem_libretro.so else platform = linux OS :=Linux |