walkero
/
physfs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Build dance continues.

This commit is contained in:
Ryan C. Gordon 2002-06-28 05:59:14 +00:00
parent 6fd6e1e2ea
commit a5b01bc1f2
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure.in
View File

@ -57,7 +57,8 @@ AC_PROG_CXX
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_LN_S AC_PROG_LN_S
AC_LIBTOOL_WIN32_DLL AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL LIBTOOL="libtool"
AM_PROG_LIBTOOL
AC_CHECK_PROG(we_have_sed, sed, yes, no) AC_CHECK_PROG(we_have_sed, sed, yes, no)
dnl --------------------------------------------------------------------- dnl ---------------------------------------------------------------------
@ -234,9 +235,19 @@ AC_CHECK_FUNCS([memset strrchr])
dnl Add Makefile conditionals dnl Add Makefile conditionals
AM_CONDITIONAL(BUILD_ZLIB, test x$enable_internal_zlib = xyes) AM_CONDITIONAL(BUILD_ZLIB, test x$enable_internal_zlib = xyes)
AM_CONDITIONAL(BUILD_TEST_PHYSFS, test x$enable_testprog = xyes) AM_CONDITIONAL(BUILD_TEST_PHYSFS, test x$enable_testprog = xyes)
AM_CONDITIONAL(BUILD_BEOS_CPP, test x$this_is_beos = xyes)
AM_CONDITIONAL(BUILD_MACOSX, test x$this_is_macosx = xyes) AM_CONDITIONAL(BUILD_MACOSX, test x$this_is_macosx = xyes)
if test x$this_is_beos = xyes; then
BUILD_BEOS_CPP=beos.cpp
BUILD_BEOS_EXTRA=
else
BUILD_BEOS_CPP=
BUILD_BEOS_EXTRA=beos.cpp
fi
AC_SUBST([BUILD_BEOS_CPP])
AC_SUBST([BUILD_BEOS_EXTRA])
LDFLAGS="$LDFLAGS -no-undefined" LDFLAGS="$LDFLAGS -no-undefined"
AC_OUTPUT([ AC_OUTPUT([

17
platform/Makefile.am
View File

@ -2,28 +2,15 @@ noinst_LTLIBRARIES = libplatform.la
INCLUDES = -I$(top_srcdir) INCLUDES = -I$(top_srcdir)
if BUILD_BEOS_CPP
BEOS_SRC = beos.cpp
else
BEOS_SRC =
endif
if !BUILD_BEOS_CPP
BEOS_EXTRA = beos.cpp
else
BEOS_EXTRA =
endif
libplatform_la_SOURCES = \ libplatform_la_SOURCES = \
unix.c \ unix.c \
posix.c \ posix.c \
$(BEOS_SRC) @BUILD_BEOS_CPP@
EXTRA_DIST = \ EXTRA_DIST = \
skeleton.c \ skeleton.c \
macclassic.c \ macclassic.c \
win32.c \ win32.c \
$(BEOS_EXTRA) @BUILD_BEOS_EXTRA@