commit 7ebf9785
Added a 32 bit version for standalone
Changed files
| A | source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone32 |
| M | source/misc/standalone/blockattack_standalone_launcher before |
| M | source/misc/standalone/build_standalone.sh before |
diff --git a/source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone32 b/source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone32
new file mode 100644
index 0000000..8524b55
--- /dev/null
+++ b/source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone32
@@ -0,0 +1,14 @@
+FROM ioft/i386-ubuntu:14.04
+
+RUN apt-get update && apt-get install -y build-essential libboost-dev cmake pkg-config libboost-program-options-dev libfreetype6-dev libvorbis-dev libgl1-mesa-dev libutfcpp-dev zip gettext
+
+COPY source/misc/standalone/compile_requirements.sh /
+RUN /compile_requirements.sh
+
+COPY . /staging/blockattack-game
+
+ENV BLOCKATTACK_VERSION 2.1.0-SNAPSHOT
+
+RUN cd /staging/blockattack-game && \
+./packdata.sh && \
+cmake -D Boost_USE_STATIC_LIBS=ON -D INSTALL_DATA_DIR=. -D CMAKE_INSTALL_PREFIX=. -D STANDALONE=1 . && make
diff --git a/source/misc/standalone/blockattack_standalone_launcher b/source/misc/standalone/blockattack_standalone_launcher
index e08b9ed..1785e9c 100644
--- a/source/misc/standalone/blockattack_standalone_launcher
+++ b/source/misc/standalone/blockattack_standalone_launcher
@@ -11,7 +11,6 @@ if [ "$ARCH" == "x86_64" ]; then
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./x86_64/
./x86_64/blockattack "$@"
else
- echo "Unsupported arch"
- #export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./x86/
- #./x86/foobar.x86 $@
+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./x86/
+ ./x86/blockattack "$@"
fi
diff --git a/source/misc/standalone/build_standalone.sh b/source/misc/standalone/build_standalone.sh
index 981c404..ade6d98 100755
--- a/source/misc/standalone/build_standalone.sh
+++ b/source/misc/standalone/build_standalone.sh
@@ -10,6 +10,7 @@ ARCHIVENAME=$1
rm -rf staging
mkdir -p staging/$ARCHIVENAME/x86_64
+mkdir -p staging/$ARCHIVENAME/x86
mkdir -p staging/$ARCHIVENAME/docs
cp blockattack_standalone_launcher staging/$ARCHIVENAME/blockattack
cp README.txt staging/$ARCHIVENAME/README
@@ -37,3 +38,15 @@ cp /staging/blockattack-game/COPYING /output/ && \
cp /staging/blockattack-game/man/blockattack.man /output/docs/ && \
cp /staging/blockattack-game/README.md /output/docs/README_ORG.md && \
chown -R 1000 /output"
+
+docker build -f source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone32 . -t blockattack_test
+
+docker run -it --rm -v $(pwd)/source/misc/standalone/staging/$ARCHIVENAME/:/output blockattack_test /bin/bash -c "cp /staging/blockattack-game/Game/blockattack /output/x86/ && \
+cp /usr/local/lib/libSDL2-2.0.so.0 /output/x86/ && \
+cp /usr/local/lib/libphysfs.so.1 /output/x86/ && \
+cp /usr/local/lib/libSDL2_mixer-2.0.so.0 /output/x86/ && \
+cp /usr/local/lib/libSDL2_ttf-2.0.so.0 /output/x86/ && \
+cp /usr/local/lib/libSDL2_image-2.0.so.0 /output/x86/"
+
+cd source/misc/standalone/staging/
+tar -cvjSf "$ARCHIVENAME.tar.bz2" "$ARCHIVENAME"