From 14e259ac3904da798acaefb191f9c5e22a74c857 Mon Sep 17 00:00:00 2001 From: sparklewind Date: Fri, 21 Dec 2012 21:50:07 +0000 Subject: [PATCH 01/14] Fix for compiling on Haiku --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 125718afd5..0e6bffafcf 100644 --- a/Makefile +++ b/Makefile @@ -65,9 +65,10 @@ ifneq ($(findstring Linux,$(OS)),) JOYCONFIG_OBJ += input/linuxraw_joypad.o endif +OBJ += autosave.o thread.o + ifeq ($(HAVE_THREADS), 1) - OBJ += autosave.o thread.o - LIBS += -lpthread + LIBS += endif ifeq ($(HAVE_CONFIGFILE), 1) From db9a9056e2cc6abc18dc4a2e679f32173d661254 Mon Sep 17 00:00:00 2001 From: sparklewind Date: Sat, 22 Dec 2012 03:26:27 +0100 Subject: [PATCH 02/14] Update Makefile --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0e6bffafcf..62b33d2e1e 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ JOYCONFIG_OBJ = tools/retroarch-joyconfig.o \ HEADERS = $(wildcard */*.h) $(wildcard *.h) -LIBS = -lm +LIBS = DEFINES = -DHAVE_CONFIG_H -DHAVE_SCREENSHOTS ifeq ($(REENTRANT_TEST), 1) @@ -362,7 +362,7 @@ install: $(TARGET) install -m644 docs/retroarch.1 $(DESTDIR)$(MAN_DIR) install -m644 docs/retroarch-joyconfig.1 $(DESTDIR)$(MAN_DIR) install -m755 retroarch-zip $(DESTDIR)$(PREFIX)/bin - install -m644 media/retroarch.png $(DESTDIR)/usr/share/icons + install -m644 media/retroarch.png $(DESTDIR)$(PREFIX)/share/icons uninstall: rm -f $(DESTDIR)$(PREFIX)/bin/retroarch @@ -371,7 +371,7 @@ uninstall: rm -f $(DESTDIR)/etc/retroarch.cfg rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch.1 rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch-joyconfig.1 - rm -f $(DESTDIR)/usr/share/icons/retroarch.png + rm -f $(DESTDIR)$(PREFIX)/share/icons/retroarch.png clean: rm -f *.o From 8bcd7f197221d14f27cadb47741a366c95407785 Mon Sep 17 00:00:00 2001 From: sparklewind Date: Sat, 22 Dec 2012 03:27:50 +0100 Subject: [PATCH 03/14] Update qb/config.libs.sh --- qb/config.libs.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/qb/config.libs.sh b/qb/config.libs.sh index 3d147c0c47..be7ca6b903 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -9,6 +9,7 @@ add_define_make NOUNUSED "$HAVE_NOUNUSED" [ -z "$CROSS_COMPILE" ] && [ -d /opt/local/lib ] && add_library_dirs /opt/local/lib if [ "$OS" = 'BSD' ]; then DYLIB=-lc; else DYLIB=-ldl; fi +if [ "$OS" = 'Haiku' ]: then DYLIB=""; else DYLIB=""; fi [ "$OS" = 'Darwin' ] && HAVE_X11=no # X11 breaks on recent OSXes even if present. [ -d /opt/vc/lib ] && add_library_dirs /opt/vc/lib From d032764e6ba6088a0b620f7a5f2497e9adcaeee8 Mon Sep 17 00:00:00 2001 From: sparklewind Date: Sat, 22 Dec 2012 17:16:35 +0100 Subject: [PATCH 04/14] Update qb/config.libs.sh --- qb/config.libs.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qb/config.libs.sh b/qb/config.libs.sh index be7ca6b903..a735f18429 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -8,8 +8,7 @@ add_define_make NOUNUSED "$HAVE_NOUNUSED" [ -z "$CROSS_COMPILE" ] && [ -d /opt/local/lib ] && add_library_dirs /opt/local/lib -if [ "$OS" = 'BSD' ]; then DYLIB=-lc; else DYLIB=-ldl; fi -if [ "$OS" = 'Haiku' ]: then DYLIB=""; else DYLIB=""; fi +if [ "$OS" = 'BSD' ]; then DYLIB=-lc; elif [ "$OS" = 'Haiku' ]: then DYLIB=""; else DYLIB=-ldl; fi [ "$OS" = 'Darwin' ] && HAVE_X11=no # X11 breaks on recent OSXes even if present. [ -d /opt/vc/lib ] && add_library_dirs /opt/vc/lib From 5deb37f60aa3d64e9c08fb61f83c4a01e123d03b Mon Sep 17 00:00:00 2001 From: sparklewind Date: Sat, 22 Dec 2012 17:23:02 +0100 Subject: [PATCH 05/14] Update Makefile --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 62b33d2e1e..39216b288e 100644 --- a/Makefile +++ b/Makefile @@ -36,8 +36,9 @@ JOYCONFIG_OBJ = tools/retroarch-joyconfig.o \ input/input_common.o HEADERS = $(wildcard */*.h) $(wildcard *.h) - -LIBS = +ifneq ($(findstring HAIKU,$(OS)),) + LIBS = -lm +endif DEFINES = -DHAVE_CONFIG_H -DHAVE_SCREENSHOTS ifeq ($(REENTRANT_TEST), 1) From 6e427b3e9d9b8ee4f374a9193082616ad046d074 Mon Sep 17 00:00:00 2001 From: sparklewind Date: Sat, 22 Dec 2012 19:51:31 +0100 Subject: [PATCH 06/14] Update qb/config.libs.sh --- qb/config.libs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qb/config.libs.sh b/qb/config.libs.sh index a735f18429..965243584e 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -8,7 +8,7 @@ add_define_make NOUNUSED "$HAVE_NOUNUSED" [ -z "$CROSS_COMPILE" ] && [ -d /opt/local/lib ] && add_library_dirs /opt/local/lib -if [ "$OS" = 'BSD' ]; then DYLIB=-lc; elif [ "$OS" = 'Haiku' ]: then DYLIB=""; else DYLIB=-ldl; fi +if [ "$OS" = 'BSD' ]; then DYLIB=-lc; elif [ "$OS" = 'Haiku' ]; then DYLIB=""; else DYLIB=-ldl; fi [ "$OS" = 'Darwin' ] && HAVE_X11=no # X11 breaks on recent OSXes even if present. [ -d /opt/vc/lib ] && add_library_dirs /opt/vc/lib From ee242b31c721ed3e2cad609819a6376830d4be27 Mon Sep 17 00:00:00 2001 From: sparklewind Date: Sat, 22 Dec 2012 20:06:20 +0100 Subject: [PATCH 07/14] Update qb/config.libs.sh --- qb/config.libs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qb/config.libs.sh b/qb/config.libs.sh index 965243584e..defc0d2cf5 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -8,7 +8,7 @@ add_define_make NOUNUSED "$HAVE_NOUNUSED" [ -z "$CROSS_COMPILE" ] && [ -d /opt/local/lib ] && add_library_dirs /opt/local/lib -if [ "$OS" = 'BSD' ]; then DYLIB=-lc; elif [ "$OS" = 'Haiku' ]; then DYLIB=""; else DYLIB=-ldl; fi +if [ "$OS" = 'BSD' ]; then DYLIB=-lc; elif [ "$OS" = 'Haiku' ]; then DYLIB=""; else DYLIB=-ldl; fi [ "$OS" = 'Darwin' ] && HAVE_X11=no # X11 breaks on recent OSXes even if present. [ -d /opt/vc/lib ] && add_library_dirs /opt/vc/lib From 31a5ebeea66cbd821fe971c6049fe08c580dc169 Mon Sep 17 00:00:00 2001 From: sparklewind Date: Sat, 22 Dec 2012 20:20:59 +0100 Subject: [PATCH 08/14] Update Makefile --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 39216b288e..f87675c5ad 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,10 @@ else endif BSD_LOCAL_INC = +ifneq +($findstring HAIKU,$(OS)),) DYLIB_LIB = -ldl +endif ifneq ($(findstring BSD,$(OS)),) BSD_LOCAL_INC = -I/usr/local/include DYLIB_LIB = -lc From b7445eb81bd08f3864659986c296d8c9b1c4871b Mon Sep 17 00:00:00 2001 From: sparklewind Date: Sat, 22 Dec 2012 20:24:51 +0100 Subject: [PATCH 09/14] Update Makefile --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f87675c5ad..243207a66b 100644 --- a/Makefile +++ b/Makefile @@ -54,8 +54,7 @@ else endif BSD_LOCAL_INC = -ifneq -($findstring HAIKU,$(OS)),) +ifneq ($findstring HAIKU,$(OS)),) DYLIB_LIB = -ldl endif ifneq ($(findstring BSD,$(OS)),) From 123c75b01fbb436a8be17e62e057cbb62e973c78 Mon Sep 17 00:00:00 2001 From: sparklewind Date: Sat, 22 Dec 2012 20:31:37 +0100 Subject: [PATCH 10/14] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 243207a66b..b0beca5b43 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,7 @@ else endif BSD_LOCAL_INC = -ifneq ($findstring HAIKU,$(OS)),) +ifneq ($(findstring Haiku,$(OS)),) DYLIB_LIB = -ldl endif ifneq ($(findstring BSD,$(OS)),) From d40190b7ad67696b3941a35322487b386c6a290b Mon Sep 17 00:00:00 2001 From: sparklewind Date: Sat, 22 Dec 2012 20:33:01 +0100 Subject: [PATCH 11/14] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b0beca5b43..d2260d3d34 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ JOYCONFIG_OBJ = tools/retroarch-joyconfig.o \ input/input_common.o HEADERS = $(wildcard */*.h) $(wildcard *.h) -ifneq ($(findstring HAIKU,$(OS)),) +ifneq ($(findstring Haiku,$(OS)),) LIBS = -lm endif DEFINES = -DHAVE_CONFIG_H -DHAVE_SCREENSHOTS From 12308e321a7f86422b350207901ccba20389fbf7 Mon Sep 17 00:00:00 2001 From: sparklewind Date: Sat, 22 Dec 2012 20:41:59 +0100 Subject: [PATCH 12/14] Update Makefile --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d2260d3d34..5f2c5d4cf0 100644 --- a/Makefile +++ b/Makefile @@ -55,8 +55,9 @@ endif BSD_LOCAL_INC = ifneq ($(findstring Haiku,$(OS)),) -DYLIB_LIB = -ldl + DYLIB_LIB = -ldl endif + ifneq ($(findstring BSD,$(OS)),) BSD_LOCAL_INC = -I/usr/local/include DYLIB_LIB = -lc From 1f8bef7eeba6e2e2d64251e41d0cf73b6f4d40f8 Mon Sep 17 00:00:00 2001 From: sparklewind Date: Sat, 22 Dec 2012 20:49:49 +0100 Subject: [PATCH 13/14] Update qb/qb.comp.sh --- qb/qb.comp.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/qb/qb.comp.sh b/qb/qb.comp.sh index f3f80a2b73..3c7a11a124 100644 --- a/qb/qb.comp.sh +++ b/qb/qb.comp.sh @@ -12,6 +12,7 @@ case "$(uname)" in 'Darwin') OS='Darwin';; 'MINGW32'*) OS='MinGW';; 'CYGWIN'*) OS='Cygwin';; + 'Haiku') OS='Haiku';; *) OS="Win32";; esac echo "$ECHOBUF ... $OS" From a5ceef033bc37cae07ff2ca9a58768c0fa62d69c Mon Sep 17 00:00:00 2001 From: sparklewind Date: Sat, 22 Dec 2012 21:29:39 +0100 Subject: [PATCH 14/14] Update Makefile --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5f2c5d4cf0..91131aa5a6 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,9 @@ endif OBJ += autosave.o thread.o ifeq ($(HAVE_THREADS), 1) - LIBS += +ifneq ($(findstring Haiku,$(OS)),) + LIBS += -lpthread +endif endif ifeq ($(HAVE_CONFIGFILE), 1)