Merge pull request #1429 from Framstag/fix_unity_build

Fix unity build and Co.
Framstag · May 13, 2023 · ba5e6f4 · ba5e6f4
2 parents 8adcfe4 + 5db914c
commit ba5e6f4
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/build_and test_on_ios.yml b/.github/workflows/build_and test_on_ios.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   build_cmake:
     name: cmake
-    runs-on: macos-10.15
+    runs-on: macos-12
     steps:
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/.github/workflows/build_and test_on_osx.yml b/.github/workflows/build_and test_on_osx.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   build_meson:
     name: meson
-    runs-on: macos-10.15
+    runs-on: macos-12
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -32,7 +32,7 @@ jobs:
 
   build_cmake:
     name: cmake
-    runs-on: macos-10.15
+    runs-on: macos-12
     steps:
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/libosmscout-import/src/protobuf/meson.build b/libosmscout-import/src/protobuf/meson.build
@@ -1,10 +1,9 @@
 if protobufDep.found() and protocCmd.found()
   protoGen = generator(protocCmd,
                        output  : ['@BASENAME@.pb.cc', '@BASENAME@.pb.h'],
-                       arguments : ['--cpp_out=@BUILD_DIR@','--proto_path=@SOURCE_DIR@/libosmscout-import/src/protobuf','@INPUT@'])
+                       arguments : ['--proto_path=@CURRENT_SOURCE_DIR@', '--cpp_out=@BUILD_DIR@','@INPUT@'])
 
   protoSrc = protoGen.process('fileformat.proto', 'osmformat.proto')
 else
   protoSrc = []
 endif
-
diff --git a/libosmscout-map-iosx/include/meson.build b/libosmscout-map-iosx/include/meson.build
@@ -1,7 +1,8 @@
 osmscoutmapiosxIncDir = include_directories('.')
 
 osmscoutmapiosxHeader = [
-            'osmscoutmapiosx/MapPainterIOS.h'
+            'osmscoutmapiosx/MapPainterIOS.h',
+            'osmscoutmapiosx/SymbolRendererIOS.h'
           ]
 
 if meson.version().version_compare('>=0.63.0')

diff --git a/libosmscout-map-iosx/src/meson.build b/libosmscout-map-iosx/src/meson.build
@@ -1,5 +1,6 @@
 osmscoutmapiosxSrc = [
             'src/osmscout/MapPainterIOS.mm',
+            'src/osmscout/SymbolRendererIOS.mm'
           ]
 
 
diff --git a/libosmscout-map/include/osmscoutmap/BatchMapPainter.h b/libosmscout-map/include/osmscoutmap/BatchMapPainter.h
@@ -1,5 +1,5 @@
-#ifndef OSMSCOUT_MAP_BATCHAPPAINTER_H
-#define OSMSCOUT_MAP_BATCHMAPPAINTER_H
+#ifndef OSMSCOUT_MAP_BATCH_MAP_PAINTER_H
+#define OSMSCOUT_MAP_BATCH_MAP_PAINTER_H
 
 /*
   This source is part of the libosmscout-map library

diff --git a/libosmscout-map/include/osmscoutmap/MapPainter.h b/libosmscout-map/include/osmscoutmap/MapPainter.h
@@ -72,7 +72,7 @@ namespace osmscout {
     ProcessAreas          =  4, //!< Process (complex) areas for rendering
     ProcessRoutes         =  5, //!< Process routes for rendering
     AfterPreprocessing    =  6, //!< Additional postprocessing
-    Prerender             =  7, //!< Implementation specific preparison
+    Prerender             =  7, //!< Implementation specific preparation
     DrawBaseMapTiles      =  8, //!< Draw unknown/sea/land tiles and tiles with "coastlines" from base map
     DrawGroundTiles       =  9, //!< Same as previous, but from main database
     DrawOSMTileGrids      = 10, //!< If special style exists, renders grid corresponding to OSM tiles

diff --git a/libosmscout/include/osmscout/util/Base64.h b/libosmscout/include/osmscout/util/Base64.h
@@ -7,6 +7,7 @@
  * licensed under terms of MIT license
  */
 
+#include <cstdint>
 #include <string>
 #include <sstream>
 #include <iostream>
@@ -18,7 +19,6 @@ namespace osmscout {
 
   static inline std::string Base64Encode(const std::vector<char> &in)
   {
-
     std::string out;
 
     uint32_t val = 0;
@@ -45,7 +45,6 @@ namespace osmscout {
 
   static inline std::vector<char> Base64Decode(const std::string &in)
   {
-
     std::vector<char> out;
 
     std::vector<int> T(256, -1);

diff --git a/libosmscout/include/osmscout/util/LaneTurn.h b/libosmscout/include/osmscout/util/LaneTurn.h
@@ -20,7 +20,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 */
 
-#include <cstddef>
+#include <cstdint>
 #include <string>
 
 #include <osmscout/CoreImportExport.h>

diff --git a/maps/.gitignore b/maps/.gitignore
@@ -7,6 +7,7 @@
 /*.zip
 /*.poly
 /*.shp
+/*/*.hgt
 
 # Libosmscout Databases
 /*/*.txt
@@ -15,6 +16,7 @@
 /*/*.idmap
 /*/*.tmp
 /*/*.html
+/*/*.dot
 
 # Shapefiles
 /*/*.cpg