Skip to content

Commit

Permalink
Just more fixing for Windows Eclipse build of libvpx.
Browse files Browse the repository at this point in the history
  • Loading branch information
avesus committed May 16, 2014
1 parent 8811c7f commit 4142105
Show file tree
Hide file tree
Showing 3 changed files with 121 additions and 1 deletion.
120 changes: 120 additions & 0 deletions android/.cproject
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?>

<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="com.android.toolchain.gcc.976037261.259940810">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.android.toolchain.gcc.976037261.259940810" moduleId="org.eclipse.cdt.core.settings" name="Debug">
<externalSettings/>
<extensions>
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.autotools.core.ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildProperties="" description="" id="com.android.toolchain.gcc.976037261.259940810" name="Debug" parent="org.eclipse.cdt.build.core.emptycfg">
<folderInfo id="com.android.toolchain.gcc.976037261.259940810." name="/" resourcePath="">
<toolChain id="com.android.toolchain.gcc.184447137" name="com.android.toolchain.gcc" superClass="com.android.toolchain.gcc">
<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="com.android.targetPlatform.1474501576" isAbstract="false" superClass="com.android.targetPlatform"/>
<builder arguments="NDK_DEBUG=1 APP_OPTIM=debug" autoBuildTarget="" cleanBuildTarget="clean" command="ndk-build" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="com.android.builder.391918974" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder">
<outputEntries>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="obj"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="libs"/>
</outputEntries>
</builder>
<tool id="com.android.gcc.compiler.994494108" name="Android GCC Compiler" superClass="com.android.gcc.compiler">
<option id="com.android.gcc.option.includePath.585978493" superClass="com.android.gcc.option.includePath"/>
<inputType id="com.android.gcc.inputType.1019283717" superClass="com.android.gcc.inputType"/>
</tool>
</toolChain>
</folderInfo>
<fileInfo id="com.android.toolchain.gcc.976037261.259940810.283244380" name="libs-armv5te-android-gcc.mk" rcbsApplicability="disable" resourcePath="jni/libs-armv5te-android-gcc.mk" toolsToInvoke=""/>
<fileInfo id="com.android.toolchain.gcc.976037261.259940810.289270400" name="config.mk" rcbsApplicability="disable" resourcePath="jni/config.mk" toolsToInvoke=""/>
<fileInfo id="com.android.toolchain.gcc.976037261.259940810.1626450816" name="Makefile" rcbsApplicability="disable" resourcePath="jni/Makefile" toolsToInvoke=""/>
<sourceEntries>
<entry excluding="config.mk|libs-armv5te-android-gcc.mk|Makefile" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="jni"/>
</sourceEntries>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
<cconfiguration id="com.android.toolchain.gcc.976037261.958453628">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.android.toolchain.gcc.976037261.958453628" moduleId="org.eclipse.cdt.core.settings" name="Release">
<externalSettings/>
<extensions>
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.autotools.core.ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildProperties="" description="" id="com.android.toolchain.gcc.976037261.958453628" name="Release" parent="org.eclipse.cdt.build.core.emptycfg">
<folderInfo id="com.android.toolchain.gcc.976037261.958453628." name="/" resourcePath="">
<toolChain id="com.android.toolchain.gcc.55252516" name="com.android.toolchain.gcc" superClass="com.android.toolchain.gcc">
<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="com.android.targetPlatform.1979247866" isAbstract="false" superClass="com.android.targetPlatform"/>
<builder autoBuildTarget="" cleanBuildTarget="clean" enableAutoBuild="false" enableCleanBuild="false" enabledIncrementalBuild="true" id="com.android.builder.871996568" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder">
<outputEntries>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="obj"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="libs"/>
</outputEntries>
</builder>
<tool id="com.android.gcc.compiler.1368398077" name="Android GCC Compiler" superClass="com.android.gcc.compiler">
<option id="com.android.gcc.option.includePath.1947091560" superClass="com.android.gcc.option.includePath" valueType="includePath"/>
<inputType id="com.android.gcc.inputType.417193468" superClass="com.android.gcc.inputType"/>
</tool>
</toolChain>
</folderInfo>
<fileInfo id="com.android.toolchain.gcc.976037261.958453628.42702117" name="libs-armv5te-android-gcc.mk" rcbsApplicability="disable" resourcePath="jni/libs-armv5te-android-gcc.mk" toolsToInvoke=""/>
<fileInfo id="com.android.toolchain.gcc.976037261.958453628.2136766301" name="config.mk" rcbsApplicability="disable" resourcePath="jni/config.mk" toolsToInvoke=""/>
<fileInfo id="com.android.toolchain.gcc.976037261.958453628.1879292312" name="Makefile" rcbsApplicability="disable" resourcePath="jni/Makefile" toolsToInvoke=""/>
<sourceEntries>
<entry excluding="libs-armv5te-android-gcc.mk|Makefile|config.mk" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="jni"/>
</sourceEntries>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="guruchat.null.968191226" name="guruchat"/>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="refreshScope" versionNumber="2">
<configuration configurationName="Default">
<resource resourceType="PROJECT" workspacePath="/guruchat"/>
</configuration>
<configuration configurationName="Release">
<resource resourceType="PROJECT" workspacePath="/guruchat"/>
</configuration>
<configuration configurationName="Debug">
<resource resourceType="PROJECT" workspacePath="/guruchat"/>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<scannerConfigBuildInfo instanceId="com.android.toolchain.gcc.976037261.259940810;com.android.toolchain.gcc.976037261.259940810.;com.android.gcc.compiler.994494108;com.android.gcc.inputType.1019283717">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.android.AndroidPerProjectProfile"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.android.toolchain.gcc.976037261;com.android.toolchain.gcc.976037261.817521514;com.android.gcc.compiler.888897999;com.android.gcc.inputType.790940343">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.android.AndroidPerProjectProfile"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.android.toolchain.gcc.976037261.958453628;com.android.toolchain.gcc.976037261.958453628.;com.android.gcc.compiler.1368398077;com.android.gcc.inputType.417193468">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.android.AndroidPerProjectProfile"/>
</scannerConfigBuildInfo>
</storageModule>
</cproject>
2 changes: 1 addition & 1 deletion android/jni/configure_libvpx.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
./libvpx/configure --target=armv5te-android-gcc --disable-examples --disable-vp9 --disable-docs --disable-install-libs --disable-install-bins --enable-postproc --enable-realtime-only --enable-error-concealment --sdk-path=/Users/avesus/Development/android-ndk-r9d --disable-webm-io --disable-shared --enable-static --disable-runtime-cpu-detect --disable-neon
./libvpx/configure --target=armv5te-android-gcc --disable-examples --disable-vp9 --disable-docs --disable-install-libs --disable-install-bins --enable-postproc --enable-realtime-only --enable-error-concealment --sdk-path=/Users/avesus/Development/android-ndk-r9d --disable-webm-io
Binary file modified android/libs/armeabi/libvpx.so
Binary file not shown.

0 comments on commit 4142105

Please sign in to comment.