From 024c49c5bb5ec36c980ee71faba12676c60eea22 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Sat, 1 Sep 2012 15:13:31 +0300 Subject: [PATCH 1/2] Update README.win32 another readme update --- README.win32 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.win32 b/README.win32 index d1f40551..ddf2a32b 100644 --- a/README.win32 +++ b/README.win32 @@ -30,11 +30,11 @@ launch "Visual Studio 2010 command prompt" or 2. clone swift repository and build it. Don't forget to point it to our env directory: - git clone http://swift.im/git/swift + git clone git://swift.im/swift cd swift - echo boost_includedir="c:/env-msvc-x64/include" > config.py + echo boost_includedir="c:/env-msvc-x64/include/boost-1_49" > config.py echo boost_libdir="c:/env-msvc-x64/lib" >> config.py - scons.bat debug=no SWIFTEN_INSTALLDIR=C:\env-msvc-x64 + 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 @@ -52,7 +52,7 @@ Move protoc.exe to C:\env-msvc-x64\bin\ and libprotobuf.lib to C:\env-msvc-x64\l Compile it as: set CMAKE_INCLUDE_PATH=C:\env-msvc-x64\include - cmake . -G "NMake Makefiles" -DBOOST_VERSION=1.49.0 -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_VERSION=1.49.0 -DBOOST_LIBRARYDIR=../lib -DCMAKE_BUILD_TYPE=Release -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 From 739fc7af10895ac59536179476d5ea5f90c06015 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Sat, 1 Sep 2012 16:27:30 +0300 Subject: [PATCH 2/2] Update README.win32 another change --- README.win32 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.win32 b/README.win32 index ddf2a32b..d1a40c26 100644 --- a/README.win32 +++ b/README.win32 @@ -43,7 +43,7 @@ C:\env-msvc-x64\lib\3rdParty\LibIDN, C:\env-msvc-x64\lib\3rdParty\Zlib 3. unpack and compile protobuf as described in its documentation. -Run extract_includes.bat in vsprojects/ directory and move resulting google/ directory to our C:\env-msvc-x64\include +Run extract_includes.bat in vsprojects/ directory and move resulting vsprojects/include/google/ directory to our C:\env-msvc-x64\include Move protoc.exe to C:\env-msvc-x64\bin\ and libprotobuf.lib to C:\env-msvc-x64\lib