osgearth: build with geos and poco + update patch

This commit is contained in:
Boris Pek 2018-03-22 01:03:33 +03:00 committed by Tony Theodore
parent d1fc3155ae
commit 546e341c04
2 changed files with 1 additions and 25 deletions

View File

@ -2,30 +2,6 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Fri, 16 Mar 2018 17:09:37 +0300
Subject: [PATCH 1/2] disable usage of extra libraries
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1111111..2222222 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,10 +117,10 @@ ENDIF (OSGEARTH_USE_GLES)
FIND_PACKAGE(CURL)
FIND_PACKAGE(GDAL)
-FIND_PACKAGE(GEOS)
+#FIND_PACKAGE(GEOS)
FIND_PACKAGE(Sqlite3)
FIND_PACKAGE(ZLIB)
-FIND_PACKAGE(Poco)
+#FIND_PACKAGE(Poco)
FIND_PACKAGE(LevelDB)
FIND_PACKAGE(RocksDB)
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Fri, 16 Mar 2018 17:10:49 +0300

View File

@ -7,7 +7,7 @@ $(PKG)_IGNORE :=
$(PKG)_VERSION := 2.9
$(PKG)_CHECKSUM := 22aeef42bb700c1e669d9ba57ce4155c0668caf86cc738750a6b9d34c1eaf2a4
$(PKG)_GH_CONF := gwaldron/osgearth/releases/latest, osgearth-
$(PKG)_DEPS := curl cc gdal openscenegraph sqlite tinyxml2 zlib
$(PKG)_DEPS := curl cc gdal openscenegraph poco sqlite tinyxml2 zlib
define $(PKG)_BUILD
cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)' \