zcy
/
dust3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build

master
Jeremy Hu 2019-12-28 17:06:15 +09:30
parent dd628b6af7
commit 6875bee519
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dust3d.pro
View File

@ -490,11 +490,16 @@ SOURCES += src/main.cpp
HEADERS += src/version.h HEADERS += src/version.h
INCLUDEPATH += thirdparty/QuadriFlow INCLUDEPATH += thirdparty/QuadriFlow/src
INCLUDEPATH += thirdparty/QuadriFlow/3rd/pcg32 INCLUDEPATH += thirdparty/QuadriFlow/3rd/pcg32
INCLUDEPATH += thirdparty/QuadriFlow/3rd/pss INCLUDEPATH += thirdparty/QuadriFlow/3rd/pss
INCLUDEPATH += thirdparty/QuadriFlow/3rd/lemon-1.3.1 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 SOURCES += thirdparty/QuadriFlow/src/adjacent-matrix.cpp
HEADERS += thirdparty/QuadriFlow/src/adjacent-matrix.hpp HEADERS += thirdparty/QuadriFlow/src/adjacent-matrix.hpp

2
thirdparty/QuadriFlow/src/config.hpp vendored
View File

@ -32,6 +32,7 @@ unsigned long long inline GetCurrentTime64() {
} // namespace qflow } // namespace qflow
// The following make_unique is to fix CXX14 in CXX11 // The following make_unique is to fix CXX14 in CXX11
#ifndef _WIN32
#include <memory> #include <memory>
namespace std { namespace std {
template<typename T, typename... Args> template<typename T, typename... Args>
@ -40,5 +41,6 @@ std::unique_ptr<T> make_unique(Args&&... args)
return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
} }
} }
#endif
#endif #endif