Commit 086b882f authored by gbazin's avatar gbazin
Browse files

* extras/contrib/bootstrap, extras/contrib/src/Makefile: more cygwin fixes.

parent 933e3560
...@@ -51,6 +51,7 @@ echo "PREFIX = `pwd`" >> config.mak ...@@ -51,6 +51,7 @@ echo "PREFIX = `pwd`" >> config.mak
if test "$HOST" != "$BUILD"; then if test "$HOST" != "$BUILD"; then
CC="${HOST}-gcc" CC="${HOST}-gcc"
CXX="${HOST}-g++" CXX="${HOST}-g++"
LD="${HOST}-ld"
RANLIB="${HOST}-ranlib" RANLIB="${HOST}-ranlib"
AR="${HOST}-ar" AR="${HOST}-ar"
fi fi
...@@ -118,6 +119,7 @@ esac ...@@ -118,6 +119,7 @@ esac
echo "CC = ${CC}" >> config.mak echo "CC = ${CC}" >> config.mak
echo "CXX = ${CXX}" >> config.mak echo "CXX = ${CXX}" >> config.mak
echo "LD = ${LD}" >> config.mak
echo "RANLIB = ${RANLIB}" >> config.mak echo "RANLIB = ${RANLIB}" >> config.mak
echo "AR = ${AR}" >> config.mak echo "AR = ${AR}" >> config.mak
echo "EXTRA_CFLAGS = ${EXTRA_CFLAGS}" >> config.mak echo "EXTRA_CFLAGS = ${EXTRA_CFLAGS}" >> config.mak
......
...@@ -54,6 +54,9 @@ endif ...@@ -54,6 +54,9 @@ endif
ifneq ($(CXX),) ifneq ($(CXX),)
HOSTCC+= CXX="$(CXX)" HOSTCC+= CXX="$(CXX)"
endif endif
ifneq ($(LD),)
HOSTCC+= LD="$(LD)"
endif
ifneq ($(RANLIB),) ifneq ($(RANLIB),)
HOSTCC+= RANLIB="$(RANLIB)" HOSTCC+= RANLIB="$(RANLIB)"
endif endif
...@@ -73,10 +76,6 @@ FFMPEGCONF=--cross-prefix=$(HOST)- ...@@ -73,10 +76,6 @@ FFMPEGCONF=--cross-prefix=$(HOST)-
X264CONF=--crosscompile=$(HOST) X264CONF=--crosscompile=$(HOST)
endif endif
ifneq ($(BUILD),$(HOST))
LIVECC=C_COMPILER=$(HOST)-gcc CPP=$(HOST)-cpp CPLUSPLUS_COMPILER=$(HOST)-g++ LINK="$(HOST)-g++ -o" LIBRARY_LINK="$(HOST)-ld -o"
endif
# #
# Special target-dependant options # Special target-dependant options
# #
...@@ -960,7 +959,7 @@ ifeq ($(HOST),ppc-darwin) ...@@ -960,7 +959,7 @@ ifeq ($(HOST),ppc-darwin)
(cd $<; ./genMakefiles macosx-before-version-10.4 && make ) (cd $<; ./genMakefiles macosx-before-version-10.4 && make )
else else
ifdef HAVE_WIN32 ifdef HAVE_WIN32
(cd $<;./genMakefiles mingw && make) (cd $<;./genMakefiles mingw && make $(HOSTCC))
else else
(cd $<; ./genMakefiles macosx && make ) (cd $<; ./genMakefiles macosx && make )
endif endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment