diff options
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | build/arm-wince-vs8/armasmv5.rules | 20 | ||||
| -rw-r--r-- | build/arm-wince-vs8/armasmv6.rules | 20 | ||||
| -rw-r--r-- | build/arm-wince-vs8/armasmxscale.rules | 20 | ||||
| -rw-r--r-- | build/arm-wince-vs8/obj_int_extract.bat | 13 | ||||
| -rw-r--r-- | build/arm-wince-vs8/vpx.sln | 88 | ||||
| -rwxr-xr-x | build/make/gen_msvs_proj.sh | 249 | ||||
| -rwxr-xr-x | build/make/gen_msvs_sln.sh | 3 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | libs.mk | 23 | ||||
| -rw-r--r-- | solution.mk | 27 | ||||
| -rw-r--r-- | wince_wmain_adapter.cpp | 50 |
12 files changed, 0 insertions, 521 deletions
@@ -45,18 +45,14 @@ COMPILING THE APPLICATIONS/LIBRARIES: armv5te-linux-rvct armv5te-linux-gcc armv5te-symbian-gcc - armv5te-wince-vs8 armv6-darwin-gcc armv6-linux-rvct armv6-linux-gcc armv6-symbian-gcc - armv6-wince-vs8 iwmmxt-linux-rvct iwmmxt-linux-gcc - iwmmxt-wince-vs8 iwmmxt2-linux-rvct iwmmxt2-linux-gcc - iwmmxt2-wince-vs8 armv7-linux-rvct armv7-linux-gcc mips32-linux-gcc diff --git a/build/arm-wince-vs8/armasmv5.rules b/build/arm-wince-vs8/armasmv5.rules deleted file mode 100644 index efb80bcb2..000000000 --- a/build/arm-wince-vs8/armasmv5.rules +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<VisualStudioToolFile
- Name="armasm"
- Version="8.00"
- >
- <Rules>
- <CustomBuildRule
- Name="ARMASM"
- DisplayName="Armasm Assembler"
- CommandLine="armasm -o "$(IntDir)\$(InputName).obj" $(InputPath) -32 -ARCH 5
"
- Outputs="$(IntDir)\$(InputName).obj"
- FileExtensions="*.asm"
- ExecutionDescription="Assembling $(InputName).asm"
- ShowOnlyRuleProperties="false"
- >
- <Properties>
- </Properties>
- </CustomBuildRule>
- </Rules>
-</VisualStudioToolFile>
diff --git a/build/arm-wince-vs8/armasmv6.rules b/build/arm-wince-vs8/armasmv6.rules deleted file mode 100644 index 67c6bc9d8..000000000 --- a/build/arm-wince-vs8/armasmv6.rules +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<VisualStudioToolFile
- Name="armasm"
- Version="8.00"
- >
- <Rules>
- <CustomBuildRule
- Name="ARMASM"
- DisplayName="Armasm Assembler"
- CommandLine="armasm -o "$(IntDir)\$(InputName).obj" $(InputPath) -32 -ARCH 6
"
- Outputs="$(IntDir)\$(InputName).obj"
- FileExtensions="*.asm"
- ExecutionDescription="Assembling $(InputName).asm"
- ShowOnlyRuleProperties="false"
- >
- <Properties>
- </Properties>
- </CustomBuildRule>
- </Rules>
-</VisualStudioToolFile>
diff --git a/build/arm-wince-vs8/armasmxscale.rules b/build/arm-wince-vs8/armasmxscale.rules deleted file mode 100644 index 4da9d1e82..000000000 --- a/build/arm-wince-vs8/armasmxscale.rules +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<VisualStudioToolFile
- Name="armasm"
- Version="8.00"
- >
- <Rules>
- <CustomBuildRule
- Name="ARMASM"
- DisplayName="Armasm Assembler"
- CommandLine="armasm -o "$(IntDir)\$(InputName).obj" $(InputPath) -32 -cpu XSCALE
"
- Outputs="$(IntDir)\$(InputName).obj"
- FileExtensions="*.asm"
- ExecutionDescription="Assembling $(InputName).asm"
- ShowOnlyRuleProperties="false"
- >
- <Properties>
- </Properties>
- </CustomBuildRule>
- </Rules>
-</VisualStudioToolFile>
diff --git a/build/arm-wince-vs8/obj_int_extract.bat b/build/arm-wince-vs8/obj_int_extract.bat deleted file mode 100644 index a361fc346..000000000 --- a/build/arm-wince-vs8/obj_int_extract.bat +++ /dev/null @@ -1,13 +0,0 @@ -@echo off -REM Copyright (c) 2010 The WebM project authors. All Rights Reserved. -REM -REM Use of this source code is governed by a BSD-style license -REM that can be found in the LICENSE file in the root of the source -REM tree. An additional intellectual property rights grant can be found -REM in the file PATENTS. All contributing project authors may -REM be found in the AUTHORS file in the root of the source tree. -echo on - - -cl /I ".\\" /I "..\vp6_decoder_sdk" /I "..\vp6_decoder_sdk\vpx_ports" /D "NDEBUG" /D "_WIN32_WCE=0x420" /D "UNDER_CE" /D "WIN32_PLATFORM_PSPC" /D "WINCE" /D "_LIB" /D "ARM" /D "_ARM_" /D "_UNICODE" /D "UNICODE" /FD /EHsc /MT /GS- /fp:fast /GR- /Fo"Pocket_PC_2003__ARMV4_\%1/" /Fd"Pocket_PC_2003__ARMV4_\%1/vc80.pdb" /W3 /nologo /c /TC ..\vp6_decoder_sdk\vp6_decoder\algo\common\arm\dec_asm_offsets_arm.c
-obj_int_extract.exe rvds "Pocket_PC_2003__ARMV4_\%1/dec_asm_offsets_arm.obj"
diff --git a/build/arm-wince-vs8/vpx.sln b/build/arm-wince-vs8/vpx.sln deleted file mode 100644 index 3e49929f2..000000000 --- a/build/arm-wince-vs8/vpx.sln +++ /dev/null @@ -1,88 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example", "example.vcproj", "{BA5FE66F-38DD-E034-F542-B1578C5FB950}" - ProjectSection(ProjectDependencies) = postProject - {DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74} = {DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74} - {E1360C65-D375-4335-8057-7ED99CC3F9B2} = {E1360C65-D375-4335-8057-7ED99CC3F9B2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj_int_extract", "obj_int_extract.vcproj", "{E1360C65-D375-4335-8057-7ED99CC3F9B2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vpx", "vpx.vcproj", "{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}" - ProjectSection(ProjectDependencies) = postProject - {E1360C65-D375-4335-8057-7ED99CC3F9B2} = {E1360C65-D375-4335-8057-7ED99CC3F9B2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xma", "xma.vcproj", "{A955FC4A-73F1-44F7-135E-30D84D32F022}" - ProjectSection(ProjectDependencies) = postProject - {E1360C65-D375-4335-8057-7ED99CC3F9B2} = {E1360C65-D375-4335-8057-7ED99CC3F9B2} - {DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74} = {DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|Pocket PC 2003 (ARMV4) = Debug|Pocket PC 2003 (ARMV4) - Debug|Win32 = Debug|Win32 - Release|Mixed Platforms = Release|Mixed Platforms - Release|Pocket PC 2003 (ARMV4) = Release|Pocket PC 2003 (ARMV4) - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BA5FE66F-38DD-E034-F542-B1578C5FB950}.Debug|Mixed Platforms.ActiveCfg = Debug|Pocket PC 2003 (ARMV4) - {BA5FE66F-38DD-E034-F542-B1578C5FB950}.Debug|Mixed Platforms.Build.0 = Debug|Pocket PC 2003 (ARMV4) - {BA5FE66F-38DD-E034-F542-B1578C5FB950}.Debug|Mixed Platforms.Deploy.0 = Debug|Pocket PC 2003 (ARMV4) - {BA5FE66F-38DD-E034-F542-B1578C5FB950}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Pocket PC 2003 (ARMV4) - {BA5FE66F-38DD-E034-F542-B1578C5FB950}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug|Pocket PC 2003 (ARMV4) - {BA5FE66F-38DD-E034-F542-B1578C5FB950}.Debug|Pocket PC 2003 (ARMV4).Deploy.0 = Debug|Pocket PC 2003 (ARMV4) - {BA5FE66F-38DD-E034-F542-B1578C5FB950}.Debug|Win32.ActiveCfg = Debug|Pocket PC 2003 (ARMV4) - {BA5FE66F-38DD-E034-F542-B1578C5FB950}.Release|Mixed Platforms.ActiveCfg = Release|Pocket PC 2003 (ARMV4) - {BA5FE66F-38DD-E034-F542-B1578C5FB950}.Release|Mixed Platforms.Build.0 = Release|Pocket PC 2003 (ARMV4) - {BA5FE66F-38DD-E034-F542-B1578C5FB950}.Release|Mixed Platforms.Deploy.0 = Release|Pocket PC 2003 (ARMV4) - {BA5FE66F-38DD-E034-F542-B1578C5FB950}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Pocket PC 2003 (ARMV4) - {BA5FE66F-38DD-E034-F542-B1578C5FB950}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release|Pocket PC 2003 (ARMV4) - {BA5FE66F-38DD-E034-F542-B1578C5FB950}.Release|Pocket PC 2003 (ARMV4).Deploy.0 = Release|Pocket PC 2003 (ARMV4) - {BA5FE66F-38DD-E034-F542-B1578C5FB950}.Release|Win32.ActiveCfg = Release|Pocket PC 2003 (ARMV4) - {E1360C65-D375-4335-8057-7ED99CC3F9B2}.Debug|Mixed Platforms.ActiveCfg = Release|Win32 - {E1360C65-D375-4335-8057-7ED99CC3F9B2}.Debug|Mixed Platforms.Build.0 = Release|Win32 - {E1360C65-D375-4335-8057-7ED99CC3F9B2}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32 - {E1360C65-D375-4335-8057-7ED99CC3F9B2}.Debug|Win32.ActiveCfg = Release|Win32 - {E1360C65-D375-4335-8057-7ED99CC3F9B2}.Debug|Win32.Build.0 = Release|Win32 - {E1360C65-D375-4335-8057-7ED99CC3F9B2}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {E1360C65-D375-4335-8057-7ED99CC3F9B2}.Release|Mixed Platforms.Build.0 = Release|Win32 - {E1360C65-D375-4335-8057-7ED99CC3F9B2}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32 - {E1360C65-D375-4335-8057-7ED99CC3F9B2}.Release|Win32.ActiveCfg = Release|Win32 - {E1360C65-D375-4335-8057-7ED99CC3F9B2}.Release|Win32.Build.0 = Release|Win32 - {DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Debug|Mixed Platforms.ActiveCfg = Debug|Pocket PC 2003 (ARMV4) - {DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Debug|Mixed Platforms.Build.0 = Debug|Pocket PC 2003 (ARMV4) - {DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Debug|Mixed Platforms.Deploy.0 = Debug|Pocket PC 2003 (ARMV4) - {DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Pocket PC 2003 (ARMV4) - {DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug|Pocket PC 2003 (ARMV4) - {DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Debug|Pocket PC 2003 (ARMV4).Deploy.0 = Debug|Pocket PC 2003 (ARMV4) - {DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Debug|Win32.ActiveCfg = Debug|Pocket PC 2003 (ARMV4) - {DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Release|Mixed Platforms.ActiveCfg = Release|Pocket PC 2003 (ARMV4) - {DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Release|Mixed Platforms.Build.0 = Release|Pocket PC 2003 (ARMV4) - {DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Release|Mixed Platforms.Deploy.0 = Release|Pocket PC 2003 (ARMV4) - {DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Pocket PC 2003 (ARMV4) - {DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release|Pocket PC 2003 (ARMV4) - {DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Release|Pocket PC 2003 (ARMV4).Deploy.0 = Release|Pocket PC 2003 (ARMV4) - {DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Release|Win32.ActiveCfg = Release|Pocket PC 2003 (ARMV4) - {A955FC4A-73F1-44F7-135E-30D84D32F022}.Debug|Mixed Platforms.ActiveCfg = Debug|Pocket PC 2003 (ARMV4) - {A955FC4A-73F1-44F7-135E-30D84D32F022}.Debug|Mixed Platforms.Build.0 = Debug|Pocket PC 2003 (ARMV4) - {A955FC4A-73F1-44F7-135E-30D84D32F022}.Debug|Mixed Platforms.Deploy.0 = Debug|Pocket PC 2003 (ARMV4) - {A955FC4A-73F1-44F7-135E-30D84D32F022}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Pocket PC 2003 (ARMV4) - {A955FC4A-73F1-44F7-135E-30D84D32F022}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug|Pocket PC 2003 (ARMV4) - {A955FC4A-73F1-44F7-135E-30D84D32F022}.Debug|Pocket PC 2003 (ARMV4).Deploy.0 = Debug|Pocket PC 2003 (ARMV4) - {A955FC4A-73F1-44F7-135E-30D84D32F022}.Debug|Win32.ActiveCfg = Debug|Pocket PC 2003 (ARMV4) - {A955FC4A-73F1-44F7-135E-30D84D32F022}.Release|Mixed Platforms.ActiveCfg = Release|Pocket PC 2003 (ARMV4) - {A955FC4A-73F1-44F7-135E-30D84D32F022}.Release|Mixed Platforms.Build.0 = Release|Pocket PC 2003 (ARMV4) - {A955FC4A-73F1-44F7-135E-30D84D32F022}.Release|Mixed Platforms.Deploy.0 = Release|Pocket PC 2003 (ARMV4) - {A955FC4A-73F1-44F7-135E-30D84D32F022}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Pocket PC 2003 (ARMV4) - {A955FC4A-73F1-44F7-135E-30D84D32F022}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release|Pocket PC 2003 (ARMV4) - {A955FC4A-73F1-44F7-135E-30D84D32F022}.Release|Pocket PC 2003 (ARMV4).Deploy.0 = Release|Pocket PC 2003 (ARMV4) - {A955FC4A-73F1-44F7-135E-30D84D32F022}.Release|Win32.ActiveCfg = Release|Pocket PC 2003 (ARMV4) - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/build/make/gen_msvs_proj.sh b/build/make/gen_msvs_proj.sh index 584477f92..5921a2b10 100755 --- a/build/make/gen_msvs_proj.sh +++ b/build/make/gen_msvs_proj.sh @@ -281,9 +281,6 @@ case "$target" in x86*) keyword="ManagedCProj" ;; - arm*|iwmmx*) - keyword="Win32Proj" - ;; *) die "Unsupported target $target!" esac @@ -298,29 +295,9 @@ case "$target" in asm_Debug_cmdline="yasm -Xvc -g cv8 -f \$(PlatformName) ${yasmincs} "\$(InputPath)"" asm_Release_cmdline="yasm -Xvc -f \$(PlatformName) ${yasmincs} "\$(InputPath)"" ;; - arm*|iwmmx*) - case "${name}" in - obj_int_extract) platforms[0]="Win32" - ;; - *) platforms[0]="Pocket PC 2003 (ARMV4)" - ;; - esac - ;; *) die "Unsupported target $target!" esac -# List Command-line Arguments for this target -case "$target" in - arm*|iwmmx*) - if [ "$name" == "example" ];then - ARGU="--codec vp6 --flipuv --progress _bnd.vp6" - fi - if [ "$name" == "xma" ];then - ARGU="--codec vp6 -h 240 -w 320 -v" - fi - ;; -esac - generate_vcproj() { case "$proj_kind" in exe) vs_ConfigurationType=1 @@ -348,21 +325,6 @@ generate_vcproj() { case "$target" in x86*) $uses_asm && tag ToolFile RelativePath="$self_dirname/../x86-msvs/yasm.rules" ;; - arm*|iwmmx*) - if [ "$name" == "vpx" ];then - case "$target" in - armv5*) - tag ToolFile RelativePath="$self_dirname/../arm-wince-vs8/armasmv5.rules" - ;; - armv6*) - tag ToolFile RelativePath="$self_dirname/../arm-wince-vs8/armasmv6.rules" - ;; - iwmmxt*) - tag ToolFile RelativePath="$self_dirname/../arm-wince-vs8/armasmxscale.rules" - ;; - esac - fi - ;; esac close_tag ToolFiles @@ -376,64 +338,6 @@ generate_vcproj() { ConfigurationType="$vs_ConfigurationType" \ CharacterSet="1" - if [ "$target" == "armv6-wince-vs8" ] || [ "$target" == "armv5te-wince-vs8" ] || [ "$target" == "iwmmxt-wince-vs8" ] || [ "$target" == "iwmmxt2-wince-vs8" ];then - case "$name" in - vpx) tag Tool \ - Name="VCPreBuildEventTool" \ - CommandLine="call obj_int_extract.bat \$(ConfigurationName)" - tag Tool \ - Name="VCMIDLTool" \ - TargetEnvironment="1" - tag Tool \ - Name="VCCLCompilerTool" \ - ExecutionBucket="7" \ - Optimization="0" \ - AdditionalIncludeDirectories="$incs" \ - PreprocessorDefinitions="_DEBUG;_WIN32_WCE=\$(CEVER);UNDER_CE;\$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;\$(ARCHFAM);\$(_ARCHFAM_);_UNICODE;UNICODE;" \ - MinimalRebuild="true" \ - RuntimeLibrary="1" \ - BufferSecurityCheck="false" \ - UsePrecompiledHeader="0" \ - WarningLevel="3" \ - DebugInformationFormat="1" \ - CompileAs="1" - tag Tool \ - Name="VCResourceCompilerTool" \ - PreprocessorDefinitions="_DEBUG;_WIN32_WCE=\$(CEVER);UNDER_CE;\$(PLATFORMDEFINES)" \ - Culture="1033" \ - AdditionalIncludeDirectories="\$(IntDir)" \ - ;; - example|xma) tag Tool \ - Name="VCCLCompilerTool" \ - ExecutionBucket="7" \ - Optimization="0" \ - AdditionalIncludeDirectories="$incs" \ - PreprocessorDefinitions="_DEBUG;_WIN32_WCE=\$(CEVER);UNDER_CE;\$(PLATFORMDEFINES);WINCE;DEBUG;_CONSOLE;\$(ARCHFAM);\$(_ARCHFAM_);_UNICODE;UNICODE;" \ - MinimalRebuild="true" \ - RuntimeLibrary="1" \ - BufferSecurityCheck="false" \ - UsePrecompiledHeader="0" \ - WarningLevel="3" \ - DebugInformationFormat="1" \ - CompileAs="1" - tag Tool \ - Name="VCResourceCompilerTool" \ - PreprocessorDefinitions="_DEBUG;_WIN32_WCE=\$(CEVER);UNDER_CE;\$(PLATFORMDEFINES)" \ - Culture="1033" \ - AdditionalIncludeDirectories="\$(IntDir)" \ - ;; - obj_int_extract) tag Tool \ - Name="VCCLCompilerTool" \ - Optimization="0" \ - AdditionalIncludeDirectories="$incs" \ - PreprocessorDefinitions="WIN32;DEBUG;_CONSOLE" \ - RuntimeLibrary="1" \ - WarningLevel="3" \ - DebugInformationFormat="1" \ - ;; - esac - fi - case "$target" in x86*) tag Tool \ Name="VCCLCompilerTool" \ @@ -461,39 +365,10 @@ generate_vcproj() { ProgramDatabaseFile="\$(OutDir)/${name}.pdb" \ ;; - arm*|iwmmx*) - case "$name" in - obj_int_extract) tag Tool \ - Name="VCLinkerTool" \ - OutputFile="${name}.exe" \ - GenerateDebugInformation="true" - ;; - *) tag Tool \ - Name="VCLinkerTool" \ - AdditionalDependencies="$debug_libs" \ - OutputFile="\$(OutDir)/${name}.exe" \ - LinkIncremental="2" \ - AdditionalLibraryDirectories="${libdirs};"..\lib/$plat_no_ws"" \ - DelayLoadDLLs="\$(NOINHERIT)" \ - GenerateDebugInformation="true" \ - ProgramDatabaseFile="\$(OutDir)/${name}.pdb" \ - SubSystem="9" \ - StackReserveSize="65536" \ - StackCommitSize="4096" \ - EntryPointSymbol="mainWCRTStartup" \ - TargetMachine="3" - ;; - esac - ;; esac ;; lib) case "$target" in - arm*|iwmmx*) tag Tool \ - Name="VCLibrarianTool" \ - AdditionalOptions=" /subsystem:windowsce,4.20 /machine:ARM" \ - OutputFile="\$(OutDir)/${name}.lib" \ - ;; *) tag Tool \ Name="VCLibrarianTool" \ OutputFile="\$(OutDir)/${name}${lib_sfx}d.lib" \ @@ -510,20 +385,6 @@ generate_vcproj() { $link_opts esac - if [ "$target" == "armv6-wince-vs8" ] || [ "$target" == "armv5te-wince-vs8" ] || [ "$target" == "iwmmxt-wince-vs8" ] || [ "$target" == "iwmmxt2-wince-vs8" ];then - case "$name" in - vpx) tag DeploymentTool \ - ForceDirty="-1" \ - RegisterOutput="0" - ;; - example|xma) tag DeploymentTool \ - ForceDirty="-1" \ - RegisterOutput="0" - tag DebuggerTool \ - Arguments="${ARGU}" - ;; - esac - fi close_tag Configuration open_tag Configuration \ @@ -534,65 +395,6 @@ generate_vcproj() { CharacterSet="1" \ WholeProgramOptimization="0" - if [ "$target" == "armv6-wince-vs8" ] || [ "$target" == "armv5te-wince-vs8" ] || [ "$target" == "iwmmxt-wince-vs8" ] || [ "$target" == "iwmmxt2-wince-vs8" ];then - case "$name" in - vpx) tag Tool \ - Name="VCPreBuildEventTool" \ - CommandLine="call obj_int_extract.bat \$(ConfigurationName)" - tag Tool \ - Name="VCMIDLTool" \ - TargetEnvironment="1" - tag Tool \ - Name="VCCLCompilerTool" \ - ExecutionBucket="7" \ - Optimization="2" \ - FavorSizeOrSpeed="1" \ - AdditionalIncludeDirectories="$incs" \ - PreprocessorDefinitions="NDEBUG;_WIN32_WCE=\$(CEVER);UNDER_CE;\$(PLATFORMDEFINES);WINCE;_LIB;\$(ARCHFAM);\$(_ARCHFAM_);_UNICODE;UNICODE;" \ - RuntimeLibrary="0" \ - BufferSecurityCheck="false" \ - UsePrecompiledHeader="0" \ - WarningLevel="3" \ - DebugInformationFormat="0" \ - CompileAs="1" - tag Tool \ - Name="VCResourceCompilerTool" \ - PreprocessorDefinitions="NDEBUG;_WIN32_WCE=\$(CEVER);UNDER_CE;\$(PLATFORMDEFINES)" \ - Culture="1033" \ - AdditionalIncludeDirectories="\$(IntDir)" \ - ;; - example|xma) tag Tool \ - Name="VCCLCompilerTool" \ - ExecutionBucket="7" \ - Optimization="2" \ - FavorSizeOrSpeed="1" \ - AdditionalIncludeDirectories="$incs" \ - PreprocessorDefinitions="NDEBUG;_WIN32_WCE=\$(CEVER);UNDER_CE;\$(PLATFORMDEFINES);WINCE;_CONSOLE;\$(ARCHFAM);\$(_ARCHFAM_);_UNICODE;UNICODE;" \ - RuntimeLibrary="0" \ - BufferSecurityCheck="false" \ - UsePrecompiledHeader="0" \ - WarningLevel="3" \ - DebugInformationFormat="0" \ - CompileAs="1" - tag Tool \ - Name="VCResourceCompilerTool" \ - PreprocessorDefinitions="NDEBUG;_WIN32_WCE=\$(CEVER);UNDER_CE;\$(PLATFORMDEFINES)" \ - Culture="1033" \ - AdditionalIncludeDirectories="\$(IntDir)" \ - ;; - obj_int_extract) tag Tool \ - Name="VCCLCompilerTool" \ - AdditionalIncludeDirectories="$incs" \ - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" \ - RuntimeLibrary="0" \ - UsePrecompiledHeader="0" \ - WarningLevel="3" \ - Detect64BitPortabilityProblems="true" \ - DebugInformationFormat="0" \ - ;; - esac - fi - case "$target" in x86*) tag Tool \ Name="VCCLCompilerTool" \ @@ -616,46 +418,10 @@ generate_vcproj() { AdditionalDependencies="$libs \$(NoInherit)" \ AdditionalLibraryDirectories="$libdirs" \ ;; - arm*|iwmmx*) - case "$name" in - obj_int_extract) tag Tool \ - Name="VCLinkerTool" \ - OutputFile="${name}.exe" \ - LinkIncremental="1" \ - GenerateDebugInformation="false" \ - SubSystem="0" \ - OptimizeReferences="0" \ - EnableCOMDATFolding="0" \ - TargetMachine="0" - ;; - *) tag Tool \ - Name="VCLinkerTool" \ - AdditionalDependencies="$libs" \ - OutputFile="\$(OutDir)/${name}.exe" \ - LinkIncremental="1" \ - AdditionalLibraryDirectories="${libdirs};"..\lib/$plat_no_ws"" \ - DelayLoadDLLs="\$(NOINHERIT)" \ - GenerateDebugInformation="true" \ - ProgramDatabaseFile="\$(OutDir)/${name}.pdb" \ - SubSystem="9" \ - StackReserveSize="65536" \ - StackCommitSize="4096" \ - OptimizeReferences="2" \ - EnableCOMDATFolding="2" \ - EntryPointSymbol="mainWCRTStartup" \ - TargetMachine="3" - ;; - esac - ;; esac ;; lib) case "$target" in - arm*|iwmmx*) tag Tool \ - Name="VCLibrarianTool" \ - AdditionalOptions=" /subsystem:windowsce,4.20 /machine:ARM" \ - OutputFile="\$(OutDir)/${name}.lib" \ - ;; *) tag Tool \ Name="VCLibrarianTool" \ OutputFile="\$(OutDir)/${name}${lib_sfx}.lib" \ @@ -672,21 +438,6 @@ generate_vcproj() { $link_opts esac - if [ "$target" == "armv6-wince-vs8" ] || [ "$target" == "armv5te-wince-vs8" ] || [ "$target" == "iwmmxt-wince-vs8" ] || [ "$target" == "iwmmxt2-wince-vs8" ];then - case "$name" in - vpx) tag DeploymentTool \ - ForceDirty="-1" \ - RegisterOutput="0" - ;; - example|xma) tag DeploymentTool \ - ForceDirty="-1" \ - RegisterOutput="0" - tag DebuggerTool \ - Arguments="${ARGU}" - ;; - esac - fi - close_tag Configuration done close_tag Configurations diff --git a/build/make/gen_msvs_sln.sh b/build/make/gen_msvs_sln.sh index 9cf090067..240678b64 100755 --- a/build/make/gen_msvs_sln.sh +++ b/build/make/gen_msvs_sln.sh @@ -139,9 +139,6 @@ process_global() { echo "${indent}${proj_guid}.${config}.ActiveCfg = ${config}" echo "${indent}${proj_guid}.${config}.Build.0 = ${config}" - if [ "$target" == "armv6-wince-vs8" ] || [ "$target" == "armv5te-wince-vs8" ] || [ "$target" == "iwmmxt-wince-vs8" ] || [ "$target" == "iwmmxt2-wince-vs8" ];then - echo "${indent}${proj_guid}.${config}.Deploy.0 = ${config}" - fi done IFS=${IFS_bak} done @@ -80,19 +80,15 @@ all_platforms="${all_platforms} armv5te-linux-rvct" all_platforms="${all_platforms} armv5te-linux-gcc" all_platforms="${all_platforms} armv5te-none-rvct" all_platforms="${all_platforms} armv5te-symbian-gcc" -all_platforms="${all_platforms} armv5te-wince-vs8" all_platforms="${all_platforms} armv6-darwin-gcc" all_platforms="${all_platforms} armv6-linux-rvct" all_platforms="${all_platforms} armv6-linux-gcc" all_platforms="${all_platforms} armv6-none-rvct" all_platforms="${all_platforms} armv6-symbian-gcc" -all_platforms="${all_platforms} armv6-wince-vs8" all_platforms="${all_platforms} iwmmxt-linux-rvct" all_platforms="${all_platforms} iwmmxt-linux-gcc" -all_platforms="${all_platforms} iwmmxt-wince-vs8" all_platforms="${all_platforms} iwmmxt2-linux-rvct" all_platforms="${all_platforms} iwmmxt2-linux-gcc" -all_platforms="${all_platforms} iwmmxt2-wince-vs8" all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8 all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8 all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8 @@ -126,29 +126,6 @@ INSTALL-SRCS-$(CONFIG_CODEC_SRCS) += $(call enabled,CODEC_EXPORTS) ifeq ($(CONFIG_EXTERNAL_BUILD),yes) ifeq ($(CONFIG_MSVS),yes) -ifeq ($(ARCH_ARM),yes) -ifeq ($(HAVE_ARMV5TE),yes) -ARM_ARCH=v5 -endif -ifeq ($(HAVE_ARMV6),yes) -ARM_ARCH=v6 -endif -obj_int_extract.vcproj: $(SRC_PATH_BARE)/build/make/obj_int_extract.c - @cp $(SRC_PATH_BARE)/build/arm-wince-vs8/obj_int_extract.bat . - @echo " [CREATE] $@" - $(SRC_PATH_BARE)/build/make/gen_msvs_proj.sh\ - --exe\ - --target=$(TOOLCHAIN)\ - $(if $(CONFIG_STATIC_MSVCRT),--static-crt) \ - --name=obj_int_extract\ - --proj-guid=E1360C65-D375-4335-8057-7ED99CC3F9B2\ - --out=$@ $^\ - -I".";"$(SRC_PATH_BARE)" - -PROJECTS-$(BUILD_LIBVPX) += obj_int_extract.vcproj -PROJECTS-$(BUILD_LIBVPX) += obj_int_extract.bat -endif - vpx.def: $(call enabled,CODEC_EXPORTS) @echo " [CREATE] $@" $(SRC_PATH_BARE)/build/make/gen_msvs_def.sh\ diff --git a/solution.mk b/solution.mk index 6d2c08d06..bef00883f 100644 --- a/solution.mk +++ b/solution.mk @@ -9,32 +9,6 @@ ## -ifeq ($(ARCH_ARM),yes) -ARM_DEVELOP=no -ARM_DEVELOP:=$(if $(filter %vpx.vcproj,$(wildcard *.vcproj)),yes) - -ifeq ($(ARM_DEVELOP),yes) -vpx.sln: - @echo " [COPY] $@" - @cp $(SRC_PATH_BARE)/build/arm-wince-vs8/vpx.sln . -PROJECTS-yes += vpx.sln -else -vpx.sln: $(wildcard *.vcproj) - @echo " [CREATE] $@" - $(SRC_PATH_BARE)/build/make/gen_msvs_sln.sh \ - $(if $(filter %vpx.vcproj,$^),--dep=vpxdec:vpx) \ - $(if $(filter %vpx.vcproj,$^),--dep=xma:vpx) \ - --ver=$(CONFIG_VS_VERSION)\ - --target=$(TOOLCHAIN)\ - --out=$@ $^ -vpx.sln.mk: vpx.sln - @true - -PROJECTS-yes += vpx.sln vpx.sln.mk --include vpx.sln.mk -endif - -else vpx.sln: $(wildcard *.vcproj) @echo " [CREATE] $@" $(SRC_PATH_BARE)/build/make/gen_msvs_sln.sh \ @@ -48,7 +22,6 @@ vpx.sln.mk: vpx.sln PROJECTS-yes += vpx.sln vpx.sln.mk -include vpx.sln.mk -endif # Always install this file, as it is an unconditional post-build rule. INSTALL_MAPS += src/% $(SRC_PATH_BARE)/% diff --git a/wince_wmain_adapter.cpp b/wince_wmain_adapter.cpp deleted file mode 100644 index 57f880a6e..000000000 --- a/wince_wmain_adapter.cpp +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2010 The WebM project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - - -/* This program is created to take command arguments and pass - * them to main() in example.c or example_xma.c, because the - * correspending part in example.c or example_xma.c does not - * work on Pocket PC platform. - * To modify the command arguments, go to "Property" page and - * fill in "Command arguments." For example: - * --codec vp6 --flipuv --progress _bnd.vp6 - */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#define MAX_NUM_ARG 64 -#define MAX_SIZ_ARG 512 - -extern "C" -{ - int main(int argc, char **argv); -} - -int wmain(int argc, wchar_t **argv) { - char *cargv[MAX_NUM_ARG]; - char chargv[MAX_SIZ_ARG]; - int ret; - - /* transform command line arguments from (wchar_t *) to (char *) */ - for(int i=0; i<argc; i++) { - wcstombs( chargv, argv[i], sizeof(chargv)); - cargv[i] = _strdup(chargv); - } - - ret = main(argc, (char **)cargv); - - //free the memory located by _strdup() - for(int i=0; i<argc; i++) - free(cargv[i]); - - return ret; -} |