autoconf fixes for bsd
This commit is contained in:
parent
449b91ae82
commit
2bfc129f38
2 changed files with 8 additions and 3 deletions
|
@ -36,7 +36,7 @@ TOOLLIBS=$(XLDFLAGS) -lpng -lz -lm @THREAD_LIBS@
|
|||
FREECRAFT_LIBS= -lpng -lz -lm \
|
||||
@VIDEO_LIBS@ @THREAD_LIBS@ $(CCLLIB) $(COMP_LIBS) \
|
||||
$(ARTSCLIB) @FLAC_LIBS@ @OGG_LIBS@ @MAD_LIBS@ @CDAUDIO_LIBS@ \
|
||||
@STATIC_LDFLAGS@ -lz -lm
|
||||
@STATIC_LDFLAGS@ -lz -lm -L/usr/local/lib
|
||||
|
||||
DISTLIST=$(TOPDIR)/distlist
|
||||
TAGS=$(TOPDIR)/src/tags
|
||||
|
@ -54,7 +54,8 @@ CFLAGS=@PROFILE_CFLAGS@ @DEBUG_CFLAGS@ $(IFLAGS) \
|
|||
-DUNIT_ON_MAP -DNEW_AI -DUSE_LIBMODPLUG -DUSE_HP_FOR_XP \
|
||||
@PROFILE_CFLAGS@ @DEBUG_CFLAGS@ @VIDEO_CFLAGS@ @BZ2_CFLAGS@ \
|
||||
@OGG_CFLAGS@ @MAD_CFLAGS@ @FLAC_CFLAGS@ @CDAUDIO_CFLAGS@ \
|
||||
$(CCL) $(VERSION) $(COMP_CFLAGS) @SOUND_CFLAGS@ @PLATFORM@ $(ARTSC)
|
||||
$(CCL) $(VERSION) $(COMP_CFLAGS) @SOUND_CFLAGS@ @PLATFORM@ \
|
||||
-I/usr/local/include $(ARTSC)
|
||||
|
||||
CTAGSFLAGS=-i defptvS -a -f
|
||||
|
||||
|
|
|
@ -72,7 +72,11 @@ if test "$with_client" = "x11"; then
|
|||
AC_CHECK_HEADERS(X11/Xlib.h,, AC_MSG_ERROR(could not find X11/Xlib.h))
|
||||
VIDEO_CFLAGS="-DUSE_X11"
|
||||
VIDEO_LIBS="-lXext -lX11 -L/usr/X11R6/lib -I/usr/X11R6/include"
|
||||
THREAD_LIBS="-lpthread"
|
||||
if test "$PLATFORM" = "-DBSD"; then
|
||||
THREAD_LIBS="-pthread"
|
||||
else
|
||||
THREAD_LIBS="-lpthread"
|
||||
fi
|
||||
elif test "$with_client" = "svgalib"; then
|
||||
VIDEO_CFLAGS="-DUSE_SVGALIB"
|
||||
VIDEO_LIBS="-lvga"
|
||||
|
|
Loading…
Add table
Reference in a new issue