Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Remove Avian from WP8

  • Loading branch information...
commit ce167c4befcf5bdb84f6f6505d7066aec93a3a09 1 parent 066eee5
Alexey Pelykh alexey-pelykh authored
2  .gitignore
View
@@ -10,5 +10,3 @@
!/.nuget/
!/OsmAnd/
!/OsmAndNativeComponent/
-!/OsmAndJavaCore/
-!/Avian/
9 Avian/.gitignore
View
@@ -1,9 +0,0 @@
-# Visual Studio specific files
-/*.suo
-/*.sdf
-/*.opensdf
-/*.user
-/*.filters
-
-# Visual Studio output directories
-/*/
98 Avian/Avian.vcxproj
View
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|ARM">
- <Configuration>Debug</Configuration>
- <Platform>ARM</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|ARM">
- <Configuration>Release</Configuration>
- <Platform>ARM</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <ItemGroup>
- <None Include="all.cmd" />
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{68EB6A92-65D9-4560-B744-216913E4A38F}</ProjectGuid>
- <Keyword>MakeFileProj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Makefile</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
- <ConfigurationType>Makefile</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Makefile</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
- <ConfigurationType>Makefile</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <NMakeBuildCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) build</NMakeBuildCommandLine>
- <NMakeOutput>$(ProjectDir)..\..\avian\core\build\wp8-i386-debug-bootimage\jvm.winmd</NMakeOutput>
- <NMakeCleanCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) clean</NMakeCleanCommandLine>
- <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
- <NMakeReBuildCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) rebuild</NMakeReBuildCommandLine>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
- <NMakeBuildCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) build</NMakeBuildCommandLine>
- <NMakeOutput>$(ProjectDir)..\..\avian\core\build\wp8-arm-debug-bootimage\jvm.winmd</NMakeOutput>
- <NMakeCleanCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) clean</NMakeCleanCommandLine>
- <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
- <NMakeReBuildCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) rebuild</NMakeReBuildCommandLine>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <NMakeBuildCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) build</NMakeBuildCommandLine>
- <NMakeOutput>$(ProjectDir)..\..\avian\core\build\wp8-i386-bootimage\jvm.winmd</NMakeOutput>
- <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
- <NMakeReBuildCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) rebuild</NMakeReBuildCommandLine>
- <NMakeCleanCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) clean</NMakeCleanCommandLine>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
- <NMakeBuildCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) build</NMakeBuildCommandLine>
- <NMakeOutput>$(ProjectDir)..\..\avian\core\build\wp8-arm-bootimage\jvm.winmd</NMakeOutput>
- <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
- <NMakeReBuildCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) rebuild</NMakeReBuildCommandLine>
- <NMakeCleanCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) clean</NMakeCleanCommandLine>
- </PropertyGroup>
- <ItemDefinitionGroup>
- </ItemDefinitionGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
47 Avian/all.cmd
View
@@ -1,47 +0,0 @@
-@echo off
-
-REM Detect avian location
-set avian=%~dp0..\..\avian\core
-echo Avian: %avian%
-for /F "tokens=*" %%i in ('cygpath -u %avian%') do set avian_cygpath=%%i
-
-REM Get cygwin path
-for /F "tokens=*" %%i in ('cygpath -w /usr/bin') do set cygwin_usr_bin=%%i
-for /F "tokens=*" %%i in ('cygpath -w /usr/sbin') do set cygwin_usr_sbin=%%i
-for /F "tokens=*" %%i in ('cygpath -w /usr/local/bin') do set cygwin_usr_local_bin=%%i
-
-REM Detect avian-compatible architecture
-if "%1"=="x86" (
- set arch=i386
-) else if "%1"=="ARM" (
- set arch=arm
-) else (
- echo Invalid target: %1
- exit /b -1
-)
-echo Architecture: %arch%
-
-REM Detect avian-compatible build mode
-if "%2"=="Debug" (
- set mode=debug
-) else if "%2"=="Release" (
- set mode=fast
-) else (
- echo Invalid configuration: %2
- exit /b -1
-)
-echo Mode: %mode%
-
-REM Perform actions requested
-set PATH=%cygwin_usr_bin%;%cygwin_usr_sbin%;%cygwin_usr_local_bin%;%PATH%
-if "%3"=="build" (
- make -C %avian_cygpath% platform=wp8 arch=%arch% mode=%mode%
-) else if "%3"=="rebuild" (
- make -C %avian_cygpath% platform=wp8 arch=%arch% mode=%mode% clean
- make -C %avian_cygpath% platform=wp8 arch=%arch% mode=%mode%
-) else if "%3"=="clean" (
- make -C %avian_cygpath% platform=wp8 arch=%arch% mode=%mode% clean
-) else (
- echo Invalid command: %3
- exit /b -1
-)
102 OsmAnd WP8.sln → OsmAnd.sln
View
@@ -10,24 +10,24 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{EB5797
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Externals", "Externals", "{36839C5C-87EA-4E9E-B771-0876DA4DCCBF}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat", "..\core\targets\wp8\expat\expat.vcxproj", "{BEDB7DDC-B4A1-4B00-A17D-F8D5130CDADD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat", "..\core\externals\expat\expat_wp8.vcxproj", "{BEDB7DDC-B4A1-4B00-A17D-F8D5130CDADD}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "..\core\targets\wp8\freetype\freetype.vcxproj", "{8B51F873-C975-4CD1-9BCB-1AB46DCF11AF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "..\core\externals\freetype\freetype_wp8.vcxproj", "{8B51F873-C975-4CD1-9BCB-1AB46DCF11AF}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giflib", "..\core\targets\wp8\giflib\giflib.vcxproj", "{E47D2892-ED07-49B7-BA3B-BC9DA99673B5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giflib", "..\core\externals\giflib\giflib_wp8.vcxproj", "{E47D2892-ED07-49B7-BA3B-BC9DA99673B5}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "harfbuzz", "..\core\targets\wp8\harfbuzz\harfbuzz.vcxproj", "{E98090E5-46AF-4279-B9DF-F69E62EE5CCE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "harfbuzz", "..\core\externals\harfbuzz\harfbuzz_wp8.vcxproj", "{E98090E5-46AF-4279-B9DF-F69E62EE5CCE}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg", "..\core\targets\wp8\jpeg\jpeg.vcxproj", "{FE5E17EF-149F-4760-9D0A-45A855749D17}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg", "..\core\externals\jpeg\jpeg_wp8.vcxproj", "{FE5E17EF-149F-4760-9D0A-45A855749D17}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\core\targets\wp8\libpng\libpng.vcxproj", "{CDE91EF3-9C7A-4EB0-938D-24A726E9E635}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\core\externals\libpng\libpng_wp8.vcxproj", "{CDE91EF3-9C7A-4EB0-938D-24A726E9E635}"
ProjectSection(ProjectDependencies) = postProject
{0AA1EE83-8554-47DE-A7CF-544619A3D209} = {0AA1EE83-8554-47DE-A7CF-544619A3D209}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\core\targets\wp8\zlib\zlib.vcxproj", "{0AA1EE83-8554-47DE-A7CF-544619A3D209}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\core\externals\zlib\zlib_wp8.vcxproj", "{0AA1EE83-8554-47DE-A7CF-544619A3D209}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia", "..\core\targets\wp8\skia\skia.vcxproj", "{C8654AC8-B707-45A0-A838-355E247220D8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia", "..\core\externals\skia\skia_wp8.vcxproj", "{C8654AC8-B707-45A0-A838-355E247220D8}"
ProjectSection(ProjectDependencies) = postProject
{8B51F873-C975-4CD1-9BCB-1AB46DCF11AF} = {8B51F873-C975-4CD1-9BCB-1AB46DCF11AF}
{E47D2892-ED07-49B7-BA3B-BC9DA99673B5} = {E47D2892-ED07-49B7-BA3B-BC9DA99673B5}
@@ -37,46 +37,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia", "..\core\targets\wp8
{CDE91EF3-9C7A-4EB0-938D-24A726E9E635} = {CDE91EF3-9C7A-4EB0-938D-24A726E9E635}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "protobuf", "..\core\targets\wp8\protobuf\protobuf.vcxproj", "{447A0949-EDB6-4681-8532-EF2FBF25D313}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "protobuf", "..\core\externals\protobuf\protobuf_wp8.vcxproj", "{447A0949-EDB6-4681-8532-EF2FBF25D313}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OsmAndCore", "..\core\targets\wp8\OsmAndCore\OsmAndCore.vcxproj", "{76B6346B-9BCB-4953-9DF7-1D7B07D6952E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OsmAndCore", "..\core\OsmAndCore_wp8.vcxproj", "{76B6346B-9BCB-4953-9DF7-1D7B07D6952E}"
ProjectSection(ProjectDependencies) = postProject
{447A0949-EDB6-4681-8532-EF2FBF25D313} = {447A0949-EDB6-4681-8532-EF2FBF25D313}
{C8654AC8-B707-45A0-A838-355E247220D8} = {C8654AC8-B707-45A0-A838-355E247220D8}
EndProjectSection
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Avian", "Avian", "{810ABE78-A641-4E7E-B34B-385EA42D438D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\avian\wp8\zlib\zlib.vcxproj", "{94DC73B4-6542-411C-B96F-F153BA6D242E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ThreadEmulation", "..\avian\wp8\thread-emulation\ThreadEmulation.vcxproj", "{8AF9A869-B43B-44DE-ADA4-94DD5ACE6C81}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AvianInteropClient", "..\avian\wp8\interop\avian-interop-client\AvianInteropClient.vcxproj", "{13427079-F020-473D-B861-EAA73D9F53A4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvianInteropHost", "..\avian\wp8\interop\avian-interop-host\AvianInteropHost.csproj", "{212FCFA2-AD49-4A20-99ED-3F2FB2179776}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OsmAnd", "OsmAnd\OsmAnd.csproj", "{DDFC9D98-742E-4E9B-A51F-A01FDDF7583E}"
- ProjectSection(ProjectDependencies) = postProject
- {68EB6A92-65D9-4560-B744-216913E4A38F} = {68EB6A92-65D9-4560-B744-216913E4A38F}
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OsmAndNativeComponent", "OsmAndNativeComponent\OsmAndNativeComponent.vcxproj", "{B05B65E4-0159-4A5B-B6A3-B73CF14E405B}"
- ProjectSection(ProjectDependencies) = postProject
- {7824CA1D-C0A2-4497-B94F-A686F79D8D6A} = {7824CA1D-C0A2-4497-B94F-A686F79D8D6A}
- {68EB6A92-65D9-4560-B744-216913E4A38F} = {68EB6A92-65D9-4560-B744-216913E4A38F}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Avian", "Avian\Avian.vcxproj", "{68EB6A92-65D9-4560-B744-216913E4A38F}"
- ProjectSection(ProjectDependencies) = postProject
- {8AF9A869-B43B-44DE-ADA4-94DD5ACE6C81} = {8AF9A869-B43B-44DE-ADA4-94DD5ACE6C81}
- {13427079-F020-473D-B861-EAA73D9F53A4} = {13427079-F020-473D-B861-EAA73D9F53A4}
- {94DC73B4-6542-411C-B96F-F153BA6D242E} = {94DC73B4-6542-411C-B96F-F153BA6D242E}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OsmAndJavaCore", "OsmAndJavaCore\OsmAndJavaCore.vcxproj", "{7824CA1D-C0A2-4497-B94F-A686F79D8D6A}"
- ProjectSection(ProjectDependencies) = postProject
- {68EB6A92-65D9-4560-B744-216913E4A38F} = {68EB6A92-65D9-4560-B744-216913E4A38F}
- EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -166,38 +137,6 @@ Global
{76B6346B-9BCB-4953-9DF7-1D7B07D6952E}.Release|ARM.Build.0 = Release|ARM
{76B6346B-9BCB-4953-9DF7-1D7B07D6952E}.Release|x86.ActiveCfg = Release|Win32
{76B6346B-9BCB-4953-9DF7-1D7B07D6952E}.Release|x86.Build.0 = Release|Win32
- {94DC73B4-6542-411C-B96F-F153BA6D242E}.Debug|ARM.ActiveCfg = Debug|ARM
- {94DC73B4-6542-411C-B96F-F153BA6D242E}.Debug|ARM.Build.0 = Debug|ARM
- {94DC73B4-6542-411C-B96F-F153BA6D242E}.Debug|x86.ActiveCfg = Debug|Win32
- {94DC73B4-6542-411C-B96F-F153BA6D242E}.Debug|x86.Build.0 = Debug|Win32
- {94DC73B4-6542-411C-B96F-F153BA6D242E}.Release|ARM.ActiveCfg = Release|ARM
- {94DC73B4-6542-411C-B96F-F153BA6D242E}.Release|ARM.Build.0 = Release|ARM
- {94DC73B4-6542-411C-B96F-F153BA6D242E}.Release|x86.ActiveCfg = Release|Win32
- {94DC73B4-6542-411C-B96F-F153BA6D242E}.Release|x86.Build.0 = Release|Win32
- {8AF9A869-B43B-44DE-ADA4-94DD5ACE6C81}.Debug|ARM.ActiveCfg = Debug|ARM
- {8AF9A869-B43B-44DE-ADA4-94DD5ACE6C81}.Debug|ARM.Build.0 = Debug|ARM
- {8AF9A869-B43B-44DE-ADA4-94DD5ACE6C81}.Debug|x86.ActiveCfg = Debug|Win32
- {8AF9A869-B43B-44DE-ADA4-94DD5ACE6C81}.Debug|x86.Build.0 = Debug|Win32
- {8AF9A869-B43B-44DE-ADA4-94DD5ACE6C81}.Release|ARM.ActiveCfg = Release|ARM
- {8AF9A869-B43B-44DE-ADA4-94DD5ACE6C81}.Release|ARM.Build.0 = Release|ARM
- {8AF9A869-B43B-44DE-ADA4-94DD5ACE6C81}.Release|x86.ActiveCfg = Release|Win32
- {8AF9A869-B43B-44DE-ADA4-94DD5ACE6C81}.Release|x86.Build.0 = Release|Win32
- {13427079-F020-473D-B861-EAA73D9F53A4}.Debug|ARM.ActiveCfg = Debug|ARM
- {13427079-F020-473D-B861-EAA73D9F53A4}.Debug|ARM.Build.0 = Debug|ARM
- {13427079-F020-473D-B861-EAA73D9F53A4}.Debug|x86.ActiveCfg = Debug|Win32
- {13427079-F020-473D-B861-EAA73D9F53A4}.Debug|x86.Build.0 = Debug|Win32
- {13427079-F020-473D-B861-EAA73D9F53A4}.Release|ARM.ActiveCfg = Release|ARM
- {13427079-F020-473D-B861-EAA73D9F53A4}.Release|ARM.Build.0 = Release|ARM
- {13427079-F020-473D-B861-EAA73D9F53A4}.Release|x86.ActiveCfg = Release|Win32
- {13427079-F020-473D-B861-EAA73D9F53A4}.Release|x86.Build.0 = Release|Win32
- {212FCFA2-AD49-4A20-99ED-3F2FB2179776}.Debug|ARM.ActiveCfg = Debug|ARM
- {212FCFA2-AD49-4A20-99ED-3F2FB2179776}.Debug|ARM.Build.0 = Debug|ARM
- {212FCFA2-AD49-4A20-99ED-3F2FB2179776}.Debug|x86.ActiveCfg = Debug|x86
- {212FCFA2-AD49-4A20-99ED-3F2FB2179776}.Debug|x86.Build.0 = Debug|x86
- {212FCFA2-AD49-4A20-99ED-3F2FB2179776}.Release|ARM.ActiveCfg = Release|ARM
- {212FCFA2-AD49-4A20-99ED-3F2FB2179776}.Release|ARM.Build.0 = Release|ARM
- {212FCFA2-AD49-4A20-99ED-3F2FB2179776}.Release|x86.ActiveCfg = Release|x86
- {212FCFA2-AD49-4A20-99ED-3F2FB2179776}.Release|x86.Build.0 = Release|x86
{DDFC9D98-742E-4E9B-A51F-A01FDDF7583E}.Debug|ARM.ActiveCfg = Debug|ARM
{DDFC9D98-742E-4E9B-A51F-A01FDDF7583E}.Debug|ARM.Build.0 = Debug|ARM
{DDFC9D98-742E-4E9B-A51F-A01FDDF7583E}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -218,22 +157,6 @@ Global
{B05B65E4-0159-4A5B-B6A3-B73CF14E405B}.Release|ARM.Build.0 = Release|ARM
{B05B65E4-0159-4A5B-B6A3-B73CF14E405B}.Release|x86.ActiveCfg = Release|Win32
{B05B65E4-0159-4A5B-B6A3-B73CF14E405B}.Release|x86.Build.0 = Release|Win32
- {68EB6A92-65D9-4560-B744-216913E4A38F}.Debug|ARM.ActiveCfg = Debug|ARM
- {68EB6A92-65D9-4560-B744-216913E4A38F}.Debug|ARM.Build.0 = Debug|ARM
- {68EB6A92-65D9-4560-B744-216913E4A38F}.Debug|x86.ActiveCfg = Debug|Win32
- {68EB6A92-65D9-4560-B744-216913E4A38F}.Debug|x86.Build.0 = Debug|Win32
- {68EB6A92-65D9-4560-B744-216913E4A38F}.Release|ARM.ActiveCfg = Release|ARM
- {68EB6A92-65D9-4560-B744-216913E4A38F}.Release|ARM.Build.0 = Release|ARM
- {68EB6A92-65D9-4560-B744-216913E4A38F}.Release|x86.ActiveCfg = Release|Win32
- {68EB6A92-65D9-4560-B744-216913E4A38F}.Release|x86.Build.0 = Release|Win32
- {7824CA1D-C0A2-4497-B94F-A686F79D8D6A}.Debug|ARM.ActiveCfg = Debug|ARM
- {7824CA1D-C0A2-4497-B94F-A686F79D8D6A}.Debug|ARM.Build.0 = Debug|ARM
- {7824CA1D-C0A2-4497-B94F-A686F79D8D6A}.Debug|x86.ActiveCfg = Debug|Win32
- {7824CA1D-C0A2-4497-B94F-A686F79D8D6A}.Debug|x86.Build.0 = Debug|Win32
- {7824CA1D-C0A2-4497-B94F-A686F79D8D6A}.Release|ARM.ActiveCfg = Release|ARM
- {7824CA1D-C0A2-4497-B94F-A686F79D8D6A}.Release|ARM.Build.0 = Release|ARM
- {7824CA1D-C0A2-4497-B94F-A686F79D8D6A}.Release|x86.ActiveCfg = Release|Win32
- {7824CA1D-C0A2-4497-B94F-A686F79D8D6A}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -248,10 +171,5 @@ Global
{0AA1EE83-8554-47DE-A7CF-544619A3D209} = {36839C5C-87EA-4E9E-B771-0876DA4DCCBF}
{C8654AC8-B707-45A0-A838-355E247220D8} = {36839C5C-87EA-4E9E-B771-0876DA4DCCBF}
{447A0949-EDB6-4681-8532-EF2FBF25D313} = {36839C5C-87EA-4E9E-B771-0876DA4DCCBF}
- {94DC73B4-6542-411C-B96F-F153BA6D242E} = {810ABE78-A641-4E7E-B34B-385EA42D438D}
- {8AF9A869-B43B-44DE-ADA4-94DD5ACE6C81} = {810ABE78-A641-4E7E-B34B-385EA42D438D}
- {13427079-F020-473D-B861-EAA73D9F53A4} = {810ABE78-A641-4E7E-B34B-385EA42D438D}
- {212FCFA2-AD49-4A20-99ED-3F2FB2179776} = {810ABE78-A641-4E7E-B34B-385EA42D438D}
- {68EB6A92-65D9-4560-B744-216913E4A38F} = {810ABE78-A641-4E7E-B34B-385EA42D438D}
EndGlobalSection
EndGlobal
22 OsmAnd/OsmAnd.csproj
View
@@ -127,14 +127,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\avian\wp8\interop\avian-interop-client\AvianInteropClient.vcxproj">
- <Project>{13427079-F020-473D-B861-EAA73D9F53A4}</Project>
- <Name>AvianInteropClient</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\avian\wp8\interop\avian-interop-host\AvianInteropHost.csproj">
- <Project>{212FCFA2-AD49-4A20-99ED-3F2FB2179776}</Project>
- <Name>AvianInteropHost</Name>
- </ProjectReference>
<ProjectReference Include="..\OsmAndNativeComponent\OsmAndNativeComponent.vcxproj">
<Project>{B05B65E4-0159-4A5B-B6A3-B73CF14E405B}</Project>
<Name>OsmAndNativeComponent</Name>
@@ -143,19 +135,19 @@
<ItemGroup>
<Reference Include="jvm" Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<HintPath>$(ProjectDir)..\..\avian\core\build\wp8-i386-debug-bootimage\jvm.winmd</HintPath>
- <SpecificVersion>False</SpecificVersion>
+ <SpecificVersion>False</SpecificVersion>
</Reference>
- <Reference Include="jvm" Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <Reference Include="jvm" Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<HintPath>$(ProjectDir)..\..\avian\core\build\wp8-i386-bootimage\jvm.winmd</HintPath>
- <SpecificVersion>False</SpecificVersion>
+ <SpecificVersion>False</SpecificVersion>
</Reference>
- <Reference Include="jvm" Condition=" '$(Configuration)|$(Platform)' == 'Debug|ARM' ">
+ <Reference Include="jvm" Condition=" '$(Configuration)|$(Platform)' == 'Debug|ARM' ">
<HintPath>$(ProjectDir)..\..\avian\core\build\wp8-arm-debug-bootimage\jvm.winmd</HintPath>
- <SpecificVersion>False</SpecificVersion>
+ <SpecificVersion>False</SpecificVersion>
</Reference>
- <Reference Include="jvm" Condition=" '$(Configuration)|$(Platform)' == 'Release|ARM' ">
+ <Reference Include="jvm" Condition=" '$(Configuration)|$(Platform)' == 'Release|ARM' ">
<HintPath>$(ProjectDir)..\..\avian\core\build\wp8-arm-bootimage\jvm.winmd</HintPath>
- <SpecificVersion>False</SpecificVersion>
+ <SpecificVersion>False</SpecificVersion>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" />
9 OsmAndJavaCore/.gitignore
View
@@ -1,9 +0,0 @@
-# Visual Studio specific files
-/*.suo
-/*.sdf
-/*.opensdf
-/*.user
-/*.filters
-
-# Visual Studio output directories
-/*/
110 OsmAndJavaCore/OsmAndJavaCore.vcxproj
View
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|ARM">
- <Configuration>Debug</Configuration>
- <Platform>ARM</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|ARM">
- <Configuration>Release</Configuration>
- <Platform>ARM</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <ItemGroup>
- <None Include="all.cmd" />
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{7824CA1D-C0A2-4497-B94F-A686F79D8D6A}</ProjectGuid>
- <Keyword>MakeFileProj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Makefile</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
- <ConfigurationType>Makefile</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Makefile</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
- <ConfigurationType>Makefile</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <NMakeOutput>
- </NMakeOutput>
- <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
- <NMakeBuildCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) "$(ProjectDir)..\..\binaries\wp8\$(ProjectName)\$(Platform)\$(Configuration)" build</NMakeBuildCommandLine>
- <NMakeReBuildCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) "$(ProjectDir)..\..\binaries\wp8\$(ProjectName)\$(Platform)\$(Configuration)" rebuild</NMakeReBuildCommandLine>
- <NMakeCleanCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) "$(ProjectDir)..\..\binaries\wp8\$(ProjectName)\$(Platform)\$(Configuration)" clean</NMakeCleanCommandLine>
- <OutDir>$(ProjectDir)..\..\binaries\wp8\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(ProjectDir)..\..\binaries\wp8\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
- <NMakeOutput>
- </NMakeOutput>
- <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
- <NMakeBuildCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) "$(ProjectDir)..\..\binaries\wp8\$(ProjectName)\$(Platform)\$(Configuration)" build</NMakeBuildCommandLine>
- <NMakeReBuildCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) "$(ProjectDir)..\..\binaries\wp8\$(ProjectName)\$(Platform)\$(Configuration)" rebuild</NMakeReBuildCommandLine>
- <NMakeCleanCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) "$(ProjectDir)..\..\binaries\wp8\$(ProjectName)\$(Platform)\$(Configuration)" clean</NMakeCleanCommandLine>
- <OutDir>$(ProjectDir)..\..\binaries\wp8\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(ProjectDir)..\..\binaries\wp8\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <NMakeOutput>
- </NMakeOutput>
- <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
- <NMakeBuildCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) "$(ProjectDir)..\..\binaries\wp8\$(ProjectName)\$(Platform)\$(Configuration)" build</NMakeBuildCommandLine>
- <NMakeReBuildCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) "$(ProjectDir)..\..\binaries\wp8\$(ProjectName)\$(Platform)\$(Configuration)" rebuild</NMakeReBuildCommandLine>
- <NMakeCleanCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) "$(ProjectDir)..\..\binaries\wp8\$(ProjectName)\$(Platform)\$(Configuration)" clean</NMakeCleanCommandLine>
- <OutDir>$(ProjectDir)..\..\binaries\wp8\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(ProjectDir)..\..\binaries\wp8\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
- <NMakeOutput>
- </NMakeOutput>
- <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
- <NMakeBuildCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) "$(ProjectDir)..\..\binaries\wp8\$(ProjectName)\$(Platform)\$(Configuration)" build</NMakeBuildCommandLine>
- <NMakeReBuildCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) "$(ProjectDir)..\..\binaries\wp8\$(ProjectName)\$(Platform)\$(Configuration)" rebuild</NMakeReBuildCommandLine>
- <NMakeCleanCommandLine>$(ProjectDir)all.cmd $(PlatformTarget) $(Configuration) "$(ProjectDir)..\..\binaries\wp8\$(ProjectName)\$(Platform)\$(Configuration)" clean</NMakeCleanCommandLine>
- <OutDir>$(ProjectDir)..\..\binaries\wp8\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(ProjectDir)..\..\binaries\wp8\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
- </PropertyGroup>
- <ItemDefinitionGroup>
- </ItemDefinitionGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
54 OsmAndJavaCore/all.cmd
View
@@ -1,54 +0,0 @@
-@echo off
-
-REM Detect output location
-set output=%3
-for /F "tokens=*" %%i in ('cygpath -u %output%') do set output_cygpath=%%i
-echo Output: %output%
-
-REM Detect OsmAnd JAVA location
-set osmand=%~dp0..\..\core\OsmAnd-java
-
-REM Detect avian location
-set avian=%~dp0..\..\avian\core
-echo Avian: %avian%
-for /F "tokens=*" %%i in ('cygpath -u %avian%') do set avian_cygpath=%%i
-
-REM Get cygwin path
-for /F "tokens=*" %%i in ('cygpath -w /usr/bin') do set cygwin_usr_bin=%%i
-for /F "tokens=*" %%i in ('cygpath -w /usr/sbin') do set cygwin_usr_sbin=%%i
-for /F "tokens=*" %%i in ('cygpath -w /usr/local/bin') do set cygwin_usr_local_bin=%%i
-
-REM Detect avian-compatible architecture
-if "%1"=="x86" (
- set arch=i386
-) else if "%1"=="ARM" (
- set arch=arm
-) else (
- echo Invalid target: %1
- exit /b -1
-)
-echo Architecture: %arch%
-
-REM Detect avian-compatible build mode
-if "%2"=="Debug" (
- set mode=debug
-) else if "%2"=="Release" (
- set mode=fast
-) else (
- echo Invalid configuration: %2
- exit /b -1
-)
-
-REM Perform actions requested
-set PATH=%cygwin_usr_bin%;%cygwin_usr_sbin%;%cygwin_usr_local_bin%;%PATH%
-if "%4"=="build" (
- bash all.sh "%output_cygpath%" %arch% %mode% build
-) else if "%4"=="clean" (
- bash all.sh "%output_cygpath%" %arch% %mode% clean
-) else if "%4"=="rebuild" (
- bash all.sh "%output_cygpath%" %arch% %mode% clean
- bash all.sh "%output_cygpath%" %arch% %mode% build
-) else (
- echo Invalid command: %4
- exit /b -1
-)
63 OsmAndJavaCore/all.sh
View
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-# Get variables
-OUTPUT=$1
-OSMAND_ROOT=../..
-OSMAND_JAVA_CORE=$OSMAND_ROOT/core/OsmAnd-java
-AVIAN_ARCH=$2
-AVIAN_FLAVOR=-$3
-if [ "$AVIAN_FLAVOR" == "-fast" ]; then
- AVIAN_FLAVOR=
-fi
-AVIAN=../../avian/core
-AVIAN_BIN=$AVIAN/build/wp8-$AVIAN_ARCH$AVIAN_FLAVOR-bootimage
-
-# Perform actions
-if [ "$4" == "build" ]; then
- # Ensure OsmAnd JAVA core is built
- ant -f $OSMAND_JAVA_CORE/build.xml build
-
- # Prepare *.class files
- rm -rf "$OUTPUT/stage"
- mkdir -p "$OUTPUT/stage"
- rm -rf "$OUTPUT/jars"
- mkdir -p "$OUTPUT/jars"
- cp $AVIAN_BIN/host/classpath.jar "$OUTPUT/jars/"
- cp $OSMAND_JAVA_CORE/OsmAnd-avian.jar "$OUTPUT/jars/"
- cp $OSMAND_JAVA_CORE/lib/simple-logging.jar "$OUTPUT/jars/"
- cp $OSMAND_JAVA_CORE/lib/kxml2-2.3.0.jar "$OUTPUT/jars/"
- cp $OSMAND_JAVA_CORE/lib/junidecode-0.1.jar "$OUTPUT/jars/"
- (cd "$OUTPUT/stage" && \
- jar -xf ../jars/classpath.jar && \
- jar -xf ../jars/OsmAnd-avian.jar && \
- jar -xf ../jars/simple-logging.jar && \
- jar -xf ../jars/kxml2-2.3.0.jar && \
- jar -xf ../jars/junidecode-0.1.jar)
-
- # Collect resources
- rm -rf "$OUTPUT/resources*"
- mkdir -p "$OUTPUT/resources"
- (cd "$OUTPUT/stage" && \
- find . -type f -not -name '*.class' | xargs tar cf - | tar xf - -C ../resources)
- (cd "$OUTPUT/resources" && \
- jar cf ../resources.jar *)
-
- # Compile resources
- RESOURCES_JAR_NATIVE=`cygpath -w "$OUTPUT/resources.jar"`
- RESOURCES_OBJ_NATIVE=`cygpath -w "$OUTPUT/resources.obj"`
- $AVIAN_BIN/host/binaryToObject/binaryToObject \
- "$RESOURCES_JAR_NATIVE" \
- "$RESOURCES_OBJ_NATIVE" \
- _binary_resources_jar_start _binary_resources_jar_end windows $AVIAN_ARCH 1
-
- # Precompile code
- rm -f "$OUTPUT/bootimage.obj"
- rm -f "$OUTPUT/codeimage.obj"
- BOOTIMAGE_OBJ_NATIVE=`cygpath -w "$OUTPUT/bootimage.obj"`
- CODEIMAGE_OBJ_NATIVE=`cygpath -w "$OUTPUT/codeimage.obj"`
- STAGE_NATIVE=`cygpath -w "$OUTPUT/stage"`
- $AVIAN_BIN/bootimage-generator \
- -cp "$STAGE_NATIVE" \
- -bootimage "$BOOTIMAGE_OBJ_NATIVE" \
- -codeimage "$CODEIMAGE_OBJ_NATIVE"
-fi
4 OsmAndNativeComponent/OsmAndNativeComponent.vcxproj
View
@@ -84,7 +84,6 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>ole32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateWindowsMetadata>true</GenerateWindowsMetadata>
- <AdditionalDependencies>$(ProjectDir)..\..\binaries\wp8\OsmAndJavaCore\$(Platform)\$(Configuration)\resources.obj;$(ProjectDir)..\..\binaries\wp8\OsmAndJavaCore\$(Platform)\$(Configuration)\codeimage.obj;$(ProjectDir)..\..\binaries\wp8\OsmAndJavaCore\$(Platform)\$(Configuration)\bootimage.obj;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -99,7 +98,6 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>ole32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateWindowsMetadata>true</GenerateWindowsMetadata>
- <AdditionalDependencies>$(ProjectDir)..\..\binaries\wp8\OsmAndJavaCore\$(Platform)\$(Configuration)\resources.obj;$(ProjectDir)..\..\binaries\wp8\OsmAndJavaCore\$(Platform)\$(Configuration)\codeimage.obj;$(ProjectDir)..\..\binaries\wp8\OsmAndJavaCore\$(Platform)\$(Configuration)\bootimage.obj;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -114,7 +112,6 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>ole32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateWindowsMetadata>true</GenerateWindowsMetadata>
- <AdditionalDependencies>$(ProjectDir)..\..\binaries\wp8\OsmAndJavaCore\$(Platform)\$(Configuration)\resources.obj;$(ProjectDir)..\..\binaries\wp8\OsmAndJavaCore\$(Platform)\$(Configuration)\codeimage.obj;$(ProjectDir)..\..\binaries\wp8\OsmAndJavaCore\$(Platform)\$(Configuration)\bootimage.obj;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -129,7 +126,6 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>ole32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateWindowsMetadata>true</GenerateWindowsMetadata>
- <AdditionalDependencies>$(ProjectDir)..\..\binaries\wp8\OsmAndJavaCore\$(Platform)\$(Configuration)\resources.obj;$(ProjectDir)..\..\binaries\wp8\OsmAndJavaCore\$(Platform)\$(Configuration)\codeimage.obj;$(ProjectDir)..\..\binaries\wp8\OsmAndJavaCore\$(Platform)\$(Configuration)\bootimage.obj;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Please sign in to comment.
Something went wrong with that request. Please try again.