More build stuff.
This commit is contained in:
parent
c4ac06ec28
commit
f3b6485f60
|
@ -6,9 +6,6 @@ libphysfsinclude_HEADERS = \
|
||||||
|
|
||||||
if BUILD_MACOSX
|
if BUILD_MACOSX
|
||||||
|
|
||||||
BEOS_SRC = @BUILD_BEOS_CPP@
|
|
||||||
BEOS_EXTRADIST = @BUILD_BEOS_EXTRA@
|
|
||||||
|
|
||||||
ZLIB_FILES = zlib114/adler32.c \
|
ZLIB_FILES = zlib114/adler32.c \
|
||||||
zlib114/compress.c \
|
zlib114/compress.c \
|
||||||
zlib114/crc32.c \
|
zlib114/crc32.c \
|
||||||
|
@ -56,7 +53,7 @@ libphysfs_la_SOURCES = \
|
||||||
archivers/unzip.h \
|
archivers/unzip.h \
|
||||||
platform/unix.c \
|
platform/unix.c \
|
||||||
platform/posix.c \
|
platform/posix.c \
|
||||||
$(ZLIB_SRC) $(BEOS_SRC)
|
$(ZLIB_SRC)
|
||||||
|
|
||||||
libphysfs_la_INCLUDES = $(ZLIB_INC)
|
libphysfs_la_INCLUDES = $(ZLIB_INC)
|
||||||
|
|
||||||
|
@ -89,6 +86,7 @@ EXTRA_DIST = \
|
||||||
platform/skeleton.c \
|
platform/skeleton.c \
|
||||||
platform/macclassic.c \
|
platform/macclassic.c \
|
||||||
platform/win32.c \
|
platform/win32.c \
|
||||||
|
platform/beos.cpp \
|
||||||
extras/physfsrwops.h \
|
extras/physfsrwops.h \
|
||||||
extras/physfsrwops.c \
|
extras/physfsrwops.c \
|
||||||
extras/physfshttpd.c \
|
extras/physfshttpd.c \
|
||||||
|
|
12
configure.in
12
configure.in
|
@ -236,17 +236,7 @@ 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_MACOSX, test x$this_is_macosx = xyes)
|
AM_CONDITIONAL(BUILD_MACOSX, test x$this_is_macosx = xyes)
|
||||||
|
AM_CONDITIONAL(BUILD_BEOS, test x$this_is_beos = 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"
|
||||||
|
|
||||||
|
|
|
@ -2,8 +2,18 @@ noinst_LTLIBRARIES = libplatform.la
|
||||||
|
|
||||||
INCLUDES = -I$(top_srcdir)
|
INCLUDES = -I$(top_srcdir)
|
||||||
|
|
||||||
BEOS_SRC = @BUILD_BEOS_CPP@
|
if BUILD_BEOS
|
||||||
BEOS_EXTRADIST = @BUILD_BEOS_EXTRA@
|
BEOS_SRC = beos.cpp
|
||||||
|
else
|
||||||
|
BEOS_SRC =
|
||||||
|
endif
|
||||||
|
|
||||||
|
if BUILD_BEOS
|
||||||
|
BEOS_EXTRADIST =
|
||||||
|
else
|
||||||
|
BEOS_EXTRADIST = beos.cpp
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
libplatform_la_SOURCES = \
|
libplatform_la_SOURCES = \
|
||||||
unix.c \
|
unix.c \
|
||||||
|
|
Loading…
Reference in New Issue