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:
@@ -8,6 +8,7 @@
|
||||
|
||||
#include "utility/file/FileSystem.h"
|
||||
#include "utility/UserPaths.h"
|
||||
#include "utility/utilityApp.h"
|
||||
|
||||
#include "platform_includes/deploy.h"
|
||||
|
||||
@@ -19,7 +20,15 @@ void setupApp(int argc, char *argv[])
|
||||
{
|
||||
#ifdef DEPLOY
|
||||
std::string path = std::getenv("APPDATA");
|
||||
path += "/../local/Coati Software/Coati/";
|
||||
path += "/../local/Coati Software/";
|
||||
if (utility::getApplicationArchitectureType() == APPLICATION_ARCHITECTURE_X86_64)
|
||||
{
|
||||
path += "Coati 64-bit/";
|
||||
}
|
||||
else
|
||||
{
|
||||
path += "Coati/";
|
||||
}
|
||||
UserPaths::setUserDataPath(path);
|
||||
#else
|
||||
std::string path = QDir::currentPath().toStdString();
|
||||
|
||||
Reference in New Issue
Block a user