build: updated readme and fixed windows deploy scripts

This commit is contained in:
mlangkabel
2017-08-23 14:12:59 +02:00
parent be9e2de21d
commit f6b45faf80
4 changed files with 12 additions and 8 deletions
+8 -4
View File
@@ -7,12 +7,13 @@
* JDK 1.8
* QT 5.9.1
* CxxTest 4.3
* Valgrind 3.9.0 (linux)
* Clang & LLVM 4.0.1 (doesnt quite work for windows, use unix setup below and skip all the ninja stuff)(installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html)
* Boost 1.64
* Botan 2.1.0
* Image Magick 7.0.6
* ccache (unix)
* ccache (Unix)
* Wix 3.11 (Windows)
* Winrar (Windows)
also something about java, but who knows...
@@ -33,10 +34,13 @@ For Windows:
* VLD_DIR - .../Visual Leak Detector
* JAVA_HOME - .../Java/jdk1.x.x_xxx
* path
- apped path to git.exe
- apped path to jdk/bin
- append path to git.exe
- append path to jdk/bin
- append path to VisualStudio/Common7/Tools
- append path to VisualStudio/Common7/IDE
- append path to .../Microsoft SDKs/Windows/v7.1A/Bin (for uuidgen in deploy script)
- append path to .../WiX Toolset v3.11/bin
- append path to .../WinRAR
##### ccache
+1 -1
View File
@@ -1 +1 @@
build.sh -win32
sh build.sh -win32
+1 -1
View File
@@ -1 +1 @@
build.sh -win64
sh build.sh -win64
+2 -2
View File
@@ -96,8 +96,8 @@ fi
# BUILDING THE INSTALLER
cd deployment/windows/wixSetup
build_win32.sh
build_win64.sh
sh build_win32.sh
sh build_win64.sh
cd ../../..