mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-15 23:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups and build fixes.

Browse Source
This commit is contained in:
Themaister 2012-12-22 23:52:05 +01:00
parent 49324a1374
commit 359d5fa997
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -36,9 +36,11 @@ JOYCONFIG_OBJ = tools/retroarch-joyconfig.o \
input/input_common.o
HEADERS = $(wildcard */*.h) $(wildcard *.h)
ifneq ($(findstring Haiku,$(OS)),)
ifeq ($(findstring Haiku,$(OS)),)
LIBS = -lm
endif
DEFINES = -DHAVE_CONFIG_H -DHAVE_SCREENSHOTS
ifeq ($(REENTRANT_TEST), 1)
@ -53,14 +55,8 @@ else
OSX := 0
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
endif
ifneq ($(findstring Linux,$(OS)),)
@ -72,9 +68,9 @@ endif
OBJ += autosave.o thread.o
ifeq ($(HAVE_THREADS), 1)
ifneq ($(findstring Haiku,$(OS)),)
LIBS += -lpthread
endif
ifeq ($(findstring Haiku,$(OS)),)
LIBS += -lpthread
endif
endif
ifeq ($(HAVE_CONFIGFILE), 1)

11
qb/config.libs.sh
View File

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