MacOS / Xcode updates

danielbui78 · Oct 25, 2021 · 830284f · 830284f
1 parent af5bdac
commit 830284f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 build/*
+.DS_Store
diff --git a/optionsframe.cpp b/optionsframe.cpp
@@ -389,7 +389,8 @@ void	YaLuxOptionsFrame::applyChanges()
     //YaLuxGlobal.LuxExecPath = execPath->getValue() + "/luxconsole.exe";
     YaLuxGlobal.LuxExecPath = execPath->getValue() + "/luxcoreconsole.exe";
 #elif defined( Q_WS_MAC )
-    YaLuxGlobal.LuxExecPath = execPath->getValue() + "/Luxrender.app/Contents/MacOS/luxconsole";
+    //YaLuxGlobal.LuxExecPath = execPath->getValue() + "/Luxrender.app/Contents/MacOS/luxconsole";
+    YaLuxGlobal.LuxExecPath = execPath->getValue() + "/LuxCore.app/Contents/MacOS/luxcoreconsole";
 #endif
     YaLuxGlobal.CmdLineArgs = argumentList->getValue();
 

diff --git a/utility_classes.h b/utility_classes.h
@@ -18,7 +18,7 @@
 #include <QtCore/QThread>
 #include "dztexture.h"
 
-#include "luxcore\DzMaterialToLuxCoreMaterial.h"
+#include "luxcore/DzMaterialToLuxCoreMaterial.h"
 
 const QStringList LXSfilm = QStringList() <<
 "Film \"fleximage\"\n" <<