diff --git a/build_setup.sh b/build_setup.sh index 4d8dfdca..039a3ede 100755 --- a/build_setup.sh +++ b/build_setup.sh @@ -197,17 +197,15 @@ function debianpackages { do dpkg -s $i 2>&1 >> /dev/null if [ $? -eq 1 ]; then + echo "Package missing: $i" ret=$false fi done if [ $ret == $false ]; then - if [ $UID -eq 0 ]; then - apt-get install --no-install-recommends $@ - ret=$true - else - echo "Packages not installed. Rerun script as root to easily install dependancies, or manually install." - fi + echo "Packages are not installed. Press enter to continue (or ctrl+c and install)." + read + ret=$true fi return $ret } @@ -234,8 +232,8 @@ function otherpackages { if [ $UID -eq 0 ] && [ ! -z `which apt-get` ]; then #because multiarch requires separate packages for some things, we'll need to set that up now (in case noone did that yet) - dpkg --add-architecture i386 - apt-get update +# dpkg --add-architecture i386 +# apt-get update fi #generic crap. much of this is needed to set up and decompress dependancies and stuff. diff --git a/engine/Makefile b/engine/Makefile index 781f8e28..0af4c797 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -2283,7 +2283,7 @@ libs-$(ARCH)/libspeexdsp.a: libs-$(ARCH)/libfreetype.a libs-$(ARCH)/ft2build.h: libs-$(ARCH)/libpng.a test -f freetype-$(FREETYPEVER).tar.gz || wget https://download.savannah.gnu.org/releases/freetype/freetype-$(FREETYPEVER).tar.gz - -test -f libs-$(ARCH)/libfreetype.a || (mkdir -p libs-$(ARCH) && cd libs-$(ARCH) && tar -xvzf ../freetype-$(FREETYPEVER).tar.gz && cd freetype-$(FREETYPEVER) && CFLAGS="$(CFLAGS) -Os" $(TOOLOVERRIDES) ./configure CPPFLAGS=-I$(NATIVE_ABSBASE_DIR)/libs-$(ARCH)/ LDFLAGS=-L$(NATIVE_ABSBASE_DIR)/libs-$(ARCH)/ $(CONFIGARGS) --with-bzip2=no --with-harfbuzz=no && $(TOOLOVERRIDES) $(MAKE) && cp objs/.libs/libfreetype.a ../ && bash && cp -r include/* ../) + -test -f libs-$(ARCH)/libfreetype.a || (mkdir -p libs-$(ARCH) && cd libs-$(ARCH) && tar -xvzf ../freetype-$(FREETYPEVER).tar.gz && cd freetype-$(FREETYPEVER) && CFLAGS="$(CFLAGS) -Os" $(TOOLOVERRIDES) ./configure CPPFLAGS=-I$(NATIVE_ABSBASE_DIR)/libs-$(ARCH)/ LDFLAGS=-L$(NATIVE_ABSBASE_DIR)/libs-$(ARCH)/ $(CONFIGARGS) --with-bzip2=no --with-harfbuzz=no && $(TOOLOVERRIDES) $(MAKE) && cp objs/.libs/libfreetype.a ../ && cp -r include/* ../) libs-$(ARCH)/libBulletDynamics.a: test -f bullet3-$(BULLETVER).tar.gz || wget https://github.com/bulletphysics/bullet3/archive/$(BULLETVER).tar.gz -O bullet3-$(BULLETVER).tar.gz