Skip to content

Commit

Permalink
Merge branch 'RB-2.0'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	Project-xcode.xcodeproj/project.pbxproj
#	global.pri
  • Loading branch information
@devernay
devernay committed May 23, 2016
2 parents c1941a4 + 5cca014 commit eba18ef
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 15 deletions.
80 changes: 67 additions & 13 deletions Project-xcode.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
isa = PBXContainerItemProxy;
containerPortal = 1E12F4B41CC6593300105A34 /* qhttpserver.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = F82F89455E05F43CE051A79D;
remoteGlobalIDString = 7B66319A2D661600E54F0DA9;
remoteInfo = qhttpserver;
};
1E15250D1CA9CCA70056C506 /* PBXContainerItemProxy */ = {
Expand Down Expand Up @@ -122,35 +122,35 @@
isa = PBXContainerItemProxy;
containerPortal = 1E1524F31CA9CCA60056C506 /* ceres.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 50E22BF77EADB308C87E78CC;
remoteGlobalIDString = F8CC1206D116CA04F4C59E76;
remoteInfo = ceres;
};
1E1525391CA9CD8D0056C506 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1E1524F81CA9CCA60056C506 /* gflags.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = DC3A22537506A6669865251C;
remoteGlobalIDString = AE1AD09FA66E17B98A648194;
remoteInfo = gflags;
};
1E15253B1CA9CD8D0056C506 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1E1524FD1CA9CCA60056C506 /* glog.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 03DDCD43C74EEE647AD61A75;
remoteGlobalIDString = 7569DD78B40A8DF6A62CFA3E;
remoteInfo = glog;
};
1E15253D1CA9CD8D0056C506 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1E1525021CA9CCA60056C506 /* LibMV.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = CEC193B6F4ECB62235821F2B;
remoteGlobalIDString = C7E53A7AD172AE9320949229;
remoteInfo = LibMV;
};
1E15253F1CA9CD8D0056C506 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1E1525071CA9CCA60056C506 /* openMVG.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 6D7288D8764B97DD1E027858;
remoteGlobalIDString = 328590AF750A79D2CF9DFB9A;
remoteInfo = openMVG;
};
1E189EC31C49475E00F1FD20 /* PBXContainerItemProxy */ = {
Expand All @@ -171,7 +171,7 @@
isa = PBXContainerItemProxy;
containerPortal = 1EADE5C718AA403700EF3180 /* Tests.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = AFEF7D68642F83E3811BB9B9;
remoteGlobalIDString = DC7FDCA340DAC7F023377B78;
remoteInfo = Tests;
};
1E306DFE1C4949BA00BAC6E3 /* PBXContainerItemProxy */ = {
Expand All @@ -192,28 +192,28 @@
isa = PBXContainerItemProxy;
containerPortal = 1E306DED1C49497200BAC6E3 /* NatronRenderer.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 3B61C2EC40908C23E2918B71;
remoteGlobalIDString = 32D9C4266EC8DC770A644D29;
remoteInfo = NatronRenderer;
};
1E306E041C4949D700BAC6E3 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1E189EBF1C49475E00F1FD20 /* Natron.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 91455CC2BC21CB91737B3DC6;
remoteGlobalIDString = 782793A212D0A946A2611559;
remoteInfo = Natron;
};
1E5F8F5718AA913D0045A477 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1EADE5C118AA403700EF3180 /* Engine.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 30EC256330269B7CAA1FCB17;
remoteGlobalIDString = F82FF8B1AB092B635B8D3C44;
remoteInfo = Engine;
};
1E5F8F5918AA913D0045A477 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1EADE5C418AA403700EF3180 /* Gui.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 4AE2754265AC5F6E557A903C;
remoteGlobalIDString = 9B38B1D5C33AF4E4B0F859F7;
remoteInfo = Gui;
};
1E5F8F5B18AA91430045A477 /* PBXContainerItemProxy */ = {
Expand Down Expand Up @@ -269,7 +269,7 @@
isa = PBXContainerItemProxy;
containerPortal = ACD67BF71CEC9D0900DD2CFE /* hoedown.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 68FEEA655C477C409D21050B;
remoteGlobalIDString = 547B056CEA92922A2FCFC8AF;
remoteInfo = hoedown;
};
D7A1964518B2242500F412DA /* PBXContainerItemProxy */ = {
Expand All @@ -283,7 +283,7 @@
isa = PBXContainerItemProxy;
containerPortal = D7A1963F18B2242500F412DA /* HostSupport.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = EA73569A7C740BC02AA20FE9;
remoteGlobalIDString = 0E116598542859DA9320C015;
remoteInfo = HostSupport;
};
/* End PBXContainerItemProxy section */
Expand All @@ -297,6 +297,25 @@
1E1525071CA9CCA60056C506 /* openMVG.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = openMVG.xcodeproj; path = libs/openMVG/openMVG.xcodeproj; sourceTree = "<group>"; };
1E189EBF1C49475E00F1FD20 /* Natron.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Natron.xcodeproj; path = App/Natron.xcodeproj; sourceTree = "<group>"; };
1E306DED1C49497200BAC6E3 /* NatronRenderer.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = NatronRenderer.xcodeproj; path = Renderer/NatronRenderer.xcodeproj; sourceTree = "<group>"; };
1E70D14F1CF33A0C000D2932 /* BUGS.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = BUGS.md; sourceTree = "<group>"; };
1E70D1501CF33A0C000D2932 /* CHANGELOG.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
1E70D1511CF33A0C000D2932 /* config.pri */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = config.pri; sourceTree = "<group>"; };
1E70D1521CF33A0C000D2932 /* CONTRIBUTING.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = CONTRIBUTING.md; sourceTree = "<group>"; };
1E70D1531CF33A0C000D2932 /* CONTRIBUTORS.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CONTRIBUTORS.txt; sourceTree = "<group>"; };
1E70D1541CF33A0C000D2932 /* global.pri */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = global.pri; sourceTree = "<group>"; };
1E70D1551CF33A0C000D2932 /* INSTALL_FREEBSD.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = INSTALL_FREEBSD.md; sourceTree = "<group>"; };
1E70D1561CF33A0C000D2932 /* INSTALL_LINUX.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = INSTALL_LINUX.md; sourceTree = "<group>"; };
1E70D1571CF33A0C000D2932 /* INSTALL_OSX.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = INSTALL_OSX.md; sourceTree = "<group>"; };
1E70D1581CF33A0C000D2932 /* INSTALL_WINDOWS.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = INSTALL_WINDOWS.md; sourceTree = "<group>"; };
1E70D1591CF33A0C000D2932 /* LATEST_VERSION.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LATEST_VERSION.txt; sourceTree = "<group>"; };
1E70D15A1CF33A0C000D2932 /* libs.pri */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = libs.pri; sourceTree = "<group>"; };
1E70D15B1CF33A0C000D2932 /* LICENSE_SHORT.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE_SHORT.txt; sourceTree = "<group>"; };
1E70D15C1CF33A0C000D2932 /* LICENSE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE.txt; sourceTree = "<group>"; };
1E70D15D1CF33A0C000D2932 /* Natron.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Natron.rc; sourceTree = "<group>"; };
1E70D15E1CF33A0C000D2932 /* OpenColorIO-Configs-README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = "OpenColorIO-Configs-README.md"; sourceTree = "<group>"; };
1E70D15F1CF33A0C000D2932 /* OpenColorIO-Configs.pri */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "OpenColorIO-Configs.pri"; sourceTree = "<group>"; };
1E70D1601CF33A0C000D2932 /* Project.pro */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Project.pro; sourceTree = "<group>"; };
1E70D1611CF33A0C000D2932 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
1EADE5C118AA403700EF3180 /* Engine.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Engine.xcodeproj; path = Engine/Engine.xcodeproj; sourceTree = "<group>"; };
1EADE5C418AA403700EF3180 /* Gui.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Gui.xcodeproj; path = Gui/Gui.xcodeproj; sourceTree = "<group>"; };
1EADE5C718AA403700EF3180 /* Tests.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Tests.xcodeproj; path = Tests/Tests.xcodeproj; sourceTree = "<group>"; };
Expand Down Expand Up @@ -369,9 +388,44 @@
name = Products;
sourceTree = "<group>";
};
1E70D1621CF33AF3000D2932 /* QMake files */ = {
isa = PBXGroup;
children = (
1E70D1601CF33A0C000D2932 /* Project.pro */,
1E70D1541CF33A0C000D2932 /* global.pri */,
1E70D1511CF33A0C000D2932 /* config.pri */,
1E70D15A1CF33A0C000D2932 /* libs.pri */,
1E70D15F1CF33A0C000D2932 /* OpenColorIO-Configs.pri */,
);
name = "QMake files";
sourceTree = "<group>";
};
1E70D1631CF33B22000D2932 /* Documentation */ = {
isa = PBXGroup;
children = (
1E70D14F1CF33A0C000D2932 /* BUGS.md */,
1E70D1501CF33A0C000D2932 /* CHANGELOG.md */,
1E70D1521CF33A0C000D2932 /* CONTRIBUTING.md */,
1E70D1531CF33A0C000D2932 /* CONTRIBUTORS.txt */,
1E70D1551CF33A0C000D2932 /* INSTALL_FREEBSD.md */,
1E70D1561CF33A0C000D2932 /* INSTALL_LINUX.md */,
1E70D1571CF33A0C000D2932 /* INSTALL_OSX.md */,
1E70D1581CF33A0C000D2932 /* INSTALL_WINDOWS.md */,
1E70D1591CF33A0C000D2932 /* LATEST_VERSION.txt */,
1E70D15B1CF33A0C000D2932 /* LICENSE_SHORT.txt */,
1E70D15C1CF33A0C000D2932 /* LICENSE.txt */,
1E70D15D1CF33A0C000D2932 /* Natron.rc */,
1E70D15E1CF33A0C000D2932 /* OpenColorIO-Configs-README.md */,
1E70D1611CF33A0C000D2932 /* README.md */,
);
name = Documentation;
sourceTree = "<group>";
};
1EADE5B718AA400B00EF3180 = {
isa = PBXGroup;
children = (
1E70D1631CF33B22000D2932 /* Documentation */,
1E70D1621CF33AF3000D2932 /* QMake files */,
ACD67BF71CEC9D0900DD2CFE /* hoedown.xcodeproj */,
1E1524F31CA9CCA60056C506 /* ceres.xcodeproj */,
1E1524F81CA9CCA60056C506 /* gflags.xcodeproj */,
Expand Down
11 changes: 9 additions & 2 deletions global.pri
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,10 @@ win32-g++ {
expat: PKGCONFIG += expat
cairo: PKGCONFIG += cairo
shiboken: PKGCONFIG += shiboken-py2
PYSIDE_PKG_CONFIG_PATH = $$system($$PYTHON_CONFIG --prefix)/lib/pkgconfig
pyside: PKGCONFIG += pyside-py2
INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH pkg-config --variable=includedir pyside-py2)/QtCore
INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH pkg-config --variable=includedir pyside-py2)/QtGui
pyside: INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH pkg-config --variable=includedir pyside-py2)/QtCore
pyside: INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH pkg-config --variable=includedir pyside-py2)/QtGui
python: PKGCONFIG += python-2.7
boost: LIBS += -lboost_serialization-mt
boost: LIBS += -lboost_serialization-mt
Expand Down Expand Up @@ -331,6 +332,12 @@ unix {
LIBS += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH pkg-config --libs pyside)
}
}
!macx {
PYSIDE_PKG_CONFIG_PATH = $$system($$PYTHON_CONFIG --prefix)/lib/pkgconfig
pyside: PKGCONFIG += pyside-py2
pyside: INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH pkg-config --variable=includedir pyside-py2)/QtCore
pyside: INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH pkg-config --variable=includedir pyside-py2)/QtGui
}
} #unix

*-xcode {
Expand Down

0 comments on commit eba18ef

Please sign in to comment.