set +x
echo
echo "*****************************************************************"
- echo "* We are using the llvm-gcc-4.2 compiler on OS X by default, *"
- echo "* so compilation will fail if it isn't installed. *"
+ echo "* We are using both the llvm-gcc-4.2 and the gcc-4.2 compilers *"
+ echo "* on OS X, so compilation will fail if these are not installed. *"
echo "*****************************************************************"
fi
echo "*****************************************************************"
echo "* You are running Darwin 10. *"
echo "* For testing purposes, VLC will be compiled in 64bit mode. *"
- echo "* While doing so, for time being, the 10.5 SDK is used. *"
+ echo "* While doing so, for the time being, the 10.5 SDK is used. *"
echo "* Note that in contrast to our Darwin 9 builds, we are not *"
- echo "* using the llvm compiler, but plain GCC 4.2. *"
+ echo "* using the llvm compiler, but GCC 4.2. *"
echo "*****************************************************************"
set -x
fi
ifdef HAVE_DARWIN_OS_ON_INTEL
FFMPEG_CFLAGS += -DHAVE_LRINTF
endif
-X264CC+= CC="/Developer/usr/bin/gcc-4.2"
-X264CC+= CXX="/Developer/usr/bin/g++-4.2"
+NONLLVMCC+= CC="/Developer/usr/bin/gcc-4.2"
+NONLLVMCC+= CXX="/Developer/usr/bin/g++-4.2"
else
-X264CC+= $(HOSTCC)
+NONLLVMCC+= $(HOSTCC)
endif
ifdef HAVE_AMR
(cd $@; dos2unix configure.in)
patch -p0 < Patches/goom2k4-0-win32.patch
else
-ifndef HAVE_DARWIN_OS
patch -p0 < Patches/goom2k4-0-mmx.patch
-endif
endif
patch -p0 < Patches/goom2k4-0-memleaks.patch
.goom2k4: goom
ifdef HAVE_DARWIN_OS
- (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
+ (cd $<; $(NONLLVMCC) ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
else
(cd $< && rm -f configure; aclocal -I m4/ && automake --add-missing && autoconf configure.in > configure && $(HOSTCC) sh ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
endif
else
ifdef HAVE_DARWIN_OS_ON_INTEL
.x264: x264 .yasm
- (cd $<; $(X264CC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
+ (cd $<; $(NONLLVMCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
else
.x264: x264
- (cd $<; $(X264CC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
+ (cd $<; $(NONLLVMCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
endif
endif
touch $@