fix build

#snapshot
MrKepzie · May 3, 2016 · 970dee4 · 970dee4
1 parent 14538f4
commit 970dee4
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 15 deletions.
diff --git a/App/App.pro b/App/App.pro
@@ -58,8 +58,6 @@ win32-msvc* {
 
 include(../OpenColorIO-Configs.pri)
 include(../global.pri)
-include(../config.pri)
-include(../libs.pri)
 
 macx {
     Resources.files += $$PWD/../Gui/Resources/Images/natronProjectIcon_osx.icns

diff --git a/Engine/Engine.pro b/Engine/Engine.pro
@@ -32,8 +32,6 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += concurrent
 CONFIG += libmv-flags openmvg-flags
 
 include(../global.pri)
-include(../config.pri)
-include(../libs.pri)
 
 log {
     DEFINES += NATRON_LOG

diff --git a/Gui/Gui.pro b/Gui/Gui.pro
@@ -25,8 +25,6 @@ QT += gui core opengl network
 greaterThan(QT_MAJOR_VERSION, 4): QT += concurrent
 
 include(../global.pri)
-include(../config.pri)
-include(../libs.pri)
 
 precompile_header {
   # Use Precompiled headers (PCH)

diff --git a/HostSupport/HostSupport.pro b/HostSupport/HostSupport.pro
@@ -22,7 +22,6 @@ CONFIG += staticlib
 CONFIG -= qt
 
 include(../global.pri)
-include(../config.pri)
 
 !noexpat: CONFIG += expat
 

diff --git a/INSTALL_OSX.md b/INSTALL_OSX.md
@@ -93,7 +93,7 @@ Patch the qt4 recipe to fix the stack overflow issue (see [QTBUG-49607](https://
 
 Patching a homebrew recipe is explained in the [homebrew FAQ](https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/FAQ.md).
 
-    brew edit qt4
+    brew edit qt
 
 and before the line that starts with `head`, add the following code:
 

diff --git a/Renderer/Renderer.pro b/Renderer/Renderer.pro
@@ -35,10 +35,7 @@ win32 {
 	RC_FILE += ../Natron.rc
 }
 
-
-include(../libs.pri)
 include(../global.pri)
-include(../config.pri)
 
 SOURCES += \
     NatronRenderer_main.cpp

diff --git a/Tests/Tests.pro b/Tests/Tests.pro
@@ -37,10 +37,7 @@ INCLUDEPATH += google-mock
 
 QMAKE_CLEAN += ofxTestLog.txt test_dot_generator0.jpg
 
-
-include(../libs.pri)
 include(../global.pri)
-include(../config.pri)
 
 SOURCES += \
     google-test/src/gtest-all.cc \

diff --git a/global.pri b/global.pri
@@ -16,6 +16,9 @@
 # along with Natron.  If not, see <http://www.gnu.org/licenses/gpl-2.0.html>
 # ***** END LICENSE BLOCK *****
 
+# libs may modify the config (eg openmp), so it must be included before
+include(libs.pri)
+
 CONFIG += warn_on no_keywords
 DEFINES += OFX_EXTENSIONS_NUKE OFX_EXTENSIONS_TUTTLE OFX_EXTENSIONS_VEGAS OFX_SUPPORTS_PARAMETRIC OFX_EXTENSIONS_TUTTLE OFX_EXTENSIONS_NATRON OFX_SUPPORTS_OPENGLRENDER
 DEFINES += OFX_SUPPORTS_MULTITHREAD
@@ -376,4 +379,5 @@ coverage {
   QMAKE_CLEAN += $(OBJECTS_DIR)/*.gcda $(OBJECTS_DIR)/*.gcno
 }
 
-
+# and finally...
+include(config.pri)