diff --git a/dust3d.pro b/dust3d.pro index 3664a929..f1308e95 100644 --- a/dust3d.pro +++ b/dust3d.pro @@ -490,11 +490,16 @@ SOURCES += src/main.cpp HEADERS += src/version.h -INCLUDEPATH += thirdparty/QuadriFlow +INCLUDEPATH += thirdparty/QuadriFlow/src INCLUDEPATH += thirdparty/QuadriFlow/3rd/pcg32 INCLUDEPATH += thirdparty/QuadriFlow/3rd/pss INCLUDEPATH += thirdparty/QuadriFlow/3rd/lemon-1.3.1 +win32 { +# Fix error LNK2001: unresolved external symbol "struct lemon::Invalid const lemon::INVALID" (?INVALID@lemon@@3UInvalid@1@B) + DEFINES += LEMON_ONLY_TEMPLATES +} + SOURCES += thirdparty/QuadriFlow/src/adjacent-matrix.cpp HEADERS += thirdparty/QuadriFlow/src/adjacent-matrix.hpp diff --git a/thirdparty/QuadriFlow/src/config.hpp b/thirdparty/QuadriFlow/src/config.hpp index 63b7b542..31284dc1 100755 --- a/thirdparty/QuadriFlow/src/config.hpp +++ b/thirdparty/QuadriFlow/src/config.hpp @@ -32,6 +32,7 @@ unsigned long long inline GetCurrentTime64() { } // namespace qflow // The following make_unique is to fix CXX14 in CXX11 +#ifndef _WIN32 #include namespace std { template @@ -40,5 +41,6 @@ std::unique_ptr make_unique(Args&&... args) return std::unique_ptr(new T(std::forward(args)...)); } } +#endif #endif