libtransport.git Changeset - 31be2a37f859

Changeset - 31be2a37f859

Parent rev.

Child rev.

[Not reviewed]

Merge

3 20 8

Jan Kaluza - 9 years ago 2016-01-21 17:08:10
hanzz.k@gmail.com

Merge pull request #101 from vitalyster/win32

win32 build fixes

5 files changed with 15 insertions and 16 deletions:

CMakeLists.txt

backends/twitter/libtwitcurl/twitcurl.h

libtransport/CMakeLists.txt

libtransport/FileTransferManager.cpp

spectrum/src/frontends/xmpp/XMPPFrontend.cpp

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -274,20 +274,19 @@ message("Version : " ${SPECTRUM_VERSION}) @@
 if (SQLITE3_FOUND)
 	ADD_DEFINITIONS(-DWITH_SQLITE)
 if (WIN32)
 	include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3")
 	message("SQLite3           : bundled")
 else (WIN32)
 	include_directories(${SQLITE3_INCLUDE_DIR})
 	message("SQLite3           : yes")
 endif (WIN32)
 else (SQLITE3_FOUND)
 	if (WIN32)
 		ADD_DEFINITIONS(-DWITH_SQLITE)
 		include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3")
 		message("SQLite3           : bundled")
 	else()
 		set(SQLITE3_LIBRARIES "")
 		if(ENABLE_SQLITE3)
 			message("SQLite3           : no (install sqlite3)")
 		else(ENABLE_SQLITE3)
 			message("SQLite3           : no (user disabled)")
 		endif()
 	set(SQLITE3_LIBRARIES "")
 	if(ENABLE_SQLITE3)
 		message("SQLite3           : no (install sqlite3)")
 	else(ENABLE_SQLITE3)
 		message("SQLite3           : no (user disabled)")
 	endif()
 endif (SQLITE3_FOUND)

backends/twitter/libtwitcurl/twitcurl.h

➞

Show inline comments

@@ @@ -5,6 +5,7 @@ @@
 #include <sstream>
 #include <cstring>
 #include <vector>
 #include <algorithm>
 #include "oauthlib.h"
 #include "curl/curl.h"

libtransport/CMakeLists.txt

➞

Show inline comments

@@ @@ -15,7 +15,6 @@ else() @@
 	string(REGEX REPLACE "[^;]+;?/OpenSSL/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
 	string(REGEX REPLACE "[^;]+;?/SecureTransport/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
 endif()
 FILE(GLOB HEADERS ../include/transport/*.h)
 include_directories(../spectrum/src/frontends/xmpp/)
@@ @@ -48,7 +47,7 @@ find_package(CURL) @@
 if (WIN32)
 	include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3")
 	TARGET_LINK_LIBRARIES(transport transport-plugin sqlite3 ${PQXX_LIBRARY} ${CURL_LIBRARIES ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} psapi.lib)
+	TARGET_LINK_LIBRARIES(transport transport-plugin sqlite3 ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} psapi.lib)
 else()
 	TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY} ${PROTOBUF_LIBRARY})
 endif()

libtransport/FileTransferManager.cpp

➞

Show inline comments

@@ @@ -83,7 +83,7 @@ FileTransferManager::~FileTransferManager() { @@
+}
 FileTransferManager::Transfer FileTransferManager::sendFile(User *user, Buddy *buddy, boost::shared_ptr<Swift::ReadBytestream> byteStream, const Swift::StreamInitiationFileInfo &info) {
-// 	FileTransferManager::Transfer transfer;
  	FileTransferManager::Transfer transfer;
 // 	transfer.from = buddy->getJID();
 // 	transfer.to = user->getJID();
 // 	transfer.readByteStream = byteStream;
 // // 		ft->onStateChange.connect(boost::bind(&User::handleFTStateChanged, this, _1, Buddy::JIDToLegacyName(from), info.getName(), info.getSize(), id));
 // // 		transfer.ft->start();
 // // 	}
-// 	return transfer;
  	return transfer;
+}
+}

spectrum/src/frontends/xmpp/XMPPFrontend.cpp

➞

Show inline comments

@@ @@ -347,7 +347,7 @@ void XMPPFrontend::handleConnected() { @@
+}
 void XMPPFrontend::handleServerStopped(boost::optional<Swift::BoostConnectionServer::Error> e) {
-	if(e != NULL ) {
 	if(e) {
 		if(*e == Swift::BoostConnectionServer::Conflict) {
 			LOG4CXX_INFO(logger, "Port "<< CONFIG_INT(m_config, "service.port") << " already in use! Stopping server..");
 			if (CONFIG_INT(m_config, "service.port") == 5347) {

0 comments (0 inline, 0 general)