src: Fixed command order at startup

This commit is contained in:
Eberhard Graether
2016-03-15 17:12:04 +01:00
parent 23f05c003b
commit 2008d1401a
6 changed files with 33 additions and 17 deletions
+2 -1
View File
@@ -1,7 +1,8 @@
#ifndef INCLUDES_H
#define INCLUDES_H
void setup(int argc, char *argv[]);
void setupPlatform(int argc, char *argv[]);
void setupApp(int argc, char *argv[]);
// platform specific include
#include "platform_includes/@PLATFORM_INCLUDE@"
@@ -8,7 +8,11 @@
#include "utility/file/FileSystem.h"
#include "isTrial.h"
void setup(int argc, char *argv[])
void setupPlatform(int argc, char *argv[])
{
}
void setupApp(int argc, char *argv[])
{
if (AppPath::getAppPath().empty())
{
+5 -1
View File
@@ -9,7 +9,7 @@
#include "qt/utility/utilityQt.h"
#include "utility/UserPaths.h"
void setup(int argc, char *argv[])
void setupPlatform(int argc, char *argv[])
{
// ----------------------------------------------------------------------------
// This makes relative paths work in C++ in Xcode by changing directory to the Resources folder inside the .app bundle
@@ -65,4 +65,8 @@ void setup(int argc, char *argv[])
// ----------------------------------------------------------------------------
}
void setupApp(int argc, char *argv[])
{
}
#endif // INCLUDES_MAC_H
@@ -10,7 +10,11 @@
#include "platform_includes/deploy.h"
void setup(int argc, char *argv[])
void setupPlatform(int argc, char *argv[])
{
}
void setupApp(int argc, char *argv[])
{
#ifdef DEPLOY
std::string path = std::getenv("APPDATA");