diff options
| -rw-r--r-- | 3rdParty/Boost/boost/system/error_code.hpp | 2 | ||||
| -rw-r--r-- | Swift/QtUI/Swift.pro | 5 | ||||
| -rw-r--r-- | Swift/QtUI/fixwindows.pri | 2 | ||||
| -rwxr-xr-x | Swift/QtUI/qmakeish.py | 4 | 
4 files changed, 9 insertions, 4 deletions
| diff --git a/3rdParty/Boost/boost/system/error_code.hpp b/3rdParty/Boost/boost/system/error_code.hpp index 8f795d7..03ac91e 100644 --- a/3rdParty/Boost/boost/system/error_code.hpp +++ b/3rdParty/Boost/boost/system/error_code.hpp @@ -493,7 +493,7 @@ namespace boost  #include <boost/config/abi_suffix.hpp> // pops abi_prefix.hpp pragmas  # ifdef BOOST_ERROR_CODE_HEADER_ONLY -#   include <boost/../libs/system/src/error_code.cpp> +//#   include <boost/../libs/system/src/error_code.cpp>  # endif  #endif // BOOST_ERROR_CODE_HPP diff --git a/Swift/QtUI/Swift.pro b/Swift/QtUI/Swift.pro index 5b9ea72..23042bb 100644 --- a/Swift/QtUI/Swift.pro +++ b/Swift/QtUI/Swift.pro @@ -22,10 +22,11 @@ else {  	HAVE_OPENSSL=yes  	DEFINES += HAVE_OPENSSL -	INCLUDEPATH += F:/OpenSSL/include -	LIBS += -LF:/OpenSSL/lib/VC -llibeay32MT -lssleay32MT +	INCLUDEPATH += C:/OpenSSL/include +	LIBS += -LC:/OpenSSL/lib/VC -llibeay32MT -lssleay32MT  	include(Swiften.pri) +	include(fixwindows.pri)  }  win32 { diff --git a/Swift/QtUI/fixwindows.pri b/Swift/QtUI/fixwindows.pri new file mode 100644 index 0000000..4d924ed --- /dev/null +++ b/Swift/QtUI/fixwindows.pri @@ -0,0 +1,2 @@ +INCLUDEPATH += ../../3rdParty/SQLite/ +LIBS += Dnsapi.lib diff --git a/Swift/QtUI/qmakeish.py b/Swift/QtUI/qmakeish.py index 178696d..c5b302d 100755 --- a/Swift/QtUI/qmakeish.py +++ b/Swift/QtUI/qmakeish.py @@ -58,6 +58,8 @@ for line in makefile :          conditional = "win32"        elif conditional == "MACOSX" :          conditional = "mac" +      elif conditional == "BUILD_SWIFT" : +	conditional = "true"        elif match.group(2).startswith("HAVE_") or match.group(2).startswith("USE_") :          conditional = "!isEmpty(" + match.group(2) + ")"        else : @@ -80,7 +82,7 @@ for line in makefile :        continue      match = re.match("(\w+)_SOURCES (\+?)= (.*)", line)  -    if match and match.group(1) in ["SWIFTEN", "ZLIB", "LIBIDN", "BOOST", "EXPAT", "SWIFT_CONTROLLERS"] : +    if match and match.group(1) in ["SWIFTEN", "ZLIB", "LIBIDN", "BOOST", "EXPAT", "SWIFT_CONTROLLERS", "SQLITE"] :        inSources = processSourcesLine(match.group(3))        continue | 
 Swift
 Swift