mirror of
https://github.com/nzp-team/fteqw.git
synced 2024-11-10 06:32:00 +00:00
Use a more recent ODE revision, to avoid crosscompile errors (and just to keep things updated).
This commit is contained in:
parent
541b98edda
commit
b3c5cb8ae1
2 changed files with 4 additions and 4 deletions
|
@ -302,7 +302,7 @@ function otherpackages {
|
||||||
#fi
|
#fi
|
||||||
|
|
||||||
#generic crap. much of this is needed to set up and decompress dependancies and stuff.
|
#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
|
if [ "$BUILD_LINUXx86" == "y" ]; then
|
||||||
#for building linux targets
|
#for building linux targets
|
||||||
|
|
|
@ -249,16 +249,16 @@ ODE_ARCH=$(FTE_TARGET)
|
||||||
ifeq ($(ODE_ARCH),)
|
ifeq ($(ODE_ARCH),)
|
||||||
ODE_ARCH=unknown
|
ODE_ARCH=unknown
|
||||||
endif
|
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_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
|
ODE_LIB=$(ODE_BASE)ode-$(ODE_VER)/ode/src/.libs/libode.a
|
||||||
$(OUT_DIR)/../ode-$(ODE_VER).tar.gz:
|
$(OUT_DIR)/../ode-$(ODE_VER).tar.gz:
|
||||||
mkdir -p $(ODE_BASE)
|
mkdir -p $(ODE_BASE)
|
||||||
cd $(OUT_DIR)/.. && wget -N $(ODE_URL)
|
cd $(OUT_DIR)/.. && wget -N $(ODE_URL)
|
||||||
$(ODE_LIB): $(OUT_DIR)/../ode-$(ODE_VER).tar.gz
|
$(ODE_LIB): $(OUT_DIR)/../ode-$(ODE_VER).tar.gz
|
||||||
mkdir -p $(ODE_BASE) && cd $(ODE_BASE) && tar xvfz $<
|
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)
|
ODE_FILES=../engine/common/com_phys_ode.c ../engine/common/mathlib.c plugin.c $(ODE_LIB)
|
||||||
$(PLUG_PREFIX)ode$(PLUG_NATIVE_EXT): $(ODE_FILES)
|
$(PLUG_PREFIX)ode$(PLUG_NATIVE_EXT): $(ODE_FILES)
|
||||||
|
|
Loading…
Reference in a new issue