From e20dbeb03898dae870524460e8f1116ff88f6557 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Thu, 31 May 2012 22:01:27 +0300 Subject: [PATCH] Makefiles :) --- OsmAnd/res/values-lv/strings.xml | 1658 ++++++++--------- Osmand-kernel/Makefile | 25 +- Osmand-kernel/Makefile.rules | 76 + Osmand-kernel/Makefile.vars | 53 +- Osmand-kernel/cpufeatures_proxy/Android.mk | 2 +- Osmand-kernel/expat/.gitignore | 2 +- Osmand-kernel/expat/Android.mk | 2 +- Osmand-kernel/expat/Makefile | 30 +- Osmand-kernel/freetype/.gitignore | 2 +- Osmand-kernel/freetype/Android.mk | 2 +- Osmand-kernel/freetype/Makefile | 31 +- Osmand-kernel/gif/Android.mk | 2 +- Osmand-kernel/jpeg/Android.mk | 2 +- .../{jni-prebuilt => lib}/.gitignore | 0 Osmand-kernel/osmand/.gitignore | 2 +- Osmand-kernel/osmand/Makefile | 71 +- Osmand-kernel/png/.gitignore | 2 +- Osmand-kernel/png/Android.mk | 2 +- Osmand-kernel/png/Makefile | 31 +- Osmand-kernel/protobuf/.gitignore | 2 +- Osmand-kernel/protobuf/Android.mk | 2 +- Osmand-kernel/protobuf/Makefile | 33 +- Osmand-kernel/skia/.gitignore | 2 +- Osmand-kernel/skia/Android.mk | 2 +- Osmand-kernel/skia/Makefile | 44 +- 25 files changed, 1034 insertions(+), 1046 deletions(-) create mode 100755 Osmand-kernel/Makefile.rules rename Osmand-kernel/{jni-prebuilt => lib}/.gitignore (100%) diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml index 1401b1607b..cd0ac47cce 100644 --- a/OsmAnd/res/values-lv/strings.xml +++ b/OsmAnd/res/values-lv/strings.xml @@ -1,830 +1,830 @@ - - - Spraudņi - Atzīmējiet spraudni, lai to aktivizētu. Lai spraudnis sāktu strādāt, nepieciešams aplikācijas restarts. - Spraudņi iespējo aplikācijas papildu funkcionalitāti, tādu kā sekošana, kartes, baterijas saglabāšanas funkcijas, pieejamība un daudzas citas. - Spraudņi - "Izmaiņas 0.8.0 : \n\t- Plugin functionality \n\t- New offline map data support \n\t- Lots of bug fixes " - Šis spraudnis ir domāts OSM kvalitātes uzlabošanai. Tas ļauj savākt/modificēt OSM POI objektus, atvērt/komentēt OSM kļūdas un nosūtīt ierakstīto GPX (nepieciešama OSM ģistrācija). - OSM labošana - Vektoru kartes tiek attēlotas ātrāk. Tas var nestrādāt uz dažām iekārtām. - Simulēt progresiju manuāli - Atskaņot komandas izvēlētai balsij - OsmAnd izstrāde un atkļūdošana - Iekļautā renderēšana - Routinga animācija - Pārbaudīt balss komandas - Šajā vietā nav pieejama bezsaistes vektoru karte. Jūs variet lejuplādēt to uzstādījumos (Bezsaistes dati), vai arī pārslēgties uz tiešsaistes karti. - "Changes in 0.7.2 : \n\t- Native rendering for all devices \n\t- Offline POI editing \n\t- Accessibility \n\t- Lots of bug fixes " - Sūtīt GPX failus uz OSM? - Redzamība - Iezīmes - Apraksts - Lūdzu norādiet OSM lietotāja vārdu un paroli, kuru lietot augšuplādējot GPX failus. - Atbalsts - Atbalstiet jaunas iespējas - Attēlot lineālu uz kartes - Attēlot lineālu - Info - Atpakaļ uz atrašanās vietu - Palīdzība - Rādīt detaļas - Pieejamības paplašinājumi vecākām Android versijām - Pieejamības paplašinājumi - Pieejamības režīms - Ieslēdz pieejamības iespējas - Ieslēgts - Izslēgts - Atbilstoši sistēmas uzstādījumiem - Atpakaļ pie izvēlnes - Samazināt - Palielināt - Palielinājums ir - ziemeļi - ziemeļu-ziemeļu-austrumu - ziemeļu-austrumu - austrumu-ziemeļu-austrumu - austrumu - austrumu-dienvidu-austrumu - dienvidu-austrumu - dienvidu-dienvidu-austrumu - dienvidu - dienvidu-dienvidu-rietumu - dienvidu-rietumu - rietumu-dienvidu-rietumu - rietumu - rietumu-ziemeļu-rietumu - ziemeļu-rietumu - ziemeļu-ziemeļu-rietumu - Uz priekšu - Uz priekšu pa labi - Pa labi - Atpakaļ pa labi - Atpakaļ - Atpakaļ pa kreisi - Pa kreisi - Uz priekšu pa kreisi - plkst. - uz priekšu - Precizitāte - Altitude - Nav info - Sāniski (8 sektori) - Pulksteņrādītāja (12 sektori) - Virziena stils - Izvēlaties relatīvās virziena norādes izteiksmes stilus kustības laikā. - Sākt autoziņošanu - Pārtraukt autoziņošanu - Scroll map by gestures on the touchscreen - Naturālā kartes rulēšana - Es esmu šeit - Mainīt kartes palielinājumu ar rulīša kustību - Lietot peles rullīti kā palielināšanas konroli - Lietot īsos objektu nosaukumus pieskārienu skata režīmā - Lietot objektu vārdus - Ar pieejamību saistītās izvēles - Pieejamība - Nepietiek procesu atmiņas, lai attēlotu izvēlēto apgabalu - Flurescentie slāņi - Lietot flurescentās krāsas, lai attēlotu pēdas un ceļus - Bezsaistes POI rediģēšana - Viemēr pielietot bezsaistes POI rediģēšanu - "Jaumi 0.7.1 versijā : \n\t- Bezsaistes POI rediģēšana \n\t- Sekošanas opcija - periodiska koordināšu sūtīšana uz web servisu. (kā izveidot savu web servisu var izlasīt HowTo) \n\t- Rādīt pēdas kuras tiek ierakstītas \n\t- Virziena noteikšana: Ja brauciet pretējā virzienā vai esiet pabraucis garām pagriezienam tiek paziņots \'Izpildiet U-pagriezienu\' \n\t- Jauns bals ziņojums \'Ceļš pārrēķināts\' \n\t- Tūlītēja (100m)pagrieziena indikācija ar virziena bultas krāsas maiņu \n\t- Deaktivizēto indeksu failu aktualitāte tiek parādīta lejuplādes ekrānā ar tumši zaļu un tumši zilu \n\t- Citas izmaiņas " - POI izmaiņas aplikācijā neietekmē lejuplādētos kartes attēlus, izmaiņas tiek saglabātas atsevišķā failā. - Lejuplādē POI… - {0} POI tika lejuplādētji - Lejuplādēt visus POI - - - Rādīt POI uz kartes - Augšuplādēt izmaiņas uz OSM - Dzēst POI labojumus - Asinhronā POI rediģēšana: - Laokāli saglabātie OSM POIs - Rādīt un organizēt lokālajā datubāzē pieejamos OSM POI - Nosūtīt pēdas uz norādīto web servisu - Tiešsaistes sekošana - Norādīt tiešsaistes sekošanas intervālu - Tiešaistes sekošanas intervāls - Norādiet web adresi ar parametru sintaksi : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5} - Tiešaistes sekošanas web adrese - Lūdzu ieslēdziet \'Ierakstīt pēdas GPX\' Sekošanas uzstādījumus - Rādīt tekošās pēdas - "Jaunumi 0.7.0 versijā : \n\t- Bezsaistes wikipedia dati \n\t- Atjaunotas kartes \n\t- Citi mazi uzlabojumi " - Šajā bezmaksas OsmAnd versijā ir ierobežojums uz %1$ lejuplādētiem %2$ nu tā neatbalsta wikipedia rakstus. - Bezmaksas versija - Rādīt POI aprakstu - Ziemeļ Amerkika - Ziemeļamerika - ASV - Centrālamerika - Dienvidu Amerika - Eiropa - Eiropa - Francija - Eiropa - Vācija - Eiropa - Krievija / Āzija - Āfrika - Āzija - Okeānija - Pasaules un tematiskās kartes - Pasaules vikipēdija - Balss pakas (ieraksti) - Balss pakas (TTS) - Wikipedia (bezsaistes) - Lietotāja definēts - Eksistē fails ar iepriekš eksportētiem favorītiem. Vai vēlaties to pārrakstīt? - - Ar profilu saistītie uzstādījumi - Lietotāju profils - Izvēlaties lietotāja profilu. Katrs profils satur specifiskus uzstādījumus, kurus var mainīt zemāk. - - Sekošana - Norādīt sekošanas uzstādījumus - - Navigācija - Norādīt navigācijas opcijas - Globālie uzstādījumi - Bezsaistes dati - Lejuplādēt un pārvaldīt bezsaistes kartes un pārējos datus, tādus kā GPX pēdas - Vispārīgie uzstādījumi - Konfigurēt vispārīgos uzstādījumus - Globālie aplikācijas uzstādījumi - OSM lietotāja vārds - Nepieciešams, lai veiktu openstreetmap.org augšuplādi - Jūsu OSM parole - Nepieciešams, lai veiktu openstreetmap.org augšuplādi - Fona uzstādījumi - Lietojiet lai OsmAnd strādātu kā fona process, kad ekrāns ir izslēgts - Kartes rotēšana - \tJūs variet izvēlēties vai un kā notiks kartes rotācija \'Uzstādījumi\' -> \'Kartes izskats\' -> \'Kartes rotēšana\'. \n\tIzvēle ir: \n\t\'Nerotēt\' - Karte nemainīs orientāciju. Ziemeļi vienmēr būs augšā \n\t\'Kustības virzienā\' - Karte vienmēr pagriezīsies jūsu kustības virzienā \n\t\'Pēc kompasa\' - Karte vienmēr pagriezīsies pēc iekārtas kompasa datiem \n\tPadoms: Lai ātri pārslēgtu starp rotāciju ar kompasu un jūsu izstādījumos norādīto, jūs variet uzspiest uz kompasa kartes skatā. - Lejuplāde ir veiksmīga.\n\t\n\tLai aktivizētu \'Uzstādījumi\' -> \'Kartes konfigurācija\' -> \'Bezsaistes vektoru kartes\'. - Dienas/Nakts režīms - \tDažām vektoru kartēm izskats var tikt mainīts starp dienas (gaišāku) un nakts (tumšāku). \n\tNakts krāsas ir drošākas braukšanai. \n\tJūs variet izvēlēties noteikumus dienas/nakts pārslēgšana ar \'Uzstādījumi\' -> \'Kartes izskats\' ->\'Dienas/nakts režīms\'. \n\tJūs variet izvēlēties: \n\t\'Ausma/Saulriets\' - automātiskais režīms, kas ir atkarīgs no saules (noklusētais) \n\t\'Diena\' - vienmēr lietot dienas režīmu \n\t\'Night\' - vienmēr lietot nakts režīmu \n\t\'Gaismas sensors\' - kartes izskats tiek kontrolēts izmantojot jūsu iekārtas gaismas sensoru (ja tāds jūsu iekārtai ir) - OSM datu uzlabošana - \tOsmAnd lieto kartes kuras ir bāzētas uz Openstreetmap.org (OSM) datiem un, kopā ar kartes skatīšanos un navigāciju, var tikt izmantota, lai uzlabotu OSM datu kvalitāti. Jūs variet vienkārši augšuplādēt jaunus POI vai OSM kļūdas pieteikumus ar dažām dabībām! \n\tLai tas strādātu jums vispirms ir jānorāda OSM pieslēguma informācija \'Uzstādījumi\' -> \'Vispārīgie uzstādījumi\' -> \'OSM\'. \n\tLai pievienotu jaunu POI lietojiet opciju \'Izveidot POI\' kartes konteksta izvēlnē. Turpiniet ievadot POI informāciju par jauno punktu \'Izveidot POI\' dialogā un pabeidzot darbību apstipriniet ievadu. \n\tJums ir iespēja nekavējoties ziņot par kļūdām kartē ar OSM kļūdas pieteikuma palīdzību, tad OSM kopiena var ātrāk šo kļūdu izlabot. \n\tLai pievienotu OSM kļūdas pieteikumu izmantojiet opciju \'Pieteikt OSM kļūdu\' kartes konteksta izvēlnē. Tad ievadiet detalizētu kļūdas aprakstu un nobeidzot apstipriniet pieteikumu piespiežot pogu \'Pievienot\'. \n\tŅemiet vērā. OSM POI un kļūdu pieteikšanai ir nepieciešams datu savienojums. - - Nepietiek brīvas vietas lai lejuplādētu %1$s MB (brīvi: %2$i). - Patreiz ir brīvi {2} MB! Lejuplādēt {0} failu(s) ({1} MB)? - Izvelēties mērķi - \tJūs variet izvēlēties mērķi tieši kartē (konteksta izvēlne, tad \'Uzstādīt kā mērķi\'), visās meklēšanas darbībās, vai arī pieturot piespiestu ierakstu jūsu \'Jūsu favorītu punktu sarakstā\'. \n\tMērķis tiks iezīmēts kā oranžš riņķis kartē un OsmAnd attēlos attālumu līdz tam un virzienu uz to (ar oranžu trijstūri). - "Izmaiņas versijā 0.6.9 : \n\t- Uzlabota kartes renderēšana \n\t- Ātra bezsaistes renderēšana - meklējiet eksperimentālās iespējas (var nestrādāt dažās iekārtās) \n\t- Pamatīgas izskata izmaiņas \n\t- Augstuma informācija \n\t- Jauni tulkojumi (Vjetnamiešu, Poļu) \n\t- Citi nelieli papildinājumi " - Rādīt tekošo augstuma informāciju uz kartes - Rādīt augstumu - Lietot caurspīdīgas kartes vadības pogas - Caurspīdīgā tēma - Iekļautā bibliotēka šajā iekārtā netiek atbalstīta. - Inicializēju iekļauto bibliotēku… - Auto-centrēt karti - Laiks līdz karte sinhronizējas ar tekošo pozīciju - Nekad - Autocentrēt tikai ar nav - Autocentrēt karti tikai navigācijas laikā. - Autocentrēt karti pie attēlošanas. - Vektoru renderētāja specifiskās opcijas - Pārklājs / paklājs - Kartes avota uzstādījumi - Vektoru kartes uzstādījumi - Dzēst %1$u? - Piepilsēta - Ciems - Apdzīvota vieta - Pilsēta - Rajona pilsēta - POI marķējums - Izslēgt animāciju - Ieslēgt animāciju - "Izmaiņas 0.6.8 versijā : \n\t- Pilnībā pārstrādāta meklēšana (POI, Adrese)! Adresu meklēšana ir padarīta daudz ātrāka. Izveiots viena meklēšanas saskarne ar dažādām opcijām. \n\t- Implementēta POI meklēšana lielos apgabalos (valstīs) \n\t- Izlabota kartes raustīšanās tablet PC (Pieteikums 641) \n\t- Kartes auto-centrēšanas iespēja (Pieteikums 356) \n\t- GPX navigation moved to \'Directions\' and \'Save Directions\' moved to \'About route\' \n\t- POI data included in .obf file (all download indexes after 01/10/11) \n\t- Voice prompt fixes (GPS position fix, omitting first command) \n\t- Small improvements " - File can not be renamed. - File with that name already exists. - GPX route - Several POI categories found matching the query : - Local data to search POI is not present. - Search by name - The POI data file \'%1$s\' is redundant and can be deleted. - Local file to maintain POI changes not found and could not be created. - Upgrade Osmand+ - Server contains map files not compatible with your current version of the application. To download and use them, please upgrade the application to newer version. - Rename - Show on map - Online Nominatim - Select - Searching position… - Position (Found) - Address… - Favorites… - Undefined - Fixed - Current position… - Last map view - Search near : - Search near here - "Recent changes for 0.6.7 : \n\t- Offline data manager (download, delete, activate / deactivate offline data directly in Osmand) \n\t- Favorite points and groups (categorize, delete, manage favorites) \n\t- GPX Explorer in application (view track detail, distance, average speed, elevation, etc.) \n\t- GPX navigation (more options, continue navigation after crash, support roundabouts) \n\t- Function to save route as GPX track for offline use \n\t- Improve GPX monitoring (filter some inaccurate position and save accuracy/elevation/speed) \n\t- Upload GPX to OSM community (http://download.osmand.net/gpx/) \n\t- Improve vector rendering \n\t- Improvement of TTS engine (announce exact distance, enable miles) \n\t- Bug fixes " - Save route as GPX track - Route successfully saved as \'%1$s\'. - "File name : " - File with same name already exists. - Save - Save directions - Upload GPX files to OSM community. They will be used to improve maps. - %1$d of %2$d item(s) successfully uploaded. - Send to OSM - Show more map detail - Show some vector map detail (roads etc.) at lower zooms already - Favorite point(s) deleted successfully. - You are going to delete %1$d favorite(s) and %2$d favorite group(s). Are you sure? - Home - Friends - Places - Others - Name - Category - No, thanks - Base world map (covering the whole world at small zooms) is missing. Please consider downloading World_basemap_x.obf for a complete environment. - On board (\'offline\') data is missing on SD card. Please consider to download it in order to use maps offline. - "\n\nPress and hold for options" - "\nAverage speed : %1$s \nMaximum speed : %2$s" - "\nAverage altitude : %1$.0f m\nMinimum altitude : %2$.0f m\nMaximum altitude : %3$.0f m\nAscents : %4$.0f m\nDescents : %5$.0f m" - Subtracks : %1$d\nTotal points : %2$d\nWay points : %3$d\nTotal distance : %4$s\nStart time : %5$tF, %5$tR\nEnd time : %6$tF, %6$tR - Edition - %1$d of %2$d item(s) successfully deactivated. - %1$d of %2$d item(s) successfully deleted. - %1$d of %2$d item(s) successfully activated. - No items to %1$s - You are about to %1$s %2$s item(s). Continue? - Offline Data Manager - Activate - Deactivate - Delete - Refresh - Download… - Tile data: %1$s \nMinimum zoom : %2$d\nMaximum zoom : %3$d\nDownloadable : %4$s \nZooms downloaded : %5$s - POI data - Address data - Transport data - Map data - - - Deactivated - Voice data (TTS) - Voice data (recorded) - GPX data - Map data (tiles) - Map data (vector) - POI data - TTS Voice - New Search - Select text size for names on the map - Text size - Rendering debug info - Display rendering performance - Recent changes - "Recent changes for 0.6.6 : \n\t- Text To Speech engine for voice navigation \n\t- Make map renderer more detailed \n\t- Basemap for whole world packaged with app \n\t- Tweak offline navigation (still experimental) \n\t- GPX navigation options \n\t- UI update and large bug fixing " - Do not use - None - Unpacking new data… - An online navigation service is selected but no internet connection is available. - Language not supported - The selected language is not supported by the installed Android TTS (text-to-speech) engine. Do you want to go to the Market to look for another TTS engine? Otherwise the preset TTS language will be used. - Missing data - No data for the selected language is installed. Do you want to go to the Market to install? - Reverse GPX direction - Use current destination - Pass along entire track - Offline vector map present for this location. \n\t\n\tTo use activate \'Menu\' -> \'Define view\' -> \'Map Source…\' -> \'Offline vector maps\'. - Voice guidance output - Choose channel to play voice guidance (system-dependent) - Voice call audio - Notification audio - Media/music audio - Application cannot download map layer %1$s, please try to reinstall it. - Modify overlay transparency - Overlay transparency - Modify base map transparency - Base map transparency - Modify transparency - Underlay map… - Underlay map - Choose underlay map - Overlay map… - None - Overlay map - Choose overlay map - Map is already installed, settings will be updated - Select (tile) maps to install or update - Internet connection required for operation is not available - Install more… - Update of Offline Data - \tHaving up-to-date map data is essential. Osmand provides a download manager which can check for available offline data updates. \n\tTo check for updates go to \'Settings\' -> \'Offline data\' -> \'Download offline data\'. After region list is retrieved from the internet, you can select option \'Menu\' -> \'Filter downloaded\' to indicate updates only for data already on your device. \n\tThe availability of updates is depicted by the following colors: \n\t\'Green\' - indicates data files identical on device and server \n\t\'Blue\' - indicates available updates on server - Minimum zoom level to use vector maps - Min. vector zoom level - Location Sharing - \tYou can share the location of interesting places on your trip with family or friends. \n\tTo share any location you want: \n\tUse \'Map context menu\' -> \'Share location\' menu. \n\tThen select a way to share your location. The choices are: E-Mail, SMS(text), or just copy location coordinates to clipboard. - Favorite Points - \tFrequently used points can be saved as Favorites. \n\tTo save a point as Favorite go to the map context menu, select option \'Add to favorites\' and then enter a name for it. After saving a Favorite, it is accessible via \'Main Menu\' -> \'Favorites\'. \n\tLong pressing on a Favorite in the \'Favorites\' menu provides options to set it as desination, Edit or Delete it. \n\tTo display all Favorite points directly on the map, enable layer \'Favorites\' in \'Map context menu\' ->\'Define view\'. - - Online OSM map classification with images - Error occurred in offline search - Could not parse geo intent \'%s\' - Search address using offline maps - System - Select display language - Display language - Map Source - \tThe fastest way to change the map source and layers displayed is pressing \'Menu\' -> \'Define view\' in map view. \n\tUnder \'Map source…\' you can choose using the pre-loaded offline vector maps, predefined (online) tile sources, or maps manually created using e.g. OsmAndMapCreator on a PC. \n\tOsmAnd also supports custom sources. - User Profile - \tOsmAnd supports different (customizable) application profiles for different use cases. \n\tYou can change profiles in \'Menu\' -> \'Settings\' -> \'User Profile\', or when creating a route. - Navigation - \tBefore starting a navigation you need to select a destination. Afterwards press \'Menu\' -> \'Directions\' on map and select the navigation type. - Searching - \tYou can search for places directly on the map, or by address, by location, as POI, or as predefined favorite. \n\tPressing \'Search\' in the main menu opens the search activities. For all hits a context menu offers 2 options: \'Set as destination\' or \'Show on map\'. - Map Context Menu - \tThe map context menu is available by pressing and holding on the map or by pressing the trackball button. \n\tThis produces a box with point coordinates. To open the map context menu dialog, tap on it. (Or press and hold on it to hide the box again.) \n\tThe map context menu contains all actions referring to a point (location). - Tips and Tricks - \tOsmAnd is a navigation application with many features. \n\tAs an basic introduction, some usage tips and tricks are linked on the main menu screen. - Next - Previous - Change units of length and speed - Unit of measure - Miles/feet - Miles/yards - Kilometers/meters - yd - ft - mph - mi - Share location using - Location: %1$s\n%2$s - To see location follow the web browser link %1$s or android intent link %2$s - Send location - Share location - Waypoint \'\'{0}\'\' was successfully added - Add waypoint to recorded GPX track - Add GPX waypoint - Administrative - Barrier - Education - Emergency - Entertainment - Finance - Geocache - Healthcare - Historic - Landuse - Leisure - Man made - Military - Natural - Office - Other - Shop - Sport - Sustenance - Tourism - Transportation - Indexing address… - Indexing map… - Indexing POI… - Indexing transport… - I/O error occurred - km - km/h - m - Deprecated map data format \'\'{0}\'\' is not supported - Car aid - Closest POI - Custom filter - Food shop - For tourists - Fuel - Online NameFinder - Reading cached tiles… - The index \'\'{0}\'\' did not fit into memory - The version of index \'\'{0}\'\' is not supported - OsmAnd navigation >20km - Use OsmAnd offline navigation applies only to routes > 20 km (experimental) - OsmAnd offline navigation is an experimental feature and it does not work for distances of more than about 20 km.\n\nNavigation service is temporarily switched to online CloudMade. - Can not find specified directory. - Storage directory - Changing the storage directory will not move or delete the data. This must be performed separately and outside OsmAnd. Continue anyway? - A previous OsmAnd version is installed. All offline data will be supported by new the new application. But Favorite points should be exported in the old application and later imported by the new one. - Build {0} successfully installed ({1}). - Downloading build… - Do you want to install OsmAnd - {0} from {1} {2} MB ? - Retrieving the list of OsmAnd builds failed - Loading OsmAnd builds… - Select one of the OsmAnd builds to install - Special activity for contribution version - GPS Status application not installed. Search in Market? - Voice guidance is not available. Please go to settings, choose preferred voice data package, and download it. - No voice guidance selected - Day - Night - Sunrise/sunset - Light sensor - Choose day/night mode switching rule - Day/night mode - Download {0} file(s) ({1} MB)? - {0} item(s) selected - Filter downloaded - Deselect all - Select all - Refresh - Fastest route - "Enable to calculate fastest route or disable for shortest route " - At zoom {0} download {1} tiles ({2} MB) - Download map - Select maximum zoom to preload - This map could not be downloaded - Continuous rendering - Display continuous rendering instead of image-at-once - Error occurred while rendering selected area - Location options - Renderer sucessfully loaded - Exception occured: renderer was not loaded - Vector renderer - Choose rendering appearance - Show POI website - Show POI phone - web site - phone - type to filter - High resolution display - Do not stretch (and blur) map tiles on high density displays - Position unknown yet - Download - Search transport - Transport results (no target): - Transport results ({0} to target): - none - Reset Transport search - Map - Voice - Vector maps were not loaded - Navigate using GPX - GPX files not found in /tracks directory - GPX track… - Error reading GPX data - Offline vector maps - Search transport at stop - Location:\n Lat %1$.5f\n Lon %2$.5f - Bug - Modify POI - Delete POI - To compass - To direction of movement - Don\'t rotate - Select how map is oriented - Map orientation - Route details - Favorites succesfully imported - GPX file containing favorites is not found at {0} - Favorites succesfully saved to {0} - No favorite points to save - Import - Export - Error occurred while loading GPX - Send report - No offline data for regions found on SD card. Download regions from the Internet. - Input search query to find POI - Any - Transport route - Thanks to Yandex for traffic information. - Yandex traffic - Route - Favorites - OSM bugs - Transport stops - POI… - Map source… - Define view - Previous navigation was unfinished. Continue following it? - Search POI - Show route from here - Use trackball to move map - Use trackball - Set maximum waiting time for each background position fix - Maximum wait for fix - Switch off background navigation service - Where am I? - OsmAnd navigation service - Network - GPS - seconds - min. - "Set wake-up interval used by background " - Wake-up interval - Choose location provider while running in background mode - Location provider - Runs OsmAnd in the background to track your location while screen is off - Run in the background - The background navigation service requires a location source to be turned on. - Hide filter - Show filter - Filter - Sound is on - Sound is off - Select voice guidance for navigation - Voice guidance - Initializing voice data… - Unsupported version of voice data - Specified voice data is corrupted - Selected voice data is not available - Stop navigtn. - SD card is not accessible.\nYou won\'t be able to see maps or find things. - SD card is read-only.\nYou can only see the preloaded map and can\'t download from the Internet. - Unzipping file… - Turn right and go - Turn sharply right and go - Turn slightly right and go - Turn left and go - Turn sharply left and go - Turn slightly left and go - Make U-turn and go - Head - Later - Download regions - Thank you for choosing OsmAnd. \nTo use the major features of this application, you will need some regional offline data, which you can download (use Settings, Offline Data). Afterwards, you will be able to search by address, look up POIs and find public transportation. - Searching for signal… - Search near last map location - Search nearby - Same as device - Portrait - Landscape - Screen orientation - Choose screen orientation - Opening hours format is not supported for editing - Add new rule - Routes - Stop - stops - Subsequent route - Prior route - Finish search - Choose stop to get off - prior distance - subsequent distance - stops to pass - Route distance - Transport - OK - Show public transport stops on map - Show transport stops - Navigation application OsmAnd - POI data was updated successfully ({0} were loaded) - Error updating local POI list - Error while loading data from server - No offline POI data available for this area - Updating POIs is not available for small zoom levels - Update POI - Update local data via Internet? - City:\n {0} - Street:\n {0}, {1} - Intersection: {0} x {1} in {2} - Building: {0}, {1}, {2} - Favorite - Clear all - History - Uploading data… - Uploading… - Nothing found - Searching… - Searching address… - Search address using OSM Nominatim - House number, street, city - Offline - Internet - Max. online zoom - Choose maximum zoom level to download for online map tiles - Total distance %1$s, travelling time %2$d h %3$d m. - Choose online or offline navigation service - Navigation service - Save directory on SD card not accessible - Download {0} - {1} ? - Offline data for {0} already exists ({1}). Do you want to update it ({2}) ? - Address - Download successful - I/O error occured - Downloading file… - Downloading… - Downloading list of available regions… - The list of regions was not retrieved from osmand.net. - If you can\'t find your region, you can make it yourself. See osmand.net - Show on map - Favorite point was edited - No favorite points exist - Replace - Only show - Follow - Select mode of transportation (optional): - Please select destination first - Directions - Show GPS Status - Opening hours - Opening changeset… - Closing changeset… - Committing node… - Loading POI… - Authorization failed - failed - Converting native/English names… - Loading streets/buildings… - Loading postcodes… - Loading streets… - Loading cities… - Loading… - POI - Error while saving GPX - Error calculating route - Error occurred while calculating route - Error: Calculated route is empty - New route calculated, distance - You have arrived at your destination - Coordinates are invalid! - Go back to OsmAnd map - Close - Loading data… - Reading local data… - Last OsmAnd run crashed. Log file is at {0}. Please report the issue and attach the log file. - Saving GPX tracks to SD… - Finished - Re-read offline vector maps and data from SD card - Re-read offline data - Download or update data for offline use from the Internet - Download offline data - Use Internet to calculate route - Use online navigation - Specify Openstreetmap.org (OSM) settings needed for OSM submissions - Specify language, download/reload data - Data - Specify map settings: map source, rotation, marker position, screen orientation - OSM - Auto zoom map according to your speed - Auto zoom map - Additional settings - Settings - Save current track to SD now - Save current track - Logging interval - Choose positioning interval for tracks - Tracks will be saved to track directory grouped by days - Log track to GPX - Set as destination - Update map - Reload tile - Target - Show OpenStreetBugs on map - Show OpenStreetBugs - Favorites - Add to Favorites - Select between native and English names - Use English names - Application settings - Search address - Choose building - Choose street - Choose city - Choose country - Choose location of position marker on the map - Position marker - Set as destination - Display viewing direction on the map - Display viewing direction - Clear destin. - Set as dest. - Enable 3D view of the map - Map View 3D - Show POI over map (use last chosen filter) - Show POI - Choose the source of online or offline map tiles - Tile map source - Map source - Use Internet - Show location - Map - Settings - Show GPS coordinates on map - Use Internet to download missing map tiles - Navigation application - Exit - Map - Settings - Favorites - Search - Search - Izvēlēties POI - Atrast vairāk - Pieaugoši meklēt pilsētas. Lai atrastu pilsētu ievadiet 3 vai vairāk simbolus. - "Pieaugoši meklēt ielas. " - Pieaugoši meklēt ēkas. - Izvēlieties reģionu no saraksta - Izvēlēties ielu krustojumu - Tuvākie servisi - "Noklusēti " - Auto - Velosipēds - Kājāmgājējs - Centrs - Apakša - Ievadiet platumu & garumu izvēlētā formātā (G - grādi , M - minūtes , S - sekundes) - Platums - Garums - GGG.GGGGG - GGG MM.MMMMM - GGG MM SS.SSSSS - Rādīt kartē - Atcelt - Izvēlēties adresi - Reģions - Pilsēta - Iela - Ēka - Ēka - Krustojums - Atrašanās vieta - Uzstādīt kādi galapunktu - Pievienot favorītiem - Atjaunot karti - Atvērt OSM bug - Izveidot POI - Jā - Atcelt - Pielietot - Pievienot - Nē - Ievadiet favorīta nosaukumu - Favorīti - Favorīta punkts \'\'{0}\'\' veiksmīgi pievienots. - Uzstādīt kā galapunktu - "Labot favorītus " - Dzēst favorītus - Dzēst favorīta punktu \'%s\'? - Favorīta punkts {0} veiksmīgi dzēsts. - Ievadiet kļūdas tekstu - Kļūdas pieteikums veiksmīgi izveidots - Kļūda:pieteikums netika pievienots - Pievienot komentāru - Ziņa - Autora vārds - Pievieno komentāru kļūdas pieteikumam - "Pievienot komentāru " - Komentārs veiksmīgi pievienots - Kļūda:komentārs netika pievienots - Aizvērt kļūdas pieteikumu - Aizver kļūdas pieteikumu - Aizvērt kļūdas pieteikumu - Kļūdas pieteikums veiksmīgi aizvērts - Kļūda: kļūdas pieteikums netika aizvērts - Labot POI - Izveidot POI - Nevar atrast nodi, vai arī serivss nav atzīmēts kā viena node - Dzēst {0} (ievadiet komentāru)? - Dzēst POI - Dzēst - POI tika veiksmīgi izdzēsts - pievienot - mainīt - Darbība {0} beidzās veiksmīgi. - Radās neparedzēta kļūda veicot darbību {0}. - Radās I/O kļūda veicot darbību {0}. - Informācija par punktu netika ielādēta - Nosaukums - Atvērts - Komentārs - POI izmaiņas - Visas citas birkas ir rezervētas - Apvienot - Atiestatīt - Filtrēt - Dzēst - Saglabāt kā - Dzēst izvēlēto filtru? - Filtrs {0} tika izdzēsts - Filtrs {0} tika izveidots - Izvēlēties visu - Osmand offline navigation is temporarily not available. - Left Side Navigation - Turn on if you navigate in left side countries - Download or update offline data. \nTo see more details click on the item, to deactivate or delete offline data press and hold. \nCurrent data on device (%1$s free): - Starting location is not yet determined - Directions to here - Do you want to interrupt file downloading? - Basemap is required for proper application functioning and was selected to download. - " (includes GPX analyzer)" - Enable online maps plugin to select different map sources - Online maps - Use online maps (download and cache them on SD card) - Online Map - Configure online or cached tile map sources - - Map Settings - Configure the map display - This plugin facilitates using a variety of online or cached tile maps as base map or as overlay / underlay maps. The maps can also be prepared offline and copied to the Osmand folder. - Online Maps - This plugin allows tracking or navigation in power saving (screen off) mode by periodically waking up the GPS device to record a track point or play a voice prompt. - Screen Off Features - This plugin configures special accessibility features. - Accessibility - Advanced settings - This plugin facilitates recording your trips to GPX files or live monitoring using a web service. - Tracking + Monitoring - This plugin provides advanced map configuration and some device-specific settings. - Advanced Settings - This plugin enables development and debugging features like animated navigation or rendering performance display. - OsmAnd Development + + + Spraudņi + Atzīmējiet spraudni, lai to aktivizētu. Lai spraudnis sāktu strādāt, nepieciešams aplikācijas restarts. + Spraudņi iespējo aplikācijas papildu funkcionalitāti, tādu kā sekošana, kartes, baterijas saglabāšanas funkcijas, pieejamība un daudzas citas. + Spraudņi + "Izmaiņas 0.8.0 : \n\t- Plugin functionality \n\t- New offline map data support \n\t- Lots of bug fixes " + Šis spraudnis ir domāts OSM kvalitātes uzlabošanai. Tas ļauj savākt/modificēt OSM POI objektus, atvērt/komentēt OSM kļūdas un nosūtīt ierakstīto GPX (nepieciešama OSM ģistrācija). + OSM labošana + Vektoru kartes tiek attēlotas ātrāk. Tas var nestrādāt uz dažām iekārtām. + Simulēt progresiju manuāli + Atskaņot komandas izvēlētai balsij + OsmAnd izstrāde un atkļūdošana + Iekļautā renderēšana + Routinga animācija + Pārbaudīt balss komandas + Šajā vietā nav pieejama bezsaistes vektoru karte. Jūs variet lejuplādēt to uzstādījumos (Bezsaistes dati), vai arī pārslēgties uz tiešsaistes karti. + "Changes in 0.7.2 : \n\t- Native rendering for all devices \n\t- Offline POI editing \n\t- Accessibility \n\t- Lots of bug fixes " + Sūtīt GPX failus uz OSM? + Redzamība + Iezīmes + Apraksts + Lūdzu norādiet OSM lietotāja vārdu un paroli, kuru lietot augšuplādējot GPX failus. + Atbalsts + Atbalstiet jaunas iespējas + Attēlot lineālu uz kartes + Attēlot lineālu + Info + Atpakaļ uz atrašanās vietu + Palīdzība + Rādīt detaļas + Pieejamības paplašinājumi vecākām Android versijām + Pieejamības paplašinājumi + Pieejamības režīms + Ieslēdz pieejamības iespējas + Ieslēgts + Izslēgts + Atbilstoši sistēmas uzstādījumiem + Atpakaļ pie izvēlnes + Samazināt + Palielināt + Palielinājums ir + ziemeļi + ziemeļu-ziemeļu-austrumu + ziemeļu-austrumu + austrumu-ziemeļu-austrumu + austrumu + austrumu-dienvidu-austrumu + dienvidu-austrumu + dienvidu-dienvidu-austrumu + dienvidu + dienvidu-dienvidu-rietumu + dienvidu-rietumu + rietumu-dienvidu-rietumu + rietumu + rietumu-ziemeļu-rietumu + ziemeļu-rietumu + ziemeļu-ziemeļu-rietumu + Uz priekšu + Uz priekšu pa labi + Pa labi + Atpakaļ pa labi + Atpakaļ + Atpakaļ pa kreisi + Pa kreisi + Uz priekšu pa kreisi + plkst. + uz priekšu + Precizitāte + Altitude + Nav info + Sāniski (8 sektori) + Pulksteņrādītāja (12 sektori) + Virziena stils + Izvēlaties relatīvās virziena norādes izteiksmes stilus kustības laikā. + Sākt autoziņošanu + Pārtraukt autoziņošanu + Scroll map by gestures on the touchscreen + Naturālā kartes rulēšana + Es esmu šeit + Mainīt kartes palielinājumu ar rulīša kustību + Lietot peles rullīti kā palielināšanas konroli + Lietot īsos objektu nosaukumus pieskārienu skata režīmā + Lietot objektu vārdus + Ar pieejamību saistītās izvēles + Pieejamība + Nepietiek procesu atmiņas, lai attēlotu izvēlēto apgabalu + Flurescentie slāņi + Lietot flurescentās krāsas, lai attēlotu pēdas un ceļus + Bezsaistes POI rediģēšana + Viemēr pielietot bezsaistes POI rediģēšanu + "Jaumi 0.7.1 versijā : \n\t- Bezsaistes POI rediģēšana \n\t- Sekošanas opcija - periodiska koordināšu sūtīšana uz web servisu. (kā izveidot savu web servisu var izlasīt HowTo) \n\t- Rādīt pēdas kuras tiek ierakstītas \n\t- Virziena noteikšana: Ja brauciet pretējā virzienā vai esiet pabraucis garām pagriezienam tiek paziņots \'Izpildiet U-pagriezienu\' \n\t- Jauns bals ziņojums \'Ceļš pārrēķināts\' \n\t- Tūlītēja (100m)pagrieziena indikācija ar virziena bultas krāsas maiņu \n\t- Deaktivizēto indeksu failu aktualitāte tiek parādīta lejuplādes ekrānā ar tumši zaļu un tumši zilu \n\t- Citas izmaiņas " + POI izmaiņas aplikācijā neietekmē lejuplādētos kartes attēlus, izmaiņas tiek saglabātas atsevišķā failā. + Lejuplādē POI… + {0} POI tika lejuplādētji + Lejuplādēt visus POI + + + Rādīt POI uz kartes + Augšuplādēt izmaiņas uz OSM + Dzēst POI labojumus + Asinhronā POI rediģēšana: + Laokāli saglabātie OSM POIs + Rādīt un organizēt lokālajā datubāzē pieejamos OSM POI + Nosūtīt pēdas uz norādīto web servisu + Tiešsaistes sekošana + Norādīt tiešsaistes sekošanas intervālu + Tiešaistes sekošanas intervāls + Norādiet web adresi ar parametru sintaksi : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5} + Tiešaistes sekošanas web adrese + Lūdzu ieslēdziet \'Ierakstīt pēdas GPX\' Sekošanas uzstādījumus + Rādīt tekošās pēdas + "Jaunumi 0.7.0 versijā : \n\t- Bezsaistes wikipedia dati \n\t- Atjaunotas kartes \n\t- Citi mazi uzlabojumi " + Šajā bezmaksas OsmAnd versijā ir ierobežojums uz %1$ lejuplādētiem %2$ nu tā neatbalsta wikipedia rakstus. + Bezmaksas versija + Rādīt POI aprakstu + Ziemeļ Amerkika + Ziemeļamerika - ASV + Centrālamerika + Dienvidu Amerika + Eiropa + Eiropa - Francija + Eiropa - Vācija + Eiropa - Krievija / Āzija + Āfrika + Āzija + Okeānija + Pasaules un tematiskās kartes + Pasaules vikipēdija + Balss pakas (ieraksti) + Balss pakas (TTS) + Wikipedia (bezsaistes) + Lietotāja definēts + Eksistē fails ar iepriekš eksportētiem favorītiem. Vai vēlaties to pārrakstīt? + + Ar profilu saistītie uzstādījumi + Lietotāju profils + Izvēlaties lietotāja profilu. Katrs profils satur specifiskus uzstādījumus, kurus var mainīt zemāk. + - Sekošana + Norādīt sekošanas uzstādījumus + - Navigācija + Norādīt navigācijas opcijas + Globālie uzstādījumi + Bezsaistes dati + Lejuplādēt un pārvaldīt bezsaistes kartes un pārējos datus, tādus kā GPX pēdas + Vispārīgie uzstādījumi + Konfigurēt vispārīgos uzstādījumus + Globālie aplikācijas uzstādījumi + OSM lietotāja vārds + Nepieciešams, lai veiktu openstreetmap.org augšuplādi + Jūsu OSM parole + Nepieciešams, lai veiktu openstreetmap.org augšuplādi + Fona uzstādījumi + Lietojiet lai OsmAnd strādātu kā fona process, kad ekrāns ir izslēgts + Kartes rotēšana + \tJūs variet izvēlēties vai un kā notiks kartes rotācija \'Uzstādījumi\' -> \'Kartes izskats\' -> \'Kartes rotēšana\'. \n\tIzvēle ir: \n\t\'Nerotēt\' - Karte nemainīs orientāciju. Ziemeļi vienmēr būs augšā \n\t\'Kustības virzienā\' - Karte vienmēr pagriezīsies jūsu kustības virzienā \n\t\'Pēc kompasa\' - Karte vienmēr pagriezīsies pēc iekārtas kompasa datiem \n\tPadoms: Lai ātri pārslēgtu starp rotāciju ar kompasu un jūsu izstādījumos norādīto, jūs variet uzspiest uz kompasa kartes skatā. + Lejuplāde ir veiksmīga.\n\t\n\tLai aktivizētu \'Uzstādījumi\' -> \'Kartes konfigurācija\' -> \'Bezsaistes vektoru kartes\'. + Dienas/Nakts režīms + \tDažām vektoru kartēm izskats var tikt mainīts starp dienas (gaišāku) un nakts (tumšāku). \n\tNakts krāsas ir drošākas braukšanai. \n\tJūs variet izvēlēties noteikumus dienas/nakts pārslēgšana ar \'Uzstādījumi\' -> \'Kartes izskats\' ->\'Dienas/nakts režīms\'. \n\tJūs variet izvēlēties: \n\t\'Ausma/Saulriets\' - automātiskais režīms, kas ir atkarīgs no saules (noklusētais) \n\t\'Diena\' - vienmēr lietot dienas režīmu \n\t\'Night\' - vienmēr lietot nakts režīmu \n\t\'Gaismas sensors\' - kartes izskats tiek kontrolēts izmantojot jūsu iekārtas gaismas sensoru (ja tāds jūsu iekārtai ir) + OSM datu uzlabošana + \tOsmAnd lieto kartes kuras ir bāzētas uz Openstreetmap.org (OSM) datiem un, kopā ar kartes skatīšanos un navigāciju, var tikt izmantota, lai uzlabotu OSM datu kvalitāti. Jūs variet vienkārši augšuplādēt jaunus POI vai OSM kļūdas pieteikumus ar dažām dabībām! \n\tLai tas strādātu jums vispirms ir jānorāda OSM pieslēguma informācija \'Uzstādījumi\' -> \'Vispārīgie uzstādījumi\' -> \'OSM\'. \n\tLai pievienotu jaunu POI lietojiet opciju \'Izveidot POI\' kartes konteksta izvēlnē. Turpiniet ievadot POI informāciju par jauno punktu \'Izveidot POI\' dialogā un pabeidzot darbību apstipriniet ievadu. \n\tJums ir iespēja nekavējoties ziņot par kļūdām kartē ar OSM kļūdas pieteikuma palīdzību, tad OSM kopiena var ātrāk šo kļūdu izlabot. \n\tLai pievienotu OSM kļūdas pieteikumu izmantojiet opciju \'Pieteikt OSM kļūdu\' kartes konteksta izvēlnē. Tad ievadiet detalizētu kļūdas aprakstu un nobeidzot apstipriniet pieteikumu piespiežot pogu \'Pievienot\'. \n\tŅemiet vērā. OSM POI un kļūdu pieteikšanai ir nepieciešams datu savienojums. + + Nepietiek brīvas vietas lai lejuplādētu %1$s MB (brīvi: %2$i). + Patreiz ir brīvi {2} MB! Lejuplādēt {0} failu(s) ({1} MB)? + Izvelēties mērķi + \tJūs variet izvēlēties mērķi tieši kartē (konteksta izvēlne, tad \'Uzstādīt kā mērķi\'), visās meklēšanas darbībās, vai arī pieturot piespiestu ierakstu jūsu \'Jūsu favorītu punktu sarakstā\'. \n\tMērķis tiks iezīmēts kā oranžš riņķis kartē un OsmAnd attēlos attālumu līdz tam un virzienu uz to (ar oranžu trijstūri). + "Izmaiņas versijā 0.6.9 : \n\t- Uzlabota kartes renderēšana \n\t- Ātra bezsaistes renderēšana - meklējiet eksperimentālās iespējas (var nestrādāt dažās iekārtās) \n\t- Pamatīgas izskata izmaiņas \n\t- Augstuma informācija \n\t- Jauni tulkojumi (Vjetnamiešu, Poļu) \n\t- Citi nelieli papildinājumi " + Rādīt tekošo augstuma informāciju uz kartes + Rādīt augstumu + Lietot caurspīdīgas kartes vadības pogas + Caurspīdīgā tēma + Iekļautā bibliotēka šajā iekārtā netiek atbalstīta. + Inicializēju iekļauto bibliotēku… + Auto-centrēt karti + Laiks līdz karte sinhronizējas ar tekošo pozīciju + Nekad + Autocentrēt tikai ar nav + Autocentrēt karti tikai navigācijas laikā. + Autocentrēt karti pie attēlošanas. + Vektoru renderētāja specifiskās opcijas + Pārklājs / paklājs + Kartes avota uzstādījumi + Vektoru kartes uzstādījumi + Dzēst %1$u? + Piepilsēta + Ciems + Apdzīvota vieta + Pilsēta + Rajona pilsēta + POI marķējums + Izslēgt animāciju + Ieslēgt animāciju + "Izmaiņas 0.6.8 versijā : \n\t- Pilnībā pārstrādāta meklēšana (POI, Adrese)! Adresu meklēšana ir padarīta daudz ātrāka. Izveiots viena meklēšanas saskarne ar dažādām opcijām. \n\t- Implementēta POI meklēšana lielos apgabalos (valstīs) \n\t- Izlabota kartes raustīšanās tablet PC (Pieteikums 641) \n\t- Kartes auto-centrēšanas iespēja (Pieteikums 356) \n\t- GPX navigation moved to \'Directions\' and \'Save Directions\' moved to \'About route\' \n\t- POI data included in .obf file (all download indexes after 01/10/11) \n\t- Voice prompt fixes (GPS position fix, omitting first command) \n\t- Small improvements " + File can not be renamed. + File with that name already exists. + GPX route + Several POI categories found matching the query : + Local data to search POI is not present. + Search by name + The POI data file \'%1$s\' is redundant and can be deleted. + Local file to maintain POI changes not found and could not be created. + Upgrade Osmand+ + Server contains map files not compatible with your current version of the application. To download and use them, please upgrade the application to newer version. + Rename + Show on map + Online Nominatim + Select + Searching position… + Position (Found) + Address… + Favorites… + Undefined + Fixed + Current position… + Last map view + Search near : + Search near here + "Recent changes for 0.6.7 : \n\t- Offline data manager (download, delete, activate / deactivate offline data directly in Osmand) \n\t- Favorite points and groups (categorize, delete, manage favorites) \n\t- GPX Explorer in application (view track detail, distance, average speed, elevation, etc.) \n\t- GPX navigation (more options, continue navigation after crash, support roundabouts) \n\t- Function to save route as GPX track for offline use \n\t- Improve GPX monitoring (filter some inaccurate position and save accuracy/elevation/speed) \n\t- Upload GPX to OSM community (http://download.osmand.net/gpx/) \n\t- Improve vector rendering \n\t- Improvement of TTS engine (announce exact distance, enable miles) \n\t- Bug fixes " + Save route as GPX track + Route successfully saved as \'%1$s\'. + "File name : " + File with same name already exists. + Save + Save directions + Upload GPX files to OSM community. They will be used to improve maps. + %1$d of %2$d item(s) successfully uploaded. + Send to OSM + Show more map detail + Show some vector map detail (roads etc.) at lower zooms already + Favorite point(s) deleted successfully. + You are going to delete %1$d favorite(s) and %2$d favorite group(s). Are you sure? + Home + Friends + Places + Others + Name + Category + No, thanks + Base world map (covering the whole world at small zooms) is missing. Please consider downloading World_basemap_x.obf for a complete environment. + On board (\'offline\') data is missing on SD card. Please consider to download it in order to use maps offline. + "\n\nPress and hold for options" + "\nAverage speed : %1$s \nMaximum speed : %2$s" + "\nAverage altitude : %1$.0f m\nMinimum altitude : %2$.0f m\nMaximum altitude : %3$.0f m\nAscents : %4$.0f m\nDescents : %5$.0f m" + Subtracks : %1$d\nTotal points : %2$d\nWay points : %3$d\nTotal distance : %4$s\nStart time : %5$tF, %5$tR\nEnd time : %6$tF, %6$tR + Edition + %1$d of %2$d item(s) successfully deactivated. + %1$d of %2$d item(s) successfully deleted. + %1$d of %2$d item(s) successfully activated. + No items to %1$s + You are about to %1$s %2$s item(s). Continue? + Offline Data Manager + Activate + Deactivate + Delete + Refresh + Download… + Tile data: %1$s \nMinimum zoom : %2$d\nMaximum zoom : %3$d\nDownloadable : %4$s \nZooms downloaded : %5$s + POI data + Address data + Transport data + Map data + + + Deactivated + Voice data (TTS) + Voice data (recorded) + GPX data + Map data (tiles) + Map data (vector) + POI data + TTS Voice + New Search + Select text size for names on the map + Text size + Rendering debug info + Display rendering performance + Recent changes + "Recent changes for 0.6.6 : \n\t- Text To Speech engine for voice navigation \n\t- Make map renderer more detailed \n\t- Basemap for whole world packaged with app \n\t- Tweak offline navigation (still experimental) \n\t- GPX navigation options \n\t- UI update and large bug fixing " + Do not use + None + Unpacking new data… + An online navigation service is selected but no internet connection is available. + Language not supported + The selected language is not supported by the installed Android TTS (text-to-speech) engine. Do you want to go to the Market to look for another TTS engine? Otherwise the preset TTS language will be used. + Missing data + No data for the selected language is installed. Do you want to go to the Market to install? + Reverse GPX direction + Use current destination + Pass along entire track + Offline vector map present for this location. \n\t\n\tTo use activate \'Menu\' -> \'Define view\' -> \'Map Source…\' -> \'Offline vector maps\'. + Voice guidance output + Choose channel to play voice guidance (system-dependent) + Voice call audio + Notification audio + Media/music audio + Application cannot download map layer %1$s, please try to reinstall it. + Modify overlay transparency + Overlay transparency + Modify base map transparency + Base map transparency + Modify transparency + Underlay map… + Underlay map + Choose underlay map + Overlay map… + None + Overlay map + Choose overlay map + Map is already installed, settings will be updated + Select (tile) maps to install or update + Internet connection required for operation is not available + Install more… + Update of Offline Data + \tHaving up-to-date map data is essential. Osmand provides a download manager which can check for available offline data updates. \n\tTo check for updates go to \'Settings\' -> \'Offline data\' -> \'Download offline data\'. After region list is retrieved from the internet, you can select option \'Menu\' -> \'Filter downloaded\' to indicate updates only for data already on your device. \n\tThe availability of updates is depicted by the following colors: \n\t\'Green\' - indicates data files identical on device and server \n\t\'Blue\' - indicates available updates on server + Minimum zoom level to use vector maps + Min. vector zoom level + Location Sharing + \tYou can share the location of interesting places on your trip with family or friends. \n\tTo share any location you want: \n\tUse \'Map context menu\' -> \'Share location\' menu. \n\tThen select a way to share your location. The choices are: E-Mail, SMS(text), or just copy location coordinates to clipboard. + Favorite Points + \tFrequently used points can be saved as Favorites. \n\tTo save a point as Favorite go to the map context menu, select option \'Add to favorites\' and then enter a name for it. After saving a Favorite, it is accessible via \'Main Menu\' -> \'Favorites\'. \n\tLong pressing on a Favorite in the \'Favorites\' menu provides options to set it as desination, Edit or Delete it. \n\tTo display all Favorite points directly on the map, enable layer \'Favorites\' in \'Map context menu\' ->\'Define view\'. + + Online OSM map classification with images + Error occurred in offline search + Could not parse geo intent \'%s\' + Search address using offline maps + System + Select display language + Display language + Map Source + \tThe fastest way to change the map source and layers displayed is pressing \'Menu\' -> \'Define view\' in map view. \n\tUnder \'Map source…\' you can choose using the pre-loaded offline vector maps, predefined (online) tile sources, or maps manually created using e.g. OsmAndMapCreator on a PC. \n\tOsmAnd also supports custom sources. + User Profile + \tOsmAnd supports different (customizable) application profiles for different use cases. \n\tYou can change profiles in \'Menu\' -> \'Settings\' -> \'User Profile\', or when creating a route. + Navigation + \tBefore starting a navigation you need to select a destination. Afterwards press \'Menu\' -> \'Directions\' on map and select the navigation type. + Searching + \tYou can search for places directly on the map, or by address, by location, as POI, or as predefined favorite. \n\tPressing \'Search\' in the main menu opens the search activities. For all hits a context menu offers 2 options: \'Set as destination\' or \'Show on map\'. + Map Context Menu + \tThe map context menu is available by pressing and holding on the map or by pressing the trackball button. \n\tThis produces a box with point coordinates. To open the map context menu dialog, tap on it. (Or press and hold on it to hide the box again.) \n\tThe map context menu contains all actions referring to a point (location). + Tips and Tricks + \tOsmAnd is a navigation application with many features. \n\tAs an basic introduction, some usage tips and tricks are linked on the main menu screen. + Next + Previous + Change units of length and speed + Unit of measure + Miles/feet + Miles/yards + Kilometers/meters + yd + ft + mph + mi + Share location using + Location: %1$s\n%2$s + To see location follow the web browser link %1$s or android intent link %2$s + Send location + Share location + Waypoint \'\'{0}\'\' was successfully added + Add waypoint to recorded GPX track + Add GPX waypoint + Administrative + Barrier + Education + Emergency + Entertainment + Finance + Geocache + Healthcare + Historic + Landuse + Leisure + Man made + Military + Natural + Office + Other + Shop + Sport + Sustenance + Tourism + Transportation + Indexing address… + Indexing map… + Indexing POI… + Indexing transport… + I/O error occurred + km + km/h + m + Deprecated map data format \'\'{0}\'\' is not supported + Car aid + Closest POI + Custom filter + Food shop + For tourists + Fuel + Online NameFinder + Reading cached tiles… + The index \'\'{0}\'\' did not fit into memory + The version of index \'\'{0}\'\' is not supported + OsmAnd navigation >20km + Use OsmAnd offline navigation applies only to routes > 20 km (experimental) + OsmAnd offline navigation is an experimental feature and it does not work for distances of more than about 20 km.\n\nNavigation service is temporarily switched to online CloudMade. + Can not find specified directory. + Storage directory + Changing the storage directory will not move or delete the data. This must be performed separately and outside OsmAnd. Continue anyway? + A previous OsmAnd version is installed. All offline data will be supported by new the new application. But Favorite points should be exported in the old application and later imported by the new one. + Build {0} successfully installed ({1}). + Downloading build… + Do you want to install OsmAnd - {0} from {1} {2} MB ? + Retrieving the list of OsmAnd builds failed + Loading OsmAnd builds… + Select one of the OsmAnd builds to install + Special activity for contribution version + GPS Status application not installed. Search in Market? + Voice guidance is not available. Please go to settings, choose preferred voice data package, and download it. + No voice guidance selected + Day + Night + Sunrise/sunset + Light sensor + Choose day/night mode switching rule + Day/night mode + Download {0} file(s) ({1} MB)? + {0} item(s) selected + Filter downloaded + Deselect all + Select all + Refresh + Fastest route + "Enable to calculate fastest route or disable for shortest route " + At zoom {0} download {1} tiles ({2} MB) + Download map + Select maximum zoom to preload + This map could not be downloaded + Continuous rendering + Display continuous rendering instead of image-at-once + Error occurred while rendering selected area + Location options + Renderer sucessfully loaded + Exception occured: renderer was not loaded + Vector renderer + Choose rendering appearance + Show POI website + Show POI phone + web site + phone + type to filter + High resolution display + Do not stretch (and blur) map tiles on high density displays + Position unknown yet + Download + Search transport + Transport results (no target): + Transport results ({0} to target): + none + Reset Transport search + Map + Voice + Vector maps were not loaded + Navigate using GPX + GPX files not found in /tracks directory + GPX track… + Error reading GPX data + Offline vector maps + Search transport at stop + Location:\n Lat %1$.5f\n Lon %2$.5f + Bug + Modify POI + Delete POI + To compass + To direction of movement + Don\'t rotate + Select how map is oriented + Map orientation + Route details + Favorites succesfully imported + GPX file containing favorites is not found at {0} + Favorites succesfully saved to {0} + No favorite points to save + Import + Export + Error occurred while loading GPX + Send report + No offline data for regions found on SD card. Download regions from the Internet. + Input search query to find POI + Any + Transport route + Thanks to Yandex for traffic information. + Yandex traffic + Route + Favorites + OSM bugs + Transport stops + POI… + Map source… + Define view + Previous navigation was unfinished. Continue following it? + Search POI + Show route from here + Use trackball to move map + Use trackball + Set maximum waiting time for each background position fix + Maximum wait for fix + Switch off background navigation service + Where am I? + OsmAnd navigation service + Network + GPS + seconds + min. + "Set wake-up interval used by background " + Wake-up interval + Choose location provider while running in background mode + Location provider + Runs OsmAnd in the background to track your location while screen is off + Run in the background + The background navigation service requires a location source to be turned on. + Hide filter + Show filter + Filter + Sound is on + Sound is off + Select voice guidance for navigation + Voice guidance + Initializing voice data… + Unsupported version of voice data + Specified voice data is corrupted + Selected voice data is not available + Stop navigtn. + SD card is not accessible.\nYou won\'t be able to see maps or find things. + SD card is read-only.\nYou can only see the preloaded map and can\'t download from the Internet. + Unzipping file… + Turn right and go + Turn sharply right and go + Turn slightly right and go + Turn left and go + Turn sharply left and go + Turn slightly left and go + Make U-turn and go + Head + Later + Download regions + Thank you for choosing OsmAnd. \nTo use the major features of this application, you will need some regional offline data, which you can download (use Settings, Offline Data). Afterwards, you will be able to search by address, look up POIs and find public transportation. + Searching for signal… + Search near last map location + Search nearby + Same as device + Portrait + Landscape + Screen orientation + Choose screen orientation + Opening hours format is not supported for editing + Add new rule + Routes + Stop + stops + Subsequent route + Prior route + Finish search + Choose stop to get off + prior distance + subsequent distance + stops to pass + Route distance + Transport + OK + Show public transport stops on map + Show transport stops + Navigation application OsmAnd + POI data was updated successfully ({0} were loaded) + Error updating local POI list + Error while loading data from server + No offline POI data available for this area + Updating POIs is not available for small zoom levels + Update POI + Update local data via Internet? + City:\n {0} + Street:\n {0}, {1} + Intersection: {0} x {1} in {2} + Building: {0}, {1}, {2} + Favorite + Clear all + History + Uploading data… + Uploading… + Nothing found + Searching… + Searching address… + Search address using OSM Nominatim + House number, street, city + Offline + Internet + Max. online zoom + Choose maximum zoom level to download for online map tiles + Total distance %1$s, travelling time %2$d h %3$d m. + Choose online or offline navigation service + Navigation service + Save directory on SD card not accessible + Download {0} - {1} ? + Offline data for {0} already exists ({1}). Do you want to update it ({2}) ? + Address + Download successful + I/O error occured + Downloading file… + Downloading… + Downloading list of available regions… + The list of regions was not retrieved from osmand.net. + If you can\'t find your region, you can make it yourself. See osmand.net + Show on map + Favorite point was edited + No favorite points exist + Replace + Only show + Follow + Select mode of transportation (optional): + Please select destination first + Directions + Show GPS Status + Opening hours + Opening changeset… + Closing changeset… + Committing node… + Loading POI… + Authorization failed + failed + Converting native/English names… + Loading streets/buildings… + Loading postcodes… + Loading streets… + Loading cities… + Loading… + POI + Error while saving GPX + Error calculating route + Error occurred while calculating route + Error: Calculated route is empty + New route calculated, distance + You have arrived at your destination + Coordinates are invalid! + Go back to OsmAnd map + Close + Loading data… + Reading local data… + Last OsmAnd run crashed. Log file is at {0}. Please report the issue and attach the log file. + Saving GPX tracks to SD… + Finished + Re-read offline vector maps and data from SD card + Re-read offline data + Download or update data for offline use from the Internet + Download offline data + Use Internet to calculate route + Use online navigation + Specify Openstreetmap.org (OSM) settings needed for OSM submissions + Specify language, download/reload data + Data + Specify map settings: map source, rotation, marker position, screen orientation + OSM + Auto zoom map according to your speed + Auto zoom map + Additional settings + Settings + Save current track to SD now + Save current track + Logging interval + Choose positioning interval for tracks + Tracks will be saved to track directory grouped by days + Log track to GPX + Set as destination + Update map + Reload tile + Target + Show OpenStreetBugs on map + Show OpenStreetBugs + Favorites + Add to Favorites + Select between native and English names + Use English names + Application settings + Search address + Choose building + Choose street + Choose city + Choose country + Choose location of position marker on the map + Position marker + Set as destination + Display viewing direction on the map + Display viewing direction + Clear destin. + Set as dest. + Enable 3D view of the map + Map View 3D + Show POI over map (use last chosen filter) + Show POI + Choose the source of online or offline map tiles + Tile map source + Map source + Use Internet + Show location + Map + Settings + Show GPS coordinates on map + Use Internet to download missing map tiles + Navigation application + Exit + Map + Settings + Favorites + Search + Search + Izvēlēties POI + Atrast vairāk + Pieaugoši meklēt pilsētas. Lai atrastu pilsētu ievadiet 3 vai vairāk simbolus. + "Pieaugoši meklēt ielas. " + Pieaugoši meklēt ēkas. + Izvēlieties reģionu no saraksta + Izvēlēties ielu krustojumu + Tuvākie servisi + "Noklusēti " + Auto + Velosipēds + Kājāmgājējs + Centrs + Apakša + Ievadiet platumu & garumu izvēlētā formātā (G - grādi , M - minūtes , S - sekundes) + Platums + Garums + GGG.GGGGG + GGG MM.MMMMM + GGG MM SS.SSSSS + Rādīt kartē + Atcelt + Izvēlēties adresi + Reģions + Pilsēta + Iela + Ēka + Ēka + Krustojums + Atrašanās vieta + Uzstādīt kādi galapunktu + Pievienot favorītiem + Atjaunot karti + Atvērt OSM bug + Izveidot POI + Jā + Atcelt + Pielietot + Pievienot + Nē + Ievadiet favorīta nosaukumu + Favorīti + Favorīta punkts \'\'{0}\'\' veiksmīgi pievienots. + Uzstādīt kā galapunktu + "Labot favorītus " + Dzēst favorītus + Dzēst favorīta punktu \'%s\'? + Favorīta punkts {0} veiksmīgi dzēsts. + Ievadiet kļūdas tekstu + Kļūdas pieteikums veiksmīgi izveidots + Kļūda:pieteikums netika pievienots + Pievienot komentāru + Ziņa + Autora vārds + Pievieno komentāru kļūdas pieteikumam + "Pievienot komentāru " + Komentārs veiksmīgi pievienots + Kļūda:komentārs netika pievienots + Aizvērt kļūdas pieteikumu + Aizver kļūdas pieteikumu + Aizvērt kļūdas pieteikumu + Kļūdas pieteikums veiksmīgi aizvērts + Kļūda: kļūdas pieteikums netika aizvērts + Labot POI + Izveidot POI + Nevar atrast nodi, vai arī serivss nav atzīmēts kā viena node + Dzēst {0} (ievadiet komentāru)? + Dzēst POI + Dzēst + POI tika veiksmīgi izdzēsts + pievienot + mainīt + Darbība {0} beidzās veiksmīgi. + Radās neparedzēta kļūda veicot darbību {0}. + Radās I/O kļūda veicot darbību {0}. + Informācija par punktu netika ielādēta + Nosaukums + Atvērts + Komentārs + POI izmaiņas + Visas citas birkas ir rezervētas + Apvienot + Atiestatīt + Filtrēt + Dzēst + Saglabāt kā + Dzēst izvēlēto filtru? + Filtrs {0} tika izdzēsts + Filtrs {0} tika izveidots + Izvēlēties visu + Osmand offline navigation is temporarily not available. + Left Side Navigation + Turn on if you navigate in left side countries + Download or update offline data. \nTo see more details click on the item, to deactivate or delete offline data press and hold. \nCurrent data on device (%1$s free): + Starting location is not yet determined + Directions to here + Do you want to interrupt file downloading? + Basemap is required for proper application functioning and was selected to download. + " (includes GPX analyzer)" + Enable online maps plugin to select different map sources + Online maps + Use online maps (download and cache them on SD card) + Online Map + Configure online or cached tile map sources + - Map Settings + Configure the map display + This plugin facilitates using a variety of online or cached tile maps as base map or as overlay / underlay maps. The maps can also be prepared offline and copied to the Osmand folder. + Online Maps + This plugin allows tracking or navigation in power saving (screen off) mode by periodically waking up the GPS device to record a track point or play a voice prompt. + Screen Off Features + This plugin configures special accessibility features. + Accessibility + Advanced settings + This plugin facilitates recording your trips to GPX files or live monitoring using a web service. + Tracking + Monitoring + This plugin provides advanced map configuration and some device-specific settings. + Advanced Settings + This plugin enables development and debugging features like animated navigation or rendering performance display. + OsmAnd Development \ No newline at end of file diff --git a/Osmand-kernel/Makefile b/Osmand-kernel/Makefile index bd1adcdcd7..2065c41aca 100755 --- a/Osmand-kernel/Makefile +++ b/Osmand-kernel/Makefile @@ -1,16 +1,9 @@ -include Makefile.vars -build : - cd protobuf; $(MAKE) - cd png; $(MAKE) - cd skia; $(MAKE) - cd expat; $(MAKE) - cd freetype; $(MAKE) - cd osmand; $(MAKE) - -clean : - cd protobuf; $(MAKE) clean - cd png; $(MAKE) clean - cd skia; $(MAKE) clean - cd expat; $(MAKE) clean - cd freetype; $(MAKE) clean - cd osmand; $(MAKE) clean +projects := protobuf png skia expat freetype osmand + +.DEFAULT: installr +.PHONY: release debug clean installr installd + +installr release debug clean installd: + @- $(foreach project,$(projects), \ + $(MAKE) --directory=./$(project) $@; \ + ) diff --git a/Osmand-kernel/Makefile.rules b/Osmand-kernel/Makefile.rules new file mode 100755 index 0000000000..cd9d2e27c1 --- /dev/null +++ b/Osmand-kernel/Makefile.rules @@ -0,0 +1,76 @@ +# Just check if we have everything defined +ifeq ($(CC_SOURCE_FILES_EXTS),) + CC_SOURCE_FILES_EXTS := c cc +endif +ifeq ($(CXX_SOURCE_FILES_EXTS),) + CXX_SOURCE_FILES_EXTS := cpp cxx +endif + +# Target configuration +CXXFLAGS_debug := -g -O0 +CFLAGS_debug := -g -O0 +CXXFLAGS_release := -O2 +CFLAGS_release := -O2 + +# Get the build type +PREBUILT_DIR_PREFIX = ../lib/$(TARGET)-$(ARCH) + +# Collect objects +OBJECTS = $(foreach sourceFilesExt,$(CC_SOURCE_FILES_EXTS), \ + $(patsubst %.$(sourceFilesExt),obj-$(TARGET)-$(ARCH)/%.$(sourceFilesExt).cc.o,$(filter %.$(sourceFilesExt),$(LOCAL_SRC_FILES))) \ +) $(foreach sourceFilesExt,$(CXX_SOURCE_FILES_EXTS), \ + $(patsubst %.$(sourceFilesExt),obj-$(TARGET)-$(ARCH)/%.$(sourceFilesExt).cxx.o,$(filter %.$(sourceFilesExt),$(LOCAL_SRC_FILES))) \ +) + +# Default target +.DEFAULT: installr + +# Declare phony targets +.PHONY: release debug clean installr installd + +# Precious targets +.PRECIOUS: build-release/$(LIBNAME).$(LIBTYPE) build-debug/$(LIBNAME).$(LIBTYPE) $(addprefix build-release/,$(OBJECTS)) $(addprefix build-debug/,$(OBJECTS)) + +# Route build targets properly +installr: install-release +installd: install-debug +release: build-release/$(LIBNAME).$(LIBTYPE) +debug: build-debug/$(LIBNAME).$(LIBTYPE) + +# Clean removes all objects +clean: + $(RM) -r build-release + $(RM) -r build-debug + +# This target copies final output file to prebuilt folder +install-%: % + @mkdir -p $(PREBUILT_DIR_PREFIX)-$* + cp build-$*/$(LIBNAME).$(LIBTYPE) $(PREBUILT_DIR_PREFIX)-$*/$(LIBNAME).$(LIBTYPE) + +# Builds source files using CC compiler +build-release/obj-$(TARGET)-$(ARCH)/%.cc.o : % $(LOCAL_C_INCLUDES) + @mkdir -p `dirname $@` + $(CC) -o $@ -c $< $(CFLAGS_release) $(CFLAGS) $(addprefix -I, $(LOCAL_C_INCLUDES)) $(LOCAL_CFLAGS) +build-debug/obj-$(TARGET)-$(ARCH)/%.cc.o : % $(LOCAL_C_INCLUDES) + @mkdir -p `dirname $@` + $(CC) -o $@ -c $< $(CFLAGS_debug) $(CFLAGS) $(addprefix -I, $(LOCAL_C_INCLUDES)) $(LOCAL_CFLAGS) + +# Builds source files using CXX compiler +build-release/obj-$(TARGET)-$(ARCH)/%.cxx.o : % $(LOCAL_C_INCLUDES) + @mkdir -p `dirname $@` + $(CXX) -o $@ -c $< $(CXXFLAGS_release) $(CFLAGS) $(addprefix -I, $(LOCAL_C_INCLUDES)) $(LOCAL_CFLAGS) +build-debug/obj-$(TARGET)-$(ARCH)/%.cxx.o : % $(LOCAL_C_INCLUDES) + @mkdir -p `dirname $@` + $(CXX) -o $@ -c $< $(CXXFLAGS_debug) $(CFLAGS) $(addprefix -I, $(LOCAL_C_INCLUDES)) $(LOCAL_CFLAGS) + +# This target assembles static library +.SECONDEXPANSION: +build-%/$(LIBNAME).$(STATICLIB_EXT): $$(addprefix build-%/,$(OBJECTS)) + @mkdir -p `dirname $@` + $(AR) rs $@ $? + +# This target assembles dynamic library +.SECONDEXPANSION: +build-%/$(LIBNAME).$(DYNAMICLIB_EXT): $$(addprefix build-%/,$(OBJECTS)) + @mkdir -p `dirname $@` + $(CXX) -shared -o $@ $? -L$(PREBUILT_DIR_PREFIX)-$* $(LDFLAGS) $(LDLIBS) \ No newline at end of file diff --git a/Osmand-kernel/Makefile.vars b/Osmand-kernel/Makefile.vars index 5786877ee9..08da9843d9 100644 --- a/Osmand-kernel/Makefile.vars +++ b/Osmand-kernel/Makefile.vars @@ -2,26 +2,27 @@ ifndef JAVA_HOME $(error Set JAVA_HOME environment variable) endif +ARCH := x86 -arch := x86 +############################################################################################################################ -ifeq ($(os),) +ifeq ($(TARGET),) ifeq ($(shell uname),Darwin) - os := darwin + TARGET := darwin endif ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN) - os := cygwin + TARGET := cygwin endif ifeq ($(findstring MINGW,$(shell uname)),MINGW) - os := win + TARGET := win endif endif -ifeq ($(os),) - os := linux +ifeq ($(TARGET),) + TARGET := linux endif # Windows uses different path separators, because they hate me -ifeq ($(os),win) +ifeq ($(TARGET),win) sep := ; else sep := : @@ -43,15 +44,6 @@ darwin_STRIP := strip -x #darwin_CPP_FLAGS := strip -x #darwin_LINKFLAGS := -dynamiclib $(Support10_4) -# mingw32 via Cygwin OBSOLETE : i686-pc-mingw32- -# mingw64 via Cygwin : i686-w64-mingw32- -# gcc via Cygwin : i686-pc-cygwin- -# x86_64-w64-mingw32 -cygwin_CXX := i686-pc-cygwin-g++ -cygwin_CC := i686-pc-cygwin-gcc -cygwin_STRIP := i686-pc-cygwin-strip -cygwin_LDFLAGS := -Wl,--kill-at -cygwin_CPP_FLAGS := -D__int64="long long" -D_JNI_IMPLEMENTATION -D_REENTRANT -D_GNU_SOURCE win_CXX := i586-mingw32msvc-gcc win_CC := i586-mingw32msvc-gcc @@ -59,9 +51,26 @@ win_STRIP := i586-mingw32msvc-strip win_CPP_FLAGS := -D_Windows #win_CFLAGS := -D_JNI_IMPLEMENTATION_ -Ilib/inc_win -I$(JAVA_HOME)/include -O #win_LINKFLAGS := -Wl,--kill-at -shared +############################################################################################################################ -CXX := $($(os)_CXX) -CC := $($(os)_CC) -STRIP := $($(os)_STRIP) -CPP_OS_FLAGS := $($(os)_CPP_FLAGS) -LDFLAGS := $($(os)_LDFLAGS) \ No newline at end of file +### Cygwin target ### +cygwin_CXX := i686-pc-cygwin-g++ +cygwin_CC := i686-pc-cygwin-gcc +cygwin_STRIP := i686-pc-cygwin-strip +cygwin_LDFLAGS := -Wl,--kill-at +cygwin_CFLAGS := -D__int64="long long" -D_JNI_IMPLEMENTATION -D_REENTRANT -D_GNU_SOURCE +cygwin_CXXFLAGS := -D__int64="long long" -D_JNI_IMPLEMENTATION -D_REENTRANT -D_GNU_SOURCE +cygwin_STATICLIB_EXT := lib +cygwin_DYNAMICLIB_EXT := dll +cygwin_LIBRARY_PREFIX := # empty + +# Publish chosen settings as global +CXX := $($(TARGET)_CXX) +CC := $($(TARGET)_CC) +STRIP := $($(TARGET)_STRIP) +CFLAGS := $($(TARGET)_CFLAGS) +CXXFLAGS := $($(TARGET)_CXXFLAGS) +LDFLAGS := $($(TARGET)_LDFLAGS) +STATICLIB_EXT := $($(TARGET)_STATICLIB_EXT) +DYNAMICLIB_EXT := $($(TARGET)_DYNAMICLIB_EXT) +LIBRARY_PREFIX := $($(TARGET)_LIBRARY_PREFIX) \ No newline at end of file diff --git a/Osmand-kernel/cpufeatures_proxy/Android.mk b/Osmand-kernel/cpufeatures_proxy/Android.mk index 6c016c1cc7..594bed8b00 100755 --- a/Osmand-kernel/cpufeatures_proxy/Android.mk +++ b/Osmand-kernel/cpufeatures_proxy/Android.mk @@ -15,7 +15,7 @@ LOCAL_STATIC_LIBRARIES := cpufeatures include $(BUILD_SHARED_LIBRARY) else LOCAL_SRC_FILES := \ - ../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so + ../lib/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so LOCAL_STATIC_LIBRARIES := cpufeatures include $(PREBUILT_SHARED_LIBRARY) endif diff --git a/Osmand-kernel/expat/.gitignore b/Osmand-kernel/expat/.gitignore index 378eac25d3..1964f995ad 100644 --- a/Osmand-kernel/expat/.gitignore +++ b/Osmand-kernel/expat/.gitignore @@ -1 +1 @@ -build +build-* \ No newline at end of file diff --git a/Osmand-kernel/expat/Android.mk b/Osmand-kernel/expat/Android.mk index 18b32bebca..f272b24648 100755 --- a/Osmand-kernel/expat/Android.mk +++ b/Osmand-kernel/expat/Android.mk @@ -16,6 +16,6 @@ include $(BUILD_STATIC_LIBRARY) else LOCAL_SRC_FILES := \ - ../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a + ../lib/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a include $(PREBUILT_STATIC_LIBRARY) endif diff --git a/Osmand-kernel/expat/Makefile b/Osmand-kernel/expat/Makefile index 77c2a7a4d5..6fe1ac6b51 100644 --- a/Osmand-kernel/expat/Makefile +++ b/Osmand-kernel/expat/Makefile @@ -1,25 +1,13 @@ -LOCAL_PATH = . +# Include tools definitions include ../Makefile.vars + +# Include project files +LOCAL_PATH = . include Common.mk -CPP_FILE_EXTENSION = c -LIBNAME := libexpat.a -PREBUILT_DIR = ../jni-prebuilt/$(os)-$(arch) -OBJECTS = $(LOCAL_SRC_FILES:%.$(CPP_FILE_EXTENSION)=build/obj-$(os)-$(arch)/%.o) -CPPFLAGS = $(LOCAL_CFLAGS) $(C_INCLUDES) $(CPP_OS_FLAGS) -Iexpat_library +# Set library name +LIBNAME = $(LIBRARY_PREFIX)expat +LIBTYPE = $(STATICLIB_EXT) -target : $(PREBUILT_DIR)/$(LIBNAME) - -$(PREBUILT_DIR)/$(LIBNAME) : build/$(LIBNAME) - mkdir -p $(PREBUILT_DIR) - cp build/$(LIBNAME) $(PREBUILT_DIR) - -build/$(LIBNAME): $(OBJECTS) - ar -rf build/$(LIBNAME) $(OBJECTS) - -build/obj-$(os)-$(arch)/%.o : %.$(CPP_FILE_EXTENSION) $(LOCAL_C_INCLUDES) - @mkdir -p `dirname $@` - $(CXX) -o $@ -c $*.$(CPP_FILE_EXTENSION) $(CPPFLAGS) - -clean: - $(RM) $(OBJECTS) build/$(LIBNAME) \ No newline at end of file +# Finally, include generic rules +include ../Makefile.rules \ No newline at end of file diff --git a/Osmand-kernel/freetype/.gitignore b/Osmand-kernel/freetype/.gitignore index 567609b123..1964f995ad 100644 --- a/Osmand-kernel/freetype/.gitignore +++ b/Osmand-kernel/freetype/.gitignore @@ -1 +1 @@ -build/ +build-* \ No newline at end of file diff --git a/Osmand-kernel/freetype/Android.mk b/Osmand-kernel/freetype/Android.mk index 16ac33f709..94d2c4441f 100755 --- a/Osmand-kernel/freetype/Android.mk +++ b/Osmand-kernel/freetype/Android.mk @@ -20,6 +20,6 @@ include $(BUILD_STATIC_LIBRARY) else LOCAL_SRC_FILES := \ - ../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a + ../lib/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a include $(PREBUILT_STATIC_LIBRARY) endif diff --git a/Osmand-kernel/freetype/Makefile b/Osmand-kernel/freetype/Makefile index 4e38e36cbe..77d4b0f6a4 100644 --- a/Osmand-kernel/freetype/Makefile +++ b/Osmand-kernel/freetype/Makefile @@ -1,26 +1,13 @@ -LOCAL_PATH = . +# Include tools definitions include ../Makefile.vars + +# Include project files +LOCAL_PATH = . include Common.mk -CPP_FILE_EXTENSION = c -LIBNAME := libft2.a -PREBUILT_DIR = ../jni-prebuilt/$(os)-$(arch) -OBJECTS = $(LOCAL_SRC_FILES:%.$(CPP_FILE_EXTENSION)=build/obj-$(os)-$(arch)/%.o) -C_INCLUDES := $(addprefix -I, $(LOCAL_C_INCLUDES)) -CPPFLAGS = $(LOCAL_CFLAGS) $(C_INCLUDES) +# Set library name +LIBNAME = $(LIBRARY_PREFIX)ft2 +LIBTYPE = $(STATICLIB_EXT) -target : $(PREBUILT_DIR)/$(LIBNAME) - -$(PREBUILT_DIR)/$(LIBNAME) : build/$(LIBNAME) - mkdir -p $(PREBUILT_DIR) - cp build/$(LIBNAME) $(PREBUILT_DIR) - -build/$(LIBNAME): $(OBJECTS) - ar -rf build/$(LIBNAME) $(OBJECTS) - -build/obj-$(os)-$(arch)/%.o : %.$(CPP_FILE_EXTENSION) $(LOCAL_C_INCLUDES) - @mkdir -p `dirname $@` - $(CXX) -o $@ -c $*.$(CPP_FILE_EXTENSION) $(CPPFLAGS) - -clean: - $(RM) $(OBJECTS) build/$(LIBNAME) \ No newline at end of file +# Finally, include generic rules +include ../Makefile.rules \ No newline at end of file diff --git a/Osmand-kernel/gif/Android.mk b/Osmand-kernel/gif/Android.mk index 05327ff419..8cb1182b81 100755 --- a/Osmand-kernel/gif/Android.mk +++ b/Osmand-kernel/gif/Android.mk @@ -30,6 +30,6 @@ include $(BUILD_STATIC_LIBRARY) else LOCAL_SRC_FILES := \ - ../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a + ../lib/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a include $(PREBUILT_STATIC_LIBRARY) endif diff --git a/Osmand-kernel/jpeg/Android.mk b/Osmand-kernel/jpeg/Android.mk index 11ddb18f9a..261edaa78d 100755 --- a/Osmand-kernel/jpeg/Android.mk +++ b/Osmand-kernel/jpeg/Android.mk @@ -86,6 +86,6 @@ include $(BUILD_STATIC_LIBRARY) else LOCAL_SRC_FILES := \ - ../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a + ../lib/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a include $(PREBUILT_STATIC_LIBRARY) endif diff --git a/Osmand-kernel/jni-prebuilt/.gitignore b/Osmand-kernel/lib/.gitignore similarity index 100% rename from Osmand-kernel/jni-prebuilt/.gitignore rename to Osmand-kernel/lib/.gitignore diff --git a/Osmand-kernel/osmand/.gitignore b/Osmand-kernel/osmand/.gitignore index 378eac25d3..1964f995ad 100644 --- a/Osmand-kernel/osmand/.gitignore +++ b/Osmand-kernel/osmand/.gitignore @@ -1 +1 @@ -build +build-* \ No newline at end of file diff --git a/Osmand-kernel/osmand/Makefile b/Osmand-kernel/osmand/Makefile index f83859c44b..78e5c04c20 100644 --- a/Osmand-kernel/osmand/Makefile +++ b/Osmand-kernel/osmand/Makefile @@ -1,71 +1,40 @@ -LOCAL_PATH := . +# Include tools definitions include ../Makefile.vars -include ./Common.mk -PREBUILT_DIR = ../jni-prebuilt/$(os)-$(arch) -LIBNAME := osmand.lib -LIBOSNAME := osmand-$(os)-$(arch).lib -RUNFILE := osmand_main - -LOCAL_SRC_FILES += src/osmand_main.cpp - -#LDFLAGS = -Wl,--hash-style=both -fPIC -LDFLAGS := $(LDFLAGS) -Wall -fPIC -Wl,-Bsymbolic -#LDRUNFLAGS = -Wl,--hash-style=both -# --trace -Bsymbolic -Bsymbolic-functions - -LDLIBS = -L$(PREBUILT_DIR) -lskia -lproto -lpthread -lrt -lft2 -lexpat -lpng -lz -CPP_FILE_EXTENSION = cpp -OBJECTS = $(LOCAL_SRC_FILES:src/%.$(CPP_FILE_EXTENSION)=build/obj-$(os)-$(arch)/%.o) - -C_INCLUDES := $(addprefix -I, $(LOCAL_C_INCLUDES)) +# Include project files +LOCAL_PATH = . +include Common.mk +# Set library name +LIBNAME = $(LIBRARY_PREFIX)osmand +LIBTYPE = $(DYNAMICLIB_EXT) +LDLIBS += -l$(LIBRARY_PREFIX)skia -l$(LIBRARY_PREFIX)proto -l$(LIBRARY_PREFIX)pthread -l$(LIBRARY_PREFIX)rt -l$(LIBRARY_PREFIX)ft2 -l$(LIBRARY_PREFIX)expat -l$(LIBRARY_PREFIX)png -l$(LIBRARY_PREFIX)z ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN) FIXED_JAVA_HOME := $(shell cygpath -u "$(JAVA_HOME)") else FIXED_JAVA_HOME := $(JAVA_HOME) endif - -ifeq ($(java_os),) +ifeq ($(JAVA_OS),) ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN) - java_os := win32 + JAVA_OS := win32 endif ifeq ($(findstring MINGW,$(shell uname)),MINGW) - java_os := win32 + JAVA_OS := win32 endif endif -ifeq ($(os),) - java_os := linux +ifeq ($(JAVA_OS),) + JAVA_OS := linux endif - -CPPFLAGS := \ +OSMAND_FLAGS = \ -DGOOGLE_PROTOBUF_NO_RTTI \ -DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0 \ -DSK_RELEASE \ -DGR_RELEASE=1 \ - -c -fPIC -I"$(FIXED_JAVA_HOME)/include" -I"$(FIXED_JAVA_HOME)/include/$(java_os)" \ - -DHASH_MAP_GNU \ - $(C_INCLUDES) \ - $(CPP_OS_FLAGS) + -c -I"$(FIXED_JAVA_HOME)/include" -I"$(FIXED_JAVA_HOME)/include/$(JAVA_OS)" \ + -DHASH_MAP_GNU -#target : ../$(RUNFILE) -#target : $(PREBUILT_DIR)/$(LIBNAME) -target : $(PREBUILT_DIR)/$(LIBNAME) ../$(RUNFILE) +CFLAGS += $(OSMAND_FLAGS) +CXXFLAGS += $(OSMAND_FLAGS) -../$(RUNFILE) : $(OBJECTS) $(PREBUILT_DIR)/libskia.a $(PREBUILT_DIR)/libproto.a Makefile - $(CXX) $(LDRUNFLAGS) -o ../$(RUNFILE) $(OBJECTS) $(LDLIBS) - @chmod +x ../$(RUNFILE) - -$(PREBUILT_DIR)/$(LIBNAME) : build/$(LIBOSNAME) - mkdir -p $(PREBUILT_DIR) - cp build/$(LIBOSNAME) $(PREBUILT_DIR) - -build/$(LIBOSNAME): $(OBJECTS) $(PREBUILT_DIR)/libskia.a $(PREBUILT_DIR)/libproto.a Makefile - $(CXX) -shared -o build/$(LIBOSNAME) $(OBJECTS) $(LDFLAGS) $(LDLIBS) - -build/obj-$(os)-$(arch)/%.o : src/%.$(CPP_FILE_EXTENSION) $(LOCAL_C_INCLUDES) src/textdraw.cpp - @mkdir -p `dirname $@` - $(CXX) -o $@ -c src/$*.$(CPP_FILE_EXTENSION) $(CPPFLAGS) - -clean: - $(RM) $(OBJECTS) build/$(LIBNAME) \ No newline at end of file +# Finally, include generic rules +include ../Makefile.rules \ No newline at end of file diff --git a/Osmand-kernel/png/.gitignore b/Osmand-kernel/png/.gitignore index 378eac25d3..1964f995ad 100644 --- a/Osmand-kernel/png/.gitignore +++ b/Osmand-kernel/png/.gitignore @@ -1 +1 @@ -build +build-* \ No newline at end of file diff --git a/Osmand-kernel/png/Android.mk b/Osmand-kernel/png/Android.mk index 9db26135fd..142fb96cc8 100755 --- a/Osmand-kernel/png/Android.mk +++ b/Osmand-kernel/png/Android.mk @@ -35,6 +35,6 @@ include $(BUILD_STATIC_LIBRARY) else LOCAL_SRC_FILES := \ - ../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a + ../lib/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a include $(PREBUILT_STATIC_LIBRARY) endif diff --git a/Osmand-kernel/png/Makefile b/Osmand-kernel/png/Makefile index c223160ff6..f0433d1ab1 100644 --- a/Osmand-kernel/png/Makefile +++ b/Osmand-kernel/png/Makefile @@ -1,26 +1,13 @@ -LOCAL_PATH = . +# Include tools definitions include ../Makefile.vars + +# Include project files +LOCAL_PATH = . include Common.mk -CPP_FILE_EXTENSION = c -LIBNAME := libpng.a -PREBUILT_DIR = ../jni-prebuilt/$(os)-$(arch) -OBJECTS = $(LOCAL_SRC_FILES:%.$(CPP_FILE_EXTENSION)=build/obj-$(os)-$(arch)/%.o) -C_INCLUDES := $(addprefix -I, $(LOCAL_C_INCLUDES)) -CPPFLAGS = $(LOCAL_CFLAGS) $(C_INCLUDES) $(CPP_OS_FLAGS) +# Set library name +LIBNAME = $(LIBRARY_PREFIX)png +LIBTYPE = $(STATICLIB_EXT) -target : $(PREBUILT_DIR)/$(LIBNAME) - -$(PREBUILT_DIR)/$(LIBNAME) : build/$(LIBNAME) - mkdir -p $(PREBUILT_DIR) - cp build/$(LIBNAME) $(PREBUILT_DIR) - -build/$(LIBNAME): $(OBJECTS) - ar -rf build/$(LIBNAME) $(OBJECTS) - -build/obj-$(os)-$(arch)/%.o : %.$(CPP_FILE_EXTENSION) $(LOCAL_C_INCLUDES) - @mkdir -p `dirname $@` - $(CC) -o $@ -c $*.$(CPP_FILE_EXTENSION) $(CPPFLAGS) - -clean: - $(RM) $(OBJECTS) build/$(LIBNAME) \ No newline at end of file +# Finally, include generic rules +include ../Makefile.rules \ No newline at end of file diff --git a/Osmand-kernel/protobuf/.gitignore b/Osmand-kernel/protobuf/.gitignore index 378eac25d3..1964f995ad 100644 --- a/Osmand-kernel/protobuf/.gitignore +++ b/Osmand-kernel/protobuf/.gitignore @@ -1 +1 @@ -build +build-* \ No newline at end of file diff --git a/Osmand-kernel/protobuf/Android.mk b/Osmand-kernel/protobuf/Android.mk index 08cecc231c..a78d2a5e30 100644 --- a/Osmand-kernel/protobuf/Android.mk +++ b/Osmand-kernel/protobuf/Android.mk @@ -22,6 +22,6 @@ include $(BUILD_STATIC_LIBRARY) else LOCAL_SRC_FILES := \ - ../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a + ../lib/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a include $(PREBUILT_STATIC_LIBRARY) endif diff --git a/Osmand-kernel/protobuf/Makefile b/Osmand-kernel/protobuf/Makefile index 8d1d720424..f95d2ecf2b 100644 --- a/Osmand-kernel/protobuf/Makefile +++ b/Osmand-kernel/protobuf/Makefile @@ -1,25 +1,16 @@ +# Include tools definitions include ../Makefile.vars + +# Include project files +LOCAL_PATH = . include Common.mk -CPP_FILE_EXTENSION = cc -LIBNAME := libproto.a -PREBUILT_DIR = ../jni-prebuilt/$(os)-$(arch) -OBJECTS = $(LOCAL_SRC_FILES:%.$(CPP_FILE_EXTENSION)=build/obj-$(os)-$(arch)/%.o) -CPPFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI -I. -fPIC -LDLIBS = -lpthread +# Set library name +LIBNAME = $(LIBRARY_PREFIX)proto +LIBTYPE = $(STATICLIB_EXT) +CXXFLAGS += -DGOOGLE_PROTOBUF_NO_RTTI +LDFLAGS += -lpthread +LOCAL_C_INCLUDES += . -target : $(PREBUILT_DIR)/$(LIBNAME) - -$(PREBUILT_DIR)/$(LIBNAME) : build/$(LIBNAME) - mkdir -p $(PREBUILT_DIR) - cp build/$(LIBNAME) $(PREBUILT_DIR) - -build/$(LIBNAME): $(OBJECTS) - ar -rf build/$(LIBNAME) $(OBJECTS) - -build/obj-$(os)-$(arch)/%.o : %.$(CPP_FILE_EXTENSION) $(LOCAL_C_INCLUDES) - @mkdir -p `dirname $@` - $(CXX) -o $@ -c $*.$(CPP_FILE_EXTENSION) $(CPPFLAGS) - -clean: - $(RM) $(OBJECTS) build/$(LIBNAME) \ No newline at end of file +# Finally, include generic rules +include ../Makefile.rules \ No newline at end of file diff --git a/Osmand-kernel/skia/.gitignore b/Osmand-kernel/skia/.gitignore index 567609b123..1964f995ad 100644 --- a/Osmand-kernel/skia/.gitignore +++ b/Osmand-kernel/skia/.gitignore @@ -1 +1 @@ -build/ +build-* \ No newline at end of file diff --git a/Osmand-kernel/skia/Android.mk b/Osmand-kernel/skia/Android.mk index 0b3e83d013..54d769be96 100755 --- a/Osmand-kernel/skia/Android.mk +++ b/Osmand-kernel/skia/Android.mk @@ -113,7 +113,7 @@ include $(BUILD_STATIC_LIBRARY) else LOCAL_SRC_FILES := \ - ../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a + ../lib/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a include $(PREBUILT_STATIC_LIBRARY) endif diff --git a/Osmand-kernel/skia/Makefile b/Osmand-kernel/skia/Makefile index 64884ffbe6..297dd3c1f5 100644 --- a/Osmand-kernel/skia/Makefile +++ b/Osmand-kernel/skia/Makefile @@ -1,11 +1,15 @@ -LOCAL_PATH = . +# Include tools definitions include ../Makefile.vars + +# Include project files +LOCAL_PATH = . include Common.mk -PREBUILT_DIR = ../jni-prebuilt/$(os)-$(arch) -LIBNAME := libskia.a +# Set library name +LIBNAME = $(LIBRARY_PREFIX)skia +LIBTYPE = $(STATICLIB_EXT) -CPP_FILE_EXTENSION = cpp +# Library content LOCAL_SRC_FILES += \ $(OSMAND_SKIA_LOC)/src/opts/SkBlitRow_opts_none.cpp \ $(OSMAND_SKIA_LOC)/src/opts/SkBitmapProcState_opts_none.cpp \ @@ -20,34 +24,18 @@ LOCAL_SRC_FILES += \ $(OSMAND_SKIA_LOC)/src/ports/SkFontHost_gamma.cpp \ $(OSMAND_SKIA_LOC)/src/ports/SkGlobalInitialization_default.cpp -OBJECTS = $(LOCAL_SRC_FILES:%.$(CPP_FILE_EXTENSION)=build/obj-$(os)-$(arch)/%.o) -C_INCLUDES := $(addprefix -I, $(LOCAL_C_INCLUDES)) - -CPPFLAGS := -DSK_RELEASE \ +SKIAFLAGS = \ + -DSK_RELEASE \ -DGR_RELEASE=1 \ -DSK_ENABLE_LIBPNG \ -DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0 \ -DNDEBUG \ -fno-rtti \ -fno-exceptions \ - -fPIC \ - -DSK_BUILD_FOR_UNIX \ - $(C_INCLUDES) + -DSK_BUILD_FOR_UNIX + +CFLAGS += $(SKIAFLAGS) +CXXFLAGS += $(SKIAFLAGS) -LDLIBS = -lpthread - -target : $(PREBUILT_DIR)/$(LIBNAME) - -$(PREBUILT_DIR)/$(LIBNAME) : build/$(LIBNAME) - mkdir -p $(PREBUILT_DIR) - cp build/$(LIBNAME) $(PREBUILT_DIR) - -build/$(LIBNAME): $(OBJECTS) - ar -rf build/$(LIBNAME) $(OBJECTS) - -build/obj-$(os)-$(arch)/%.o : %.$(CPP_FILE_EXTENSION) $(LOCAL_C_INCLUDES) - @mkdir -p `dirname $@` - $(CXX) -o $@ -c $*.$(CPP_FILE_EXTENSION) $(CPPFLAGS) - -clean: - $(RM) $(OBJECTS) build/$(LIBNAME) \ No newline at end of file +# Finally, include generic rules +include ../Makefile.rules \ No newline at end of file