mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-17 02:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #100 from sparklewind/patch-1

Browse Source 
Fix for compiling on Haiku
This commit is contained in:
Hans-Kristian Arntzen 2012-12-22 14:46:00 -08:00
commit 49324a1374
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@ -36,8 +36,9 @@ JOYCONFIG_OBJ = tools/retroarch-joyconfig.o \
input/input_common.o input/input_common.o
HEADERS = $(wildcard */*.h) $(wildcard *.h) HEADERS = $(wildcard */*.h) $(wildcard *.h)
ifneq ($(findstring Haiku,$(OS)),)
LIBS = -lm LIBS = -lm
endif
DEFINES = -DHAVE_CONFIG_H -DHAVE_SCREENSHOTS DEFINES = -DHAVE_CONFIG_H -DHAVE_SCREENSHOTS
ifeq ($(REENTRANT_TEST), 1) ifeq ($(REENTRANT_TEST), 1)
@ -53,7 +54,10 @@ else
endif endif
BSD_LOCAL_INC = BSD_LOCAL_INC =
DYLIB_LIB = -ldl ifneq ($(findstring Haiku,$(OS)),)
DYLIB_LIB = -ldl
endif
ifneq ($(findstring BSD,$(OS)),) ifneq ($(findstring BSD,$(OS)),)
BSD_LOCAL_INC = -I/usr/local/include BSD_LOCAL_INC = -I/usr/local/include
DYLIB_LIB = -lc DYLIB_LIB = -lc
@ -65,10 +69,13 @@ ifneq ($(findstring Linux,$(OS)),)
JOYCONFIG_OBJ += input/linuxraw_joypad.o JOYCONFIG_OBJ += input/linuxraw_joypad.o
endif endif
OBJ += autosave.o thread.o
ifeq ($(HAVE_THREADS), 1) ifeq ($(HAVE_THREADS), 1)
OBJ += autosave.o thread.o ifneq ($(findstring Haiku,$(OS)),)
LIBS += -lpthread LIBS += -lpthread
endif endif
endif
ifeq ($(HAVE_CONFIGFILE), 1) ifeq ($(HAVE_CONFIGFILE), 1)
OBJ += conf/config_file.o OBJ += conf/config_file.o
@ -360,7 +367,7 @@ install: $(TARGET)
install -m644 docs/retroarch.1 $(DESTDIR)$(MAN_DIR) install -m644 docs/retroarch.1 $(DESTDIR)$(MAN_DIR)
install -m644 docs/retroarch-joyconfig.1 $(DESTDIR)$(MAN_DIR) install -m644 docs/retroarch-joyconfig.1 $(DESTDIR)$(MAN_DIR)
install -m755 retroarch-zip $(DESTDIR)$(PREFIX)/bin 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: uninstall:
rm -f $(DESTDIR)$(PREFIX)/bin/retroarch rm -f $(DESTDIR)$(PREFIX)/bin/retroarch
@ -369,7 +376,7 @@ uninstall:
rm -f $(DESTDIR)/etc/retroarch.cfg rm -f $(DESTDIR)/etc/retroarch.cfg
rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch.1 rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch.1
rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch-joyconfig.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: clean:
rm -f *.o rm -f *.o

2
qb/config.libs.sh
View File

@ -8,7 +8,7 @@ add_define_make NOUNUSED "$HAVE_NOUNUSED"
[ -z "$CROSS_COMPILE" ] && [ -d /opt/local/lib ] && add_library_dirs /opt/local/lib [ -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" = '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. [ "$OS" = 'Darwin' ] && HAVE_X11=no # X11 breaks on recent OSXes even if present.
[ -d /opt/vc/lib ] && add_library_dirs /opt/vc/lib [ -d /opt/vc/lib ] && add_library_dirs /opt/vc/lib

1
qb/qb.comp.sh
View File

@ -12,6 +12,7 @@ case "$(uname)" in
'Darwin') OS='Darwin';; 'Darwin') OS='Darwin';;
'MINGW32'*) OS='MinGW';; 'MINGW32'*) OS='MinGW';;
'CYGWIN'*) OS='Cygwin';; 'CYGWIN'*) OS='Cygwin';;
'Haiku') OS='Haiku';;
*) OS="Win32";; *) OS="Win32";;
esac esac
echo "$ECHOBUF ... $OS" echo "$ECHOBUF ... $OS"