X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=README.mingw;h=42b130f335035020d35fd466f723741a72b4d69f;hb=5ddf9069f0c5f487b65ef5b64dbd19a56066b350;hp=557a8e64203cc733b3bddbd72b0dd8d75f651b06;hpb=5411a2811f6dfd7172700a2efab205d8ffbb6638;p=linphone

diff --git a/README.mingw b/README.mingw
index 557a8e64..42b130f3 100644
--- a/README.mingw
+++ b/README.mingw
@@ -26,7 +26,7 @@ Download lastest linphone-deps-win32 zip from
 http://download.savannah.gnu.org/releases-noredirect/linphone/misc
 using your browser. 
 
-Download lastest gtk+ win32 bundle from http://www.gtk.org 
+Download lastest gtk+2 win32 bundle from http://www.gtk.org 
 
 Install all these three package in /:
 
@@ -40,29 +40,22 @@ cd /share/themes
 wget http://art.gnome.org/download/themes/gtk2/1122/GTK2-Outcrop.tar.gz
 tar -xvzf GTK2-Outcrop.tar.gz
 
-#Remove the special stdint.h and inttypes.h included in linphone-deps: it is for MSVC only.
-#Mingw will use the one in /mingw/include
-rm /include/stdint.h /include/inttypes.h
-
-#Remove libgcc specific libraries, only needed for MSVC:
-rm /lib/libgcc.a /lib/libmingw32.a /lib/libmingwex.a
-
-#Remove libintl from gtk, we don't need it and it conflicts with the one supplied by mingw.
-rm /lib/libintl.dll.a
-rm /include/intl.h
+#To get the translations working, remove from C:/MinGW/lib :
+libintl.a libintl.la libintl.dll.a
 
 * Download and install Inno Setup Compiler (required only if you run 'make setup.exe'). Add it to your windows Path environment variable.
 
 Get Linphone source code
 ************************
 
-Install msys-git from (http://code.google.com/p/msysgit/)
+Install msys-git from (http://code.google.com/p/msysgit/). During installation you are asked to make a choice about how line endings are treated by git.
+Choose "Checkout line endings as they are, commit as they are". THIS CHOICE IS VERY IMPORTANT. OTHERS BREAK AUTOMAKE.
 
 It is recommended that you create a directory somewhere with a path without any spaces or ~ characters, for example
 c:\sources\
 Within msys-git bash, do
 cd /c/sources
-git clone git://git.savannah.nongnu.org/linphone.git --recursive
+git clone git://git.linphone.org/linphone.git --recursive
 
 
 Building
@@ -72,18 +65,38 @@ WARNING: During the build, windows might slow down suddenly. Using ctl+alt+del t
  you might see a process 'LVpSRV.exe' or something like this that eats 90% of cpu.
 Kill it. Don't know what it is, but once killed, windows runs normally.
 
+#Compile and install tunnel (optional, available under proprietary licensing)
+
+cd tunnel && ./autogen.sh && ./configure --prefix=/usr --enable-shared --disable-static  && make && make install
+
+#Build linphone itself:
 #run autogen.sh after a git checkout or update
+
 ./autogen.sh
+
 ./configure --prefix=/opt/linphone --enable-shared --disable-static
+#note: in order to use the tunnel, append --enable-tunnel to the configure line above.
+
+#compile:
+
 make
-#will install to /opt/linphone, required for compilation of plugins.
+
+#now install to /opt/linphone, required for compilation of plugins.
+
 make install
+
 #make a binary zip of linphone
+
 make zip
+
 #additionally you can make binary installer if you have Inno Setup 5 installed in its default path
+
 make setup.exe
+
 #now you're done, you have a fresh linphone windows installer in the current directory.
 
+
+
 #build plugins
 cd mediastreamer2/plugins/msx264
 ./autogen.sh