build: offer windows 64 bit build (issue #300)

* update to clang/llvm to 3.9
* update to qt 5.8
* fixed windows javapathdetector for 64 bit java.
* added LibGui as dependency to tests
* fixed legacy Java 6 install necessary on MacOS
* fixed setting of user path for 64 bit build
* added missing pngs to windows installer
* renamed graph zoom button images
* reverted moving of setupLogging call to fix crash on deployed exe

fortune cookie message = An old acquaintance will enter your life.
This commit is contained in:
malte_langkabel
2017-02-03 14:31:43 +01:00
parent 8c0f9f2de4
commit 7f2db69995
250 changed files with 1173 additions and 1075 deletions
@@ -21,6 +21,16 @@ std::vector<FilePath> JavaPathDetectorMac::getPaths() const
std::string output = utility::executeProcess(command.c_str());
if (output.size())
{
javaPath = FilePath(utility::trim(output) + "/jre/lib/jli/libjli.dylib");
}
if (!javaPath.exists())
{
javaPath = FilePath("/usr/lib/libjli.dylib");
}
if (!javaPath.exists() && output.size())
{
javaPath = FilePath(utility::trim(output) + "/jre/lib/server/libjvm.dylib");
}
@@ -3,6 +3,8 @@
#include <QSettings>
#include <QSysInfo>
#include "utility/utilityApp.h"
JavaPathDetectorWindows::JavaPathDetectorWindows(const std::string javaVersion)
: JavaPathDetector("Java " + javaVersion + " for Windows", javaVersion)
{
@@ -16,7 +18,10 @@ std::vector<FilePath> JavaPathDetectorWindows::getPaths() const
{
QString key = "HKEY_LOCAL_MACHINE\\SOFTWARE\\";
key += "Wow6432Node\\"; // we need java 32 bit
if (utility::getApplicationArchitectureType() == APPLICATION_ARCHITECTURE_X86_32)
{
key += "Wow6432Node\\";
}
key += ("JavaSoft\\Java Runtime Environment\\" + m_javaVersion).c_str();