Merge pull request #17 from MyHush/denio

clean up Readme, update win-build, change logo
2019-11-12 15:32:10 +01:00
parent 67feb8f5c0 bbc2d3c9aa
commit 72eb75d039
13 changed files with 4670 additions and 2695 deletions
@@ -0,0 +1,59 @@
+
+## Crosscompile for Windows (only tested for Ubuntu 18.04)
+
+```
+# build dependencies
+sudo apt install clang g++ build-essential make mingw-w64 git pkg-config libc6-dev m4 g++-multilib autoconf libtool-bin ncurses-dev unzip python python-zmq zlib1g-dev wget curl bsdmainutils automake libgl1-mesa-dev libglu1-mesa-dev libfontconfig1-dev autopoint libssl-dev
+
+# MXE dependencies
+sudo apt install bash bison bzip2 flex gettext git gperf intltool libc6-dev-i386 libgdk-pixbuf2.0-dev libltdl-dev libtool-bin libxml-parser-perl make openssl p7zip-full patch perl pkg-config python ruby sed unzip wget xz-utils
+
+```
+# Compile OpenSSL
+
+```
+# Download openssl 1.0.2
+https://www.openssl.org/source/
+cd openssl
+./Configure linux-x86_64
+make
+```
+## Static build of Qt5
+
+# Download Qt5 sources
+```
+mkdir -p ~/Qt/5.11.2 && cd ~/Qt/5.11.2
+
+wget https://download.qt.io/archive/qt/5.11/5.11.2/single/qt-everywhere-src-5.11.2.tar.xz
+tar xvf qt-everywhere-src-5.11.2.tar.xz && cd qt-everywhere-src-5.11.2
+
+```
+# Configure and build Qt5 statically.
+```
+OPENSSL_LIBS='-L/PATH/TO/openssl-1.0.2q -lssl -lcrypto' ./configure -static -prefix ~/Qt/5.11.2/static  -skip qtlocation -skip qtmacextras -skip qtpurchasing -skip qtscript -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qtdatavis3d -skip qtdoc -skip qtcharts -skip qtdeclarative -skip qt3d -skip qtwebengine -skip qtandroidextras -skip qtwebview -skip qtgamepad -skip qtquickcontrols -skip qtquickcontrols2 -skip qtremoteobjects -skip qtwebview -skip qtwebchannel -skip qtwebglplugin  -nomake examples -nomake tests -qt-zlib -qt-libpng -qt-xcb -qt-xkbcommon -feature-fontconfig -no-feature-getentropy  -release -openssl-linked -opensource
+
+make -j$(nproc)
+make -j$(nproc) install
+
+```
+# Build MXE (Cross-compiled Qt5 for Windows in Linux)
+```
+mkdir ~/github && cd ~/github
+git clone https://github.com/mxe/mxe.git
+cd mxe
+
+make -j$(nproc) MXE_TARGETS=x86_64-w64-mingw32.static qtbase qtwebsockets
+
+```
+# Build SilentDragonLite .exe
+```
+cd SilentDragonLite
+curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.38.0  -y 
+echo 'source $HOME/.cargo/env' >> $HOME/.bashrc
+ ~/.cargo/bin/rustup target add x86_64-pc-windows-gnu
+ echo "[target.x86_64-pc-windows-gnu]" >> ~/.cargo/config
+ echo "linker = 'x86_64-w64-mingw32.static-gcc'" >> ~/.cargo/config
+
+./win-static-build.sh
+
+```
@@ -26,56 +26,3 @@ cd silentdragonlite
 ./Silentdragonlite

 ```
-
-## Crosscompile for Windows (only tested for Ubuntu 18.04)
-
-```
-# build dependencies
-sudo apt install clang g++ build-essential make mingw-w64 git pkg-config libc6-dev m4 g++-multilib autoconf libtool-bin ncurses-dev unzip python python-zmq zlib1g-dev wget curl bsdmainutils automake libgl1-mesa-dev libglu1-mesa-dev libfontconfig1-dev autopoint libssl-dev
-
-# MXE dependencies
-sudo apt install bash bison bzip2 flex gettext git gperf intltool libc6-dev-i386 libgdk-pixbuf2.0-dev libltdl-dev libtool-bin libxml-parser-perl make openssl p7zip-full patch perl pkg-config python ruby sed unzip wget xz-utils
-
-```
-# Compile OpenSSL
-
-```
-# Download openssl 1.0.2
-https://www.openssl.org/source/
-cd openssl
-./Configure linux-x86_64
-make
-```
-## Static build of Qt5
-
-# Download Qt5 sources
-```
-mkdir -p ~/Qt/5.11.2 && cd ~/Qt/5.11.2
-
-wget https://download.qt.io/archive/qt/5.11/5.11.2/single/qt-everywhere-src-5.11.2.tar.xz
-tar xvf qt-everywhere-src-5.11.2.tar.xz && cd qt-everywhere-src-5.11.2
-
-```
-# Configure and build Qt5 statically.
-```
-OPENSSL_LIBS='-L/PATH/TO/openssl-1.0.2q -lssl -lcrypto' ./configure -static -prefix ~/Qt/5.11.2/static  -skip qtlocation -skip qtmacextras -skip qtpurchasing -skip qtscript -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qtdatavis3d -skip qtdoc -skip qtcharts -skip qtdeclarative -skip qt3d -skip qtwebengine -skip qtandroidextras -skip qtwebview -skip qtgamepad -skip qtquickcontrols -skip qtquickcontrols2 -skip qtremoteobjects -skip qtwebview -skip qtwebchannel -skip qtwebglplugin  -nomake examples -nomake tests -qt-zlib -qt-libpng -qt-xcb -qt-xkbcommon -feature-fontconfig -no-feature-getentropy  -release -openssl-linked -opensource
-
-make -j$(nproc)
-make -j$(nproc) install
-
-```
-# Build MXE (Cross-compiled Qt5 for Windows in Linux)
-```
-mkdir ~/github && cd ~/github
-git clone https://github.com/mxe/mxe.git
-cd mxe
-
-make -j$(nproc) MXE_TARGETS=x86_64-w64-mingw32.static qtbase qtwebsockets
-
-```
-# Build SilentDragonLite .exe
-```
-cd SilentDragonLite
-./win-static-build.sh
-
-```
@@ -1 +1 @@
-#define APP_VERSION "1.0"
+#define APP_VERSION "1.1"
@@ -8,6 +8,7 @@ echo "Compiling SilentDragonLite $VERSION .exe with $JOBS threads..."
 CONF=silentdragon-lite.pro

 set -e
+echo 'source $HOME/.cargo/env' >> $HOME/.bashrc
 CC_x86_64_pc_windows_gnu="x86_64-w64-mingw32.static-gcc"
 PATH="/home/$USER/github/mxe/usr/bin:${PATH}"
 mkdir release