mirror of
https://code.videolan.org/videolan/vlc
synced 2024-07-21 07:24:15 +02:00
* extras/contrib/bootstrap, extras/contrib/src/Makefile: small cleanup + cygwin fix for bootstrap.
This commit is contained in:
parent
e53452fb6e
commit
353bed9dbe
@ -40,7 +40,8 @@ else
|
||||
HOST="$BUILD"
|
||||
fi
|
||||
|
||||
echo -e "# Automatically generated by bootstrap.\n# Make changes if you know what you're doing.\n" >| config.mak
|
||||
rm -f config.mak
|
||||
echo -e "# Automatically generated by bootstrap.\n# Make changes if you know what you're doing.\n" > config.mak
|
||||
|
||||
echo "BUILD = $BUILD" >> config.mak
|
||||
echo "HOST = $HOST" >> config.mak
|
||||
@ -49,6 +50,7 @@ case $HOST in
|
||||
ppc-darwin)
|
||||
# Mac OS X < 10.4
|
||||
echo "EXTRA_CPPFLAGS = -no-cpp-precomp" >> config.mak
|
||||
echo "HAVE_DARWIN_OS = 1" >> config.mak
|
||||
;;
|
||||
powerpc-apple-darwin8)
|
||||
# Mac OS X 10.4
|
||||
@ -60,14 +62,25 @@ case $HOST in
|
||||
# echo "EXTRA_CFLAGS = -D\${ENVP} -isysroot \${MACOSX_SDK}" >> config.mak
|
||||
echo "EXTRA_CPPFLAGS = -no-cpp-precomp" >> config.mak
|
||||
# echo "EXTRA_LDFLAGS = -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}" >> config.mak
|
||||
echo "HAVE_DARWIN_OS = 1" >> config.mak
|
||||
;;
|
||||
i586-pc-beos)
|
||||
echo "HAVE_BEOS = 1" >> config.mak
|
||||
if test -f /boot/beos/system/lib/libbind.so; then
|
||||
echo "EXTRA_LDFLAGS = -lbind -lsocket" >> config.mak
|
||||
else
|
||||
echo "EXTRA_LDFLAGS = -lnet" >> config.mak
|
||||
fi
|
||||
;;
|
||||
i586-mingw32msvc)
|
||||
echo "HAVE_WIN32 = 1" >> config.mak
|
||||
;;
|
||||
i686-pc-cygwin)
|
||||
echo "HAVE_WIN32 = 1" >> config.mak
|
||||
echo "EXTRA_CFLAGS = -mno-cygwin" >> config.mak
|
||||
echo "EXTRA_CPPFLAGS = -mno-cygwin" >> config.mak
|
||||
echo "EXTRA_LDFLAGS = -mno-cygwin" >> config.mak
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
|
@ -32,19 +32,12 @@ include ./packages.mak
|
||||
# Set a clean environment
|
||||
# ***************************************************************************
|
||||
|
||||
ifeq ($(HOST),ppc-darwin)
|
||||
HAVE_DARWIN_OS=1
|
||||
endif
|
||||
ifeq ($(HOST),powerpc-apple-darwin8)
|
||||
HAVE_DARWIN_OS=1
|
||||
endif
|
||||
|
||||
ifdef HAVE_DARWIN_OS
|
||||
export PATH = $(PREFIX)/bin:/bin:/usr/bin
|
||||
export DYLD_LIBRARY_PATH = $(PREFIX)/lib
|
||||
endif
|
||||
|
||||
ifeq ($(HOST),i586-pc-beos)
|
||||
ifdef HAVE_BEOS
|
||||
ifeq ($(HOST),$(BUILD))
|
||||
# Compiling on BeOS
|
||||
export PATH = $(PREFIX)/bin:.:/boot/home/config/bin:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:/boot/develop/tools/gnupro/bin
|
||||
@ -55,14 +48,6 @@ export PATH = $(PREFIX)/bin:/opt/beos-tools/bin:/opt/cross-tools/bin:/usr/bin:/b
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(HOST),i586-mingw32msvc)
|
||||
HAVE_WIN32=1
|
||||
endif
|
||||
ifeq ($(HOST),i686-pc-cygwin)
|
||||
HAVE_WIN32=1
|
||||
EXTRA_CFLAGS=-mno-cygwin
|
||||
EXTRA_LDFLAGS=-mno-cygwin
|
||||
endif
|
||||
ifdef HAVE_WIN32
|
||||
export PATH := $(PREFIX)/bin:$(PATH)
|
||||
export PKG_CONFIG_PATH = $(PREFIX)/lib/pkgconfig
|
||||
|
Loading…
Reference in New Issue
Block a user