fix macosx compilation

diff --git a/.cproject b/.cproject
index 3ccb25959f8912c421270944e2fa3deae9a5c801..82c15ae499315c6af3ba4dc64486bed75d2acaf5 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -211,13 +211,14 @@
                                        <target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
                                                <buildCommand>make</buildCommand>
                                                <buildArguments/>
-                                               <buildTarget>all</buildTarget>
+                                               <buildTarget>install</buildTarget>
                                                <stopOnError>true</stopOnError>
                                                <useDefaultCommand>false</useDefaultCommand>
                                                <runAllBuilders>true</runAllBuilders>
                                        </target>
                                        <target name="install" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
                                                <buildCommand>make</buildCommand>
+                                               <buildArguments/>
                                                <buildTarget>install</buildTarget>
                                                <stopOnError>true</stopOnError>
                                                <useDefaultCommand>true</useDefaultCommand>

diff --git a/gtk/linphone.h b/gtk/linphone.h
index d726c0db1e7915c7e97b5de48de0ad25f396ec42..2b91749b51825301d299fd3fe4e71018560d5476 100644 (file)
--- a/gtk/linphone.h
+++ b/gtk/linphone.h
@@ -34,6 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 # define _(String) gettext (String)
 #else
 # define _(String) (String)
+# define ngettext(singular,plural,number) ((number>1) ? (plural) : (singular) )
 #endif
 
 #undef N_

diff --git a/mediastreamer2 b/mediastreamer2
index 208f4f6e36444261ad96a62eada2c1abcdf344e2..591183568886238180c1ae56df9650dd79c0fbaa 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 208f4f6e36444261ad96a62eada2c1abcdf344e2
+Subproject commit 591183568886238180c1ae56df9650dd79c0fbaa