libtransport.git Changeset - 4422329ed7e3

Changeset - 4422329ed7e3

Parent rev.

Child rev.

[Not reviewed]

Merge

4 6 5

HanzZ - 12 years ago 2013-02-17 09:42:18
hanzz.k@gmail.com

Merge branch 'master' of github.com:hanzz/libtransport

3 files changed with 8 insertions and 9 deletions:

README.win32

src/logging.cpp

src/tests/main.cpp

0 comments (0 inline, 0 general)

README.win32

➞

Show inline comments

@@ @@ -4,10 +4,11 @@ Prerequisites @@
 . Microsoft Visual C++ 2010 Express or higher edition (http://www.microsoft.com/visualstudio/en-us/products/2010-editions/visual-cpp-express)
 . Git for Windows (http://code.google.com/p/msysgit/downloads/list)
 . CMake 2.8 or newer (http://www.cmake.org/cmake/resources/software.html)
 . Python 2.x for Swiften build scripts (scons) (http://www.python.org)
 Libraries
 =========
-. Swiften library and Python for run scons (http://swift.im/git/swift)
 . Swiften library (http://swift.im/git/swift)
 . Boost 1.48 or newer (http://sourceforge.net/projects/boost/files/boost/1.49.0/)
 . Google ProtoBuf library (http://code.google.com/p/protobuf/downloads/list)
@@ @@ -37,10 +38,6 @@ launch "Visual Studio 2010 command prompt" or @@
 	scons.bat debug=no SWIFTEN_INSTALLDIR=C:\env-msvc-x64 force_configure=1
 	scons.bat debug=no SWIFTEN_INSTALLDIR=C:\env-msvc-x64 C:\env-msvc-x64
 TODO: fix in upstream
 You may need manually copy compiled 3rdParty libs to C:\env-msvc-x64\lib\3rdParty\Expat,
 C:\env-msvc-x64\lib\3rdParty\LibIDN, C:\env-msvc-x64\lib\3rdParty\Zlib
 . unpack and compile protobuf as described in its documentation.
 Run extract_includes.bat in vsprojects/ directory and move resulting vsprojects/include/google/ directory to our C:\env-msvc-x64\include
 Compile it as:
 	set CMAKE_INCLUDE_PATH=C:\env-msvc-x64\include
-	cmake . -G "NMake Makefiles" -DBOOST_INCLUDEDIR=../include/boost-1_49 -DBOOST_LIBRARYDIR=../lib -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=C:\env-msvc-x64 -DGIT_EXECUTABLE="c:\Program Files (x86)\git\bin\git.exe"
+	cmake . -G "NMake Makefiles" -DBOOST_INCLUDEDIR=../include/boost-1_49 -DBOOST_LIBRARYDIR=../lib -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=C:\env-msvc-x64 -DGIT_EXECUTABLE="c:\Program Files (x86)\git\bin\git.exe"
 	nmake
 TODO: libpurple_backend compilation
@@ \ No newline at end of file @@

src/logging.cpp

➞

Show inline comments

 				dirs.push_back(dir);
+			}
+		}
 #ifndef WIN32
 		mode_t old_cmask;
 		// create directories
 #ifndef WIN32
 		old_cmask = umask(0007);
 #endif

src/tests/main.cpp

➞

Show inline comments

@@ @@ -19,7 +19,11 @@ int main (int argc, char* argv[]) @@
+{
 #ifdef WITH_LOG4CXX
 	LoggerPtr root = Logger::getRootLogger();
 #ifndef _MSC_VER
 	root->addAppender(new FileAppender(new PatternLayout("%d %-5p %c: %m%n"), "libtransport_test.log", false));
 #else
 	root->addAppender(new FileAppender(new PatternLayout(L"%d %-5p %c: %m%n"), L"libtransport_test.log", false));
 #endif
 #endif
 	std::vector<std::string> testsToRun;

0 comments (0 inline, 0 general)