Updated Linux config.

ttddee · Feb 12, 2022 · bcd4c04 · bcd4c04
1 parent 767a94d
commit bcd4c04
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/Cascade.pro b/Cascade.pro
@@ -218,9 +218,13 @@ FORMS += \
 
 linux-g++ {
     LIBS += -L /usr/lib -lOpenImageIO
-    #LIBS += -L /usr/lib -lOpenColorIO
-    LIBS += -L /usr/lib -lgmic
+    LIBS += -L /usr/lib -lOpenColorIO
     LIBS += -L /usr/lib -ltbb
+    LIBS += -L /usr/lib -ldl
+    LIBS += -L /usr/lib -lglslang
+    LIBS += -L /usr/lib -lOGLCompiler
+    LIBS += -L /usr/lib -lOSDependent
+    LIBS += -L /usr/lib -lSPIRV
 
     CONFIG(debug, debug|release): DESTDIR = $$OUT_PWD
     CONFIG(release, debug|release): DESTDIR = $$OUT_PWD

diff --git a/src/multithreading.h b/src/multithreading.h
@@ -5,7 +5,17 @@
 
 #include <OpenColorIO/OpenColorIO.h>
 #include <OpenImageIO/imagebuf.h>
-#include <tbb/tbb.h>
+
+// Prevent tbb emit() from clashing with Qt. Wtf.
+#ifndef Q_MOC_RUN
+#if defined(emit)
+    #undef emit
+    #include <tbb/tbb.h>
+    #define emit
+#else
+    #include <tbb/tbb.h>
+#endif // defined(emit)
+#endif // Q_MOC_RUN
 
 namespace OCIO = OCIO_NAMESPACE;
 using namespace OIIO;

diff --git a/src/shadercompiler/SpvShaderCompiler.cpp b/src/shadercompiler/SpvShaderCompiler.cpp
@@ -10,7 +10,7 @@
 #elif __linux__
 	#include <glslang/Public/ShaderLang.h>
 	#include <glslang/SPIRV/GlslangToSpv.h>
-	#include <glslang/DirStackFileIncluder.h>
+    #include "DirStackFileIncluder.h"
 	#include <glslang/Include/ResourceLimits.h>
 #endif
 

diff --git a/src/uientities/fileboxentity.cpp b/src/uientities/fileboxentity.cpp
@@ -38,7 +38,7 @@ FileBoxEntity::FileBoxEntity(UIElementType et, QWidget *parent)
     ui->fileListView->setEditTriggers(QAbstractItemView::NoEditTriggers);
 
 #ifdef QT_DEBUG
-    addEntries(QStringList("C:\\Users\\ryzen\\Cascade\\images\\bay.jpg"));
+    //addEntries(QStringList("C:\\Users\\ryzen\\Cascade\\images\\bay.jpg"));
 #endif
 
     connect(ui->loadButton, &QPushButton::clicked,