From b3c5cb8ae11911497e00125775ed92fc867f5af2 Mon Sep 17 00:00:00 2001 From: Shpoike Date: Sun, 21 Jul 2024 03:54:39 +0100 Subject: [PATCH] Use a more recent ODE revision, to avoid crosscompile errors (and just to keep things updated). --- build_setup.sh | 2 +- plugins/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build_setup.sh b/build_setup.sh index 9f2b6a29d..491c2f134 100755 --- a/build_setup.sh +++ b/build_setup.sh @@ -302,7 +302,7 @@ function otherpackages { #fi #generic crap. much of this is needed to set up and decompress dependancies and stuff. -debianpackages subversion make automake libtool p7zip-full zip ca-certificates || otherpackages z7 make svn || exit +debianpackages git make automake libtool p7zip-full zip ca-certificates || otherpackages z7 make git || exit if [ "$BUILD_LINUXx86" == "y" ]; then #for building linux targets diff --git a/plugins/Makefile b/plugins/Makefile index fb7778e2e..ac1cc100c 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -249,16 +249,16 @@ ODE_ARCH=$(FTE_TARGET) ifeq ($(ODE_ARCH),) ODE_ARCH=unknown endif -ODE_VER=0.16.2 +ODE_VER=0.16.5 ODE_URL=https://bitbucket.org/odedevs/ode/downloads/ode-$(ODE_VER).tar.gz -ODE_BASE=$(OUT_DIR)/../ode-$(ODE_VER)_$(ODE_ARCH)/ +ODE_BASE=$(ARCHLIBS)/ode-$(ODE_VER)_$(ODE_ARCH)/ ODE_LIB=$(ODE_BASE)ode-$(ODE_VER)/ode/src/.libs/libode.a $(OUT_DIR)/../ode-$(ODE_VER).tar.gz: mkdir -p $(ODE_BASE) cd $(OUT_DIR)/.. && wget -N $(ODE_URL) $(ODE_LIB): $(OUT_DIR)/../ode-$(ODE_VER).tar.gz mkdir -p $(ODE_BASE) && cd $(ODE_BASE) && tar xvfz $< - cd $(ODE_BASE)ode-$(ODE_VER)/ && ./bootstrap && ./configure --enable-double-precision --disable-demos --without-x --with-pic CC="$(CC) $(PLUG_CXXFLAGS)" CXX="$(CC) $(PLUG_CXXFLAGS)" --host=`$(CC) -dumpmachine` && make + cd $(ODE_BASE)ode-$(ODE_VER)/ && ./bootstrap && ./configure --enable-double-precision --disable-demos --without-x --with-pic CC="$(CC) $(PLUG_CXXFLAGS)" CXX="$(CC) $(PLUG_CXXFLAGS)" --host=`$(CC) -dumpmachine` && $(MAKE) ODE_FILES=../engine/common/com_phys_ode.c ../engine/common/mathlib.c plugin.c $(ODE_LIB) $(PLUG_PREFIX)ode$(PLUG_NATIVE_EXT): $(ODE_FILES)