fix .cprojet

update ms2 for better audio devices handling on macosx

diff --git a/.cproject b/.cproject
index 5398df79f9f60ff03780c693ee31654e85783217..23392095d87921539e44ddce62c69f662acefe43 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -22,7 +22,7 @@
                                        <folderInfo id="0.2079208171." name="/" resourcePath="">
                                                <toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.2084203071" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
                                                        <targetPlatform binaryParser="org.eclipse.cdt.core.MachO64;org.eclipse.cdt.core.ELF" id="org.eclipse.cdt.build.core.prefbase.toolchain.2084203071.81924294" name=""/>
-                                                       <builder id="org.eclipse.cdt.build.core.settings.default.builder.731584538" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+                                                       <builder arguments="CFLAGS=&quot;-g&quot;" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.731584538" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
                                                        <tool id="org.eclipse.cdt.build.core.settings.holder.libs.1252970003" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
                                                        <tool id="org.eclipse.cdt.build.core.settings.holder.1371414073" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
                                                                <inputType id="org.eclipse.cdt.build.core.settings.holder.inType.306286573" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
@@ -40,48 +40,6 @@
                        <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
                        <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
                        <storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
-                       <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
-                               <buildTargets>
-                                       <target name="test" path="mediastreamer2/tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>all</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>true</runAllBuilders>
-                                       </target>
-                                       <target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-                                               <buildCommand>make</buildCommand>
-                                               <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>
-                                               <buildTarget>install</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>true</runAllBuilders>
-                                       </target>
-                                       <target name="doc" path="coreapi/help" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>all</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>true</runAllBuilders>
-                                       </target>
-                                       <target name="doc" path="mediastreamer2/help" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>all</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>true</runAllBuilders>
-                                       </target>
-                               </buildTargets>
-                       </storageModule>
                        <storageModule moduleId="scannerConfiguration">
                                <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
                                <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@@ -248,6 +206,47 @@
                                        </profile>
                                </scannerConfigBuildInfo>
                        </storageModule>
+                       <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
+                               <buildTargets>
+                                       <target name="test" path="mediastreamer2/tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+                                               <buildCommand>make</buildCommand>
+                                               <buildTarget>all</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>true</runAllBuilders>
+                                       </target>
+                                       <target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments>CFLAGS="-g"</buildArguments>
+                                               <buildTarget>install</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>true</runAllBuilders>
+                                       </target>
+                                       <target name="install" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments>CFLAGS="-g"</buildArguments>
+                                               <buildTarget>install</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>true</runAllBuilders>
+                                       </target>
+                                       <target name="doc" path="coreapi/help" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+                                               <buildCommand>make</buildCommand>
+                                               <buildTarget>all</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>true</runAllBuilders>
+                                       </target>
+                                       <target name="doc" path="mediastreamer2/help" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+                                               <buildCommand>make</buildCommand>
+                                               <buildTarget>all</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>true</runAllBuilders>
+                                       </target>
+                               </buildTargets>
+                       </storageModule>
                </cconfiguration>
        </storageModule>
        <storageModule moduleId="cdtBuildSystem" version="4.0.0">

diff --git a/.project b/.project
index fb926842f030114d051451465532cb9989393269..b8aa010f5b0fc4758bd5637a9c66a385e976cb4c 100644 (file)
--- a/.project
+++ b/.project
@@ -23,7 +23,7 @@
                                </dictionary>
                                <dictionary>
                                        <key>org.eclipse.cdt.make.core.buildArguments</key>
-                                       <value></value>
+                                       <value>CFLAGS=&quot;-g&quot;</value>
                                </dictionary>
                                <dictionary>
                                        <key>org.eclipse.cdt.make.core.buildCommand</key>
@@ -59,7 +59,7 @@
                                </dictionary>
                                <dictionary>
                                        <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
-                                       <value>true</value>
+                                       <value>false</value>
                                </dictionary>
                        </arguments>
                </buildCommand>

diff --git a/Makefile.am b/Makefile.am
index 922bb8c55abd6d66ae9aeb54bf501e090e18c908..5be271da4d80cd2280500e835b8c7e596e9c6afa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -229,4 +229,4 @@ clean-local:
        rm -rf $(BUNDLEDIR)
 discovery:
        touch specs.cpp
-       $(CC) $(CFLAGS) $(ANTLR_CFLAGS) $(CUNIT_CFLAGS) -E -P -v -dD specs.cpp
+       $(CC) $(CFLAGS) $(MEDIASTREAMER2_CFLAGS) $(ORTP_CFLAGS) -E -P -v -dD specs.cpp

diff --git a/configure.ac b/configure.ac
index 66b766591a04f6f6925b413feea86af6693e5096..c5db9df8b2b9bf2302eaf7acce6b4d7f3cd673bf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,7 @@ case $target in
                 ios_found=yes
         ;;
         x86_64-apple-darwin*|i686-apple-darwin*)
-                MSPLUGINS_CFLAGS=""
+        MSPLUGINS_CFLAGS=""
                dnl use macport installation
                ACLOCAL_MACOS_FLAGS="-I /opt/local/share/aclocal"
                build_macos=yes
@@ -453,7 +453,7 @@ AC_ARG_ENABLE(strict,
 
 STRICT_OPTIONS="-Wall "
 
-if test "$GCC$strictness" = "yesyes" ; then
+if test "$strictness" = "yes" ; then
        STRICT_OPTIONS="$STRICT_OPTIONS -Werror"
        CFLAGS="$CFLAGS -fno-strict-aliasing"
 fi

diff --git a/mediastreamer2 b/mediastreamer2
index 7114083338b947014bc0a5e111c96018bb1272c2..d2fdd1ce498fc99b15608be4060dac8aae0168ca 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 7114083338b947014bc0a5e111c96018bb1272c2
+Subproject commit d2fdd1ce498fc99b15608be4060dac8aae0168ca