Merge pull request #448 from rtcwmp-com/develop

1.4.0.3 Release

Author: krazykaze81

docker-scripts/build-image-git-branch-18.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+argv=("$@")
+if [ -z "${argv[0]}" ]
+then
+	echo "Usage: $0 <docker git image: rtcwpro/rtcwpro> <branch name>"
+	exit 1
+fi
+
+RTCWPRO_SRC=$(dirname `pwd`)
+
+
+# build the files from github branch (these are baked into the image)
+docker build \
+--build-arg BRANCH="${argv[1]}" \
+-t ${argv[0]}:${argv[1]} \
+-f dockerfiles/rtcwpro-compile-18 ./dockerfiles
+
+# build the files from the local volume inside the container
+#  artifacts go to <repo>/build/
+docker run -it \
+-v $RTCWPRO_SRC:/home/compile/code \
+--workdir /home/compile/code/src \
+${argv[0]}:${argv[1]} \
+make all 
+
+rm -rf $RTCWPRO_SRC/build/objs
+
+mv $RTCWPRO_SRC/build/rtcwpro/rtcwpro_bin.pk3 $RTCWPRO_SRC/build/rtcwpro/rtcwpro_bin-$(date +%Y%m%d).pk3
+mv $RTCWPRO_SRC/build/rtcwpro/rtcwpro_assets.pk3 $RTCWPRO_SRC/build/rtcwpro/rtcwpro_assets-$(date +%Y%m%d).pk3
+mv $RTCWPRO_SRC/build/rtcwpro/rtcwpro_models.pk3 $RTCWPRO_SRC/build/rtcwpro/rtcwpro_models-$(date +%Y%m%d).pk3
+mv $RTCWPRO_SRC/build/rtcwpro/rtcwpro_xhairs.pk3 $RTCWPRO_SRC/build/rtcwpro/rtcwpro_xhairs-$(date +%Y%m%d).pk3
+
+# load a shell into the image
+#docker run -it -v /var/run/docker.sock:/var/run/docker.sock \
+#-v $(dirname `pwd`):/home/compile/code \
+#--workdir /home/compile/code/src \
+#snappas/rtcwpro:develop /bin/bash
+
+
+#bash build-image-git-server.sh ${argv[0]} ${argv[1]}

docker-scripts/dockerfiles/rtcwpro-compile-18

@@ -0,0 +1,28 @@
+FROM ubuntu:18.04
+
+ARG BRANCH
+ENV BRANCH=${BRANCH}
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN useradd -ms /bin/bash compile
+
+RUN dpkg --add-architecture i386 && \
+    apt-get update && \
+    apt-get -y upgrade && \
+    apt-get install -y wget libc6:i386 zip \
+    unzip git gdb-multiarch gcc cmake perl curl gcc-multilib g++-multilib \
+    autoconf libtool nasm mingw-w64 mingw-w64-tools g++ \
+    libgl-dev libsdl2-dev:i386 clang-tools-10 lld-10
+
+RUN ln -s /usr/bin/clang-10 /usr/bin/clang && \
+    ln -s /usr/bin/clang-cl-10 /usr/bin/clang-cl && \
+    ln -s /usr/bin/llvm-lib-10 /usr/bin/llvm-lib && \
+    ln -s /usr/bin/lld-link-10 /usr/bin/lld-link && \
+    ln -s /usr/bin/llvm-rc-10 /usr/bin/llvm-rc
+
+RUN mkdir /output
+RUN chown compile:compile /output
+
+USER compile
+WORKDIR /home/compile

fetch-dependencies.sh

@@ -83,11 +83,11 @@ make -j
 make install
 
 autoreconf -i
-CFLAGS="-m32" ./configure --prefix=${JANSSON_DIR}/build-win --target=i686-w64-mingw32 --host=i686-w64-mingw32
+CFLAGS="-m32" LDFLAGS="-static-libgcc -static-libstdc++" ./configure --prefix=${JANSSON_DIR}/build-win --target=i686-w64-mingw32 --host=i686-w64-mingw32
 make -j
 make install
 cd $JANSSON_DIR
-cd build-win
+cd build-win/bin
 gendef libjansson-4.dll
 i686-w64-mingw32-dlltool -d libjansson-4.def -l libjansson-4.lib
 fi
@@ -141,13 +141,13 @@ mkdir build-win
 cd build
 CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32  cmake -G"Unix Makefiles" ..
 make -j
-cp ../*.h .
+cp ../src/*.h .
 
 cd ../build-win
 echo "${CMAKEMINGW}" > toolchain.cmake
 cmake -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=./toolchain.cmake  -DCMAKE_INSTALL_PREFIX=${LIBJPEG_DIR}/build-win ..
 LDFLAGS="-static -static-libgcc -static-libstdc++" make -j
-cp ../*.h .
+cp ../src/*.h .
 gendef libjpeg-62.dll
 i686-w64-mingw32-dlltool -d libjpeg-62.def -l libjpeg-62.lib
 fi

src/Makefile

@@ -7,6 +7,7 @@ dependencies:
 	mkdir -p ../build
 	cp ../deps/libjpeg-turbo/build-win/libjpeg-62.dll ../build
 	cp ../deps/curl-win/curl/bin/libcurl.dll ../build
+	cp ../deps/jansson/build-win/bin/libjansson-4.dll ../build
 
 binaries:
 	mkdir -p ../build/rtcwpro

src/unix/Makefile

@@ -125,7 +125,7 @@ client: NASM := nasm
 client: CFLAGS := $(CFLAGSREL) -m32 -DBOTLIB -DDLL_ONLY -I../../deps/libunwind/build/include/ -I../../deps/curl/build/include/  -I../../deps/libjpeg-turbo/build/ 
 client: CPPFLAGS := $(CFLAGS)
 client: LDFLAGS := \
-	 -m32 -ldl -lm -lstdc++ -lSDL2 -lc
+	 -m32 -ldl -lm -lstdc++ -lSDL2 -lc -pthread
 client: $(CLOBJS)
 	$(CC) -g -o wolfMP.x86 $(CLOBJS) ../../deps/libunwind/build/lib/libunwind.a ../../deps/curl/build/lib/libcurl.a ../../deps/openssl/build/lib/libssl.a ../../deps/openssl/build/lib/libcrypto.a  ../../deps/libjpeg-turbo/build/libturbojpeg.a $(LDFLAGS)
 	#strip -s wolfMP.x86