(Haiku) Fix Build

This commit is contained in:
Higor Eurípedes 2014-08-28 13:41:12 -03:00
parent bf13548459
commit fa11c2f2d6
2 changed files with 23 additions and 12 deletions

View File

@ -74,6 +74,11 @@ HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h)
ifeq ($(findstring Haiku,$(OS)),) ifeq ($(findstring Haiku,$(OS)),)
LIBS = -lm LIBS = -lm
DEBUG_FLAG = -g
else
LIBS = -lroot -lnetwork
# stable and nightly haiku builds are stuck on gdb 6.x but we use gcc4
DEBUG_FLAG = -gdwarf-2
endif endif
DEFINES = -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER -DHAVE_OVERLAY DEFINES = -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER -DHAVE_OVERLAY
@ -431,7 +436,7 @@ ifeq ($(GL_DEBUG), 1)
CXXFLAGS += -DGL_DEBUG CXXFLAGS += -DGL_DEBUG
endif endif
CFLAGS += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) -g -I. CFLAGS += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) $(DEBUG_FLAG) -I.
ifeq ($(CXX_BUILD), 1) ifeq ($(CXX_BUILD), 1)
LINK = $(CXX) LINK = $(CXX)
CFLAGS += -std=c++0x -xc++ -D__STDC_CONSTANT_MACROS CFLAGS += -std=c++0x -xc++ -D__STDC_CONSTANT_MACROS

View File

@ -10,12 +10,18 @@ add_define_make NOUNUSED_VARIABLE "$HAVE_NOUNUSED_VARIABLE"
[ -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
DYLIB=-ldl;
CLIB=-lc
PTHREADLIB=-lpthread
SOCKETLIB=-lc
if [ "$OS" = 'BSD' ]; then if [ "$OS" = 'BSD' ]; then
DYLIB=-lc; DYLIB=-lc;
elif [ "$OS" = 'Haiku' ]; then elif [ "$OS" = 'Haiku' ]; then
DYLIB=""; DYLIB=""
else CLIB=-lroot
DYLIB=-ldl; PTHREADLIB=-lroot
SOCKETLIB=-lnetwork
fi fi
add_define_make DYLIB_LIB "$DYLIB" add_define_make DYLIB_LIB "$DYLIB"
@ -107,13 +113,13 @@ else
add_define_make MAN_DIR "${PREFIX}/share/man/man1" add_define_make MAN_DIR "${PREFIX}/share/man/man1"
fi fi
check_lib THREADS -lpthread pthread_create check_lib THREADS "$PTHREADLIB" pthread_create
check_lib DYLIB "$DYLIB" dlopen check_lib DYLIB "$DYLIB" dlopen
check_lib NETPLAY -lc socket check_lib NETPLAY "$SOCKETLIB" socket
if [ "$HAVE_NETPLAY" = 'yes' ]; then if [ "$HAVE_NETPLAY" = 'yes' ]; then
HAVE_GETADDRINFO=auto HAVE_GETADDRINFO=auto
check_lib GETADDRINFO -lc getaddrinfo check_lib GETADDRINFO "$SOCKETLIB" getaddrinfo
if [ "$HAVE_GETADDRINFO" = 'yes' ]; then if [ "$HAVE_GETADDRINFO" = 'yes' ]; then
HAVE_SOCKET_LEGACY='no' HAVE_SOCKET_LEGACY='no'
else else
@ -124,7 +130,7 @@ else
HAVE_NETWORK_CMD='no' HAVE_NETWORK_CMD='no'
fi fi
check_lib STDIN_CMD -lc fcntl check_lib STDIN_CMD "$CLIB" fcntl
if [ "$HAVE_NETWORK_CMD" = "yes" ] || [ "$HAVE_STDIN_CMD" = "yes" ]; then if [ "$HAVE_NETWORK_CMD" = "yes" ] || [ "$HAVE_STDIN_CMD" = "yes" ]; then
HAVE_COMMAND='yes' HAVE_COMMAND='yes'
@ -132,7 +138,7 @@ else
HAVE_COMMAND='no' HAVE_COMMAND='no'
fi fi
check_lib GETOPT_LONG -lc getopt_long check_lib GETOPT_LONG "$CLIB" getopt_long
if [ "$HAVE_DYLIB" = 'no' ] && [ "$HAVE_DYNAMIC" = 'yes' ]; then if [ "$HAVE_DYLIB" = 'no' ] && [ "$HAVE_DYNAMIC" = 'yes' ]; then
echo "Dynamic loading of libretro is enabled, but your platform does not appear to have dlopen(), use --disable-dynamic or --with-libretro=\"-lretro\"". echo "Dynamic loading of libretro is enabled, but your platform does not appear to have dlopen(), use --disable-dynamic or --with-libretro=\"-lretro\"".
@ -277,9 +283,9 @@ if [ "$HAVE_UDEV" != "no" ]; then
fi fi
fi fi
check_lib STRL -lc strlcpy check_lib STRL "$CLIB" strlcpy
check_lib STRCASESTR -lc strcasestr check_lib STRCASESTR "$CLIB" strcasestr
check_lib MMAP -lc mmap check_lib MMAP "$CLIB" mmap
check_pkgconf PYTHON python3 check_pkgconf PYTHON python3