Skip to content

Commit

Permalink
Add libtess
Browse files Browse the repository at this point in the history
  • Loading branch information
@MrKepzie
MrKepzie committed Jun 22, 2016
1 parent 0d53626 commit eb2c6df
Show file tree
Hide file tree
Showing 37 changed files with 7,192 additions and 19 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ breakpadclient.pri
breakpadpro.pri
google-breakpad/
libs/hoedown/hoedown.xcodeproj/
libs/libtess/libtess.xcodeproj/
libs/libtess/tess.xcodeproj/
libs/ceres/ceres.xcodeproj/
libs/openMVG/openMVG.xcodeproj/
libs/libmv/LibMV.xcodeproj/
Expand Down
8 changes: 4 additions & 4 deletions Engine/AppManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1612,14 +1612,14 @@ AppManager::loadPythonGroups()
findAllScriptsRecursive(d, allPlugins, &foundInit, &foundInitGui);
}
if ( foundInit.isEmpty() ) {
QString message = tr("init.py script not loaded");
QString message = tr("Info: init.py script not loaded (this is not an error and relevant only if you are using the application's Python functionnalities)");
appPTR->setLoadingStatus(message);
if ( !appPTR->isBackground() ) {
std::cout << message.toStdString() << std::endl;
}
} else {
Q_FOREACH(const QString &found, foundInit) {
QString message = tr("init.py script found and loaded at %1").arg(found);
QString message = tr("Info: init.py script found and loaded at %1").arg(found);

appPTR->setLoadingStatus(message);
if ( !appPTR->isBackground() ) {
Expand All @@ -1630,14 +1630,14 @@ AppManager::loadPythonGroups()

if ( !appPTR->isBackground() ) {
if ( foundInitGui.isEmpty() ) {
QString message = tr("initGui.py script not loaded");
QString message = tr("Info: initGui.py script not loaded (this is not an error and relevant only if you are using the application's Python functionnalities)");
appPTR->setLoadingStatus(message);
if ( !appPTR->isBackground() ) {
std::cout << message.toStdString() << std::endl;
}
} else {
Q_FOREACH(const QString &found, foundInitGui) {
QString message = tr("initGui.py script found and loaded at %1").arg(found);
QString message = tr("Info: initGui.py script found and loaded at %1").arg(found);

appPTR->setLoadingStatus(message);
if ( !appPTR->isBackground() ) {
Expand Down
67 changes: 54 additions & 13 deletions Project-xcode.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
buildPhases = (
);
dependencies = (
AC7762A51D1ACE550006A58E /* PBXTargetDependency */,
ACD67C001CEC9D1000DD2CFE /* PBXTargetDependency */,
1E15253A1CA9CD8D0056C506 /* PBXTargetDependency */,
1E15253C1CA9CD8D0056C506 /* PBXTargetDependency */,
Expand Down Expand Up @@ -80,7 +81,7 @@
isa = PBXContainerItemProxy;
containerPortal = 1E12F4B41CC6593300105A34 /* qhttpserver.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 7B66319A2D661600E54F0DA9;
remoteGlobalIDString = F82F89455E05F43CE051A79D;
remoteInfo = qhttpserver;
};
1E15250D1CA9CCA70056C506 /* PBXContainerItemProxy */ = {
Expand Down Expand Up @@ -122,35 +123,35 @@
isa = PBXContainerItemProxy;
containerPortal = 1E1524F31CA9CCA60056C506 /* ceres.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = F8CC1206D116CA04F4C59E76;
remoteGlobalIDString = 50E22BF77EADB308C87E78CC;
remoteInfo = ceres;
};
1E1525391CA9CD8D0056C506 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1E1524F81CA9CCA60056C506 /* gflags.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = AE1AD09FA66E17B98A648194;
remoteGlobalIDString = DC3A22537506A6669865251C;
remoteInfo = gflags;
};
1E15253B1CA9CD8D0056C506 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1E1524FD1CA9CCA60056C506 /* glog.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 7569DD78B40A8DF6A62CFA3E;
remoteGlobalIDString = 03DDCD43C74EEE647AD61A75;
remoteInfo = glog;
};
1E15253D1CA9CD8D0056C506 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1E1525021CA9CCA60056C506 /* LibMV.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = C7E53A7AD172AE9320949229;
remoteGlobalIDString = CEC193B6F4ECB62235821F2B;
remoteInfo = LibMV;
};
1E15253F1CA9CD8D0056C506 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1E1525071CA9CCA60056C506 /* openMVG.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 328590AF750A79D2CF9DFB9A;
remoteGlobalIDString = 6D7288D8764B97DD1E027858;
remoteInfo = openMVG;
};
1E189EC31C49475E00F1FD20 /* PBXContainerItemProxy */ = {
Expand All @@ -171,7 +172,7 @@
isa = PBXContainerItemProxy;
containerPortal = 1EADE5C718AA403700EF3180 /* Tests.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = DC7FDCA340DAC7F023377B78;
remoteGlobalIDString = AFEF7D68642F83E3811BB9B9;
remoteInfo = Tests;
};
1E306DFE1C4949BA00BAC6E3 /* PBXContainerItemProxy */ = {
Expand All @@ -192,28 +193,28 @@
isa = PBXContainerItemProxy;
containerPortal = 1E306DED1C49497200BAC6E3 /* NatronRenderer.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 32D9C4266EC8DC770A644D29;
remoteGlobalIDString = 3B61C2EC40908C23E2918B71;
remoteInfo = NatronRenderer;
};
1E306E041C4949D700BAC6E3 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1E189EBF1C49475E00F1FD20 /* Natron.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 782793A212D0A946A2611559;
remoteGlobalIDString = 91455CC2BC21CB91737B3DC6;
remoteInfo = Natron;
};
1E5F8F5718AA913D0045A477 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1EADE5C118AA403700EF3180 /* Engine.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = F82FF8B1AB092B635B8D3C44;
remoteGlobalIDString = 30EC256330269B7CAA1FCB17;
remoteInfo = Engine;
};
1E5F8F5918AA913D0045A477 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1EADE5C418AA403700EF3180 /* Gui.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 9B38B1D5C33AF4E4B0F859F7;
remoteGlobalIDString = 4AE2754265AC5F6E557A903C;
remoteInfo = Gui;
};
1E5F8F5B18AA91430045A477 /* PBXContainerItemProxy */ = {
Expand Down Expand Up @@ -258,6 +259,20 @@
remoteGlobalIDString = 1E5F8F5118AA91330045A477;
remoteInfo = libs;
};
AC7762A21D1ACE460006A58E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = AC77629C1D1ACE460006A58E /* tess.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = AC77629F1D1ACE460006A58E;
remoteInfo = tess;
};
AC7762A41D1ACE550006A58E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = AC77629C1D1ACE460006A58E /* tess.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = DCE44EEBD5943F419495A13F;
remoteInfo = tess;
};
ACD67BFD1CEC9D0900DD2CFE /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = ACD67BF71CEC9D0900DD2CFE /* hoedown.xcodeproj */;
Expand All @@ -269,7 +284,7 @@
isa = PBXContainerItemProxy;
containerPortal = ACD67BF71CEC9D0900DD2CFE /* hoedown.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 547B056CEA92922A2FCFC8AF;
remoteGlobalIDString = 68FEEA655C477C409D21050B;
remoteInfo = hoedown;
};
D7A1964518B2242500F412DA /* PBXContainerItemProxy */ = {
Expand All @@ -283,7 +298,7 @@
isa = PBXContainerItemProxy;
containerPortal = D7A1963F18B2242500F412DA /* HostSupport.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 0E116598542859DA9320C015;
remoteGlobalIDString = EA73569A7C740BC02AA20FE9;
remoteInfo = HostSupport;
};
/* End PBXContainerItemProxy section */
Expand Down Expand Up @@ -319,6 +334,7 @@
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>"; };
AC77629C1D1ACE460006A58E /* tess.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = tess.xcodeproj; path = libs/libtess/tess.xcodeproj; sourceTree = "<group>"; };
ACD67BF71CEC9D0900DD2CFE /* hoedown.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = hoedown.xcodeproj; path = libs/hoedown/hoedown.xcodeproj; sourceTree = "<group>"; };
D7A1963F18B2242500F412DA /* HostSupport.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = HostSupport.xcodeproj; path = HostSupport/HostSupport.xcodeproj; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -427,6 +443,7 @@
1E70D1631CF33B22000D2932 /* Documentation */,
1E70D1621CF33AF3000D2932 /* QMake files */,
ACD67BF71CEC9D0900DD2CFE /* hoedown.xcodeproj */,
AC77629C1D1ACE460006A58E /* tess.xcodeproj */,
1E1524F31CA9CCA60056C506 /* ceres.xcodeproj */,
1E1524F81CA9CCA60056C506 /* gflags.xcodeproj */,
1E1524FD1CA9CCA60056C506 /* glog.xcodeproj */,
Expand Down Expand Up @@ -466,6 +483,14 @@
name = Products;
sourceTree = "<group>";
};
AC77629D1D1ACE460006A58E /* Products */ = {
isa = PBXGroup;
children = (
AC7762A31D1ACE460006A58E /* libtess.a */,
);
name = Products;
sourceTree = "<group>";
};
ACD67BF81CEC9D0900DD2CFE /* Products */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -553,6 +578,10 @@
ProductGroup = 1E12F4B51CC6593300105A34 /* Products */;
ProjectRef = 1E12F4B41CC6593300105A34 /* qhttpserver.xcodeproj */;
},
{
ProductGroup = AC77629D1D1ACE460006A58E /* Products */;
ProjectRef = AC77629C1D1ACE460006A58E /* tess.xcodeproj */;
},
{
ProductGroup = 1EADE5C818AA403700EF3180 /* Products */;
ProjectRef = 1EADE5C718AA403700EF3180 /* Tests.xcodeproj */;
Expand Down Expand Up @@ -646,6 +675,13 @@
remoteRef = 1EADE5DA18AA403700EF3180 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
AC7762A31D1ACE460006A58E /* libtess.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libtess.a;
remoteRef = AC7762A21D1ACE460006A58E /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
ACD67BFE1CEC9D0900DD2CFE /* libhoedown.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
Expand Down Expand Up @@ -760,6 +796,11 @@
target = 1E5F8F5118AA91330045A477 /* libs */;
targetProxy = AC4AA6371C480E8700C92E12 /* PBXContainerItemProxy */;
};
AC7762A51D1ACE550006A58E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = tess;
targetProxy = AC7762A41D1ACE550006A58E /* PBXContainerItemProxy */;
};
ACD67C001CEC9D1000DD2CFE /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = hoedown;
Expand Down
1 change: 1 addition & 0 deletions Project.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ SUBDIRS += \
libs/openMVG \
libs/qhttpserver \
libs/hoedown \
libs/libtess \
Engine \
Renderer \
Gui \
Expand Down
48 changes: 46 additions & 2 deletions libs.pri
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ INCLUDEPATH += $$PWD/libs/gflags/src/gflags
################
# Gui
static-gui {
CONFIG += static-engine static-qhttpserver static-hoedown
CONFIG += static-engine static-qhttpserver static-hoedown static-libtess
win32-msvc*{
CONFIG(64bit) {
CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../Gui/x64/release/ -lGui
Expand Down Expand Up @@ -185,7 +185,7 @@ win32-msvc*{
# Engine

static-engine {
CONFIG += static-libmv static-openmvg static-hoedown
CONFIG += static-libmv static-openmvg static-hoedown static-libtess

win32-msvc*{
CONFIG(64bit) {
Expand Down Expand Up @@ -567,3 +567,47 @@ win32-msvc*{
else:unix: PRE_TARGETDEPS += $$OUT_PWD/../libs/hoedown/build/libhoedown.a
}
} # static-hoedown


################
# libtess

static-libtess {

INCLUDEPATH += $$PWD/libs/libtess
DEPENDPATH += $$OUT_PWD/../libs/libtess

win32-msvc*{
CONFIG(64bit) {
CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../libs/libtess/build/x64/release/ -ltess
CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../libs/libtess/build/x64/debug/ -ltess
} else {
CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../libs/libtess/build/win32/release/ -ltess
CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../libs/libtess/build/win32/debug/ -ltess
}
} else {
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../libs/libtess/build/ -ltess
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../libs/libtess/build/ -ltess
else:*-xcode:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../libs/libtess/build/Release/ -ltess
else:*-xcode:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../libs/libtess/build/Debug/ -ltess
else:unix: LIBS += -L$$OUT_PWD/../libs/libtess/build/ -ltess
}

win32-msvc*{
CONFIG(64bit) {
CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../libs/libtess/build/x64/release/tess.lib
CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../libs/libtess/build/x64/debug/tess.lib
} else {
CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../libs/libtess/build/win32/release/tess.lib
CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../libs/libtess/build/win32/debug/tess.lib
}
} else {
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../libs/libtess/build/libtess.a
else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../libs/libtess/build/libtess.a
else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../libs/libtess/build/release/libtess.lib
else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../libs/libtess/build/debug/libtess.lib
else:*-xcode:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../libs/libtess/build/Release/libtess.a
else:*-xcode:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../libs/libtess/build/Debug/libtess.a
else:unix: PRE_TARGETDEPS += $$OUT_PWD/../libs/libtess/build/libtess.a
}
} # static-libtess
Loading

0 comments on commit eb2c6df

Please sign in to comment.