fix wrong ortp submodule

diff --git a/.cproject b/.cproject
index 0b797781c283b64c0be17772b585dc098eb8a968..5398df79f9f60ff03780c693ee31654e85783217 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -37,6 +37,51 @@
                                        </folderInfo>
                                </configuration>
                        </storageModule>
+                       <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">
@@ -120,14 +165,14 @@
                                        </scannerInfoProvider>
                                </profile>
                                <scannerConfigBuildInfo instanceId="0.2079208171">
-                                       <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+                                       <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"/>
                                        <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
                                                <buildOutputProvider>
                                                        <openAction enabled="true" filePath=""/>
                                                        <parser enabled="true"/>
                                                </buildOutputProvider>
                                                <scannerInfoProvider id="specsFile">
-                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+                                                       <runAction arguments="discovery" command="make discovery" useDefault="true"/>
                                                        <parser enabled="true"/>
                                                </scannerInfoProvider>
                                        </profile>
@@ -147,7 +192,7 @@
                                                        <parser enabled="true"/>
                                                </buildOutputProvider>
                                                <scannerInfoProvider id="specsFile">
-                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+                                                       <runAction arguments="-s -C src discovery" command="make" useDefault="true"/>
                                                        <parser enabled="true"/>
                                                </scannerInfoProvider>
                                        </profile>
@@ -203,51 +248,6 @@
                                        </profile>
                                </scannerConfigBuildInfo>
                        </storageModule>
-                       <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>
                </cconfiguration>
        </storageModule>
        <storageModule moduleId="cdtBuildSystem" version="4.0.0">

diff --git a/Makefile.am b/Makefile.am
index 899ba66310f4a33b1674c6a5066aedc014631d6e..922bb8c55abd6d66ae9aeb54bf501e090e18c908 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -227,3 +227,6 @@ bundle: $(LIBICONV_HACK)
 
 clean-local:
        rm -rf $(BUNDLEDIR)
+discovery:
+       touch specs.cpp
+       $(CC) $(CFLAGS) $(ANTLR_CFLAGS) $(CUNIT_CFLAGS) -E -P -v -dD specs.cpp

diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index 6d0a82a8df4793b650ece4f3d2a9f0fe73e7f587..7a6040d1ab5f16242036ff597296c5befc0aacf9 100644 (file)
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -93,4 +93,3 @@ AM_CFLAGS+= -DBUILD_WIZARD
 endif
 
 AM_CXXFLAGS=$(AM_CFLAGS)
-

diff --git a/oRTP b/oRTP
index a936749fac4d3e2f788a0c03b3c4ea2021b3ae13..9e186f31a97618cc77d41d5b45ee6eb73873555d 160000 (submodule)
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit a936749fac4d3e2f788a0c03b3c4ea2021b3ae13
+Subproject commit 9e186f31a97618cc77d41d5b45ee6eb73873555d