diff options
| author | Boris Pek <tehnick-8@yandex.ru> | 2018-03-21 21:40:20 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2018-03-26 12:55:53 (GMT) |
| commit | d1fc3155ae146bd2057b14207759395092db3f8b (patch) | |
| tree | caf45c35c31be4e9361cf2e59d41907be09cbb31 /src | |
| parent | 55e29839a380fe33c61c47a090b63f64d525d280 (diff) | |
| download | mxe-d1fc3155ae146bd2057b14207759395092db3f8b.zip mxe-d1fc3155ae146bd2057b14207759395092db3f8b.tar.gz mxe-d1fc3155ae146bd2057b14207759395092db3f8b.tar.bz2 | |
update osgearth
Diffstat (limited to 'src')
| -rw-r--r-- | src/osgearth-1-fixes.patch | 54 | ||||
| -rw-r--r-- | src/osgearth.mk | 8 |
2 files changed, 25 insertions, 37 deletions
diff --git a/src/osgearth-1-fixes.patch b/src/osgearth-1-fixes.patch index d9432af..138f3f2 100644 --- a/src/osgearth-1-fixes.patch +++ b/src/osgearth-1-fixes.patch @@ -2,37 +2,17 @@ This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. -From 0000000000000000000000000000000000000000 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Pek <tehnick-8@yandex.ru> -Date: Fri, 22 Dec 2017 23:09:25 +0300 -Subject: [PATCH 1/3] fix osgEarthSplat static library - - -diff --git a/src/osgEarthSplat/Export b/src/osgEarthSplat/Export -index 1111111..2222222 100644 ---- a/src/osgEarthSplat/Export -+++ b/src/osgEarthSplat/Export -@@ -42,7 +42,7 @@ - - #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # if defined( OSGEARTHSPLAT_LIBRARY_STATIC ) -- # define OSGEARTH_SPLAT_EXPORT -+ # define OSGEARTHSPLAT_EXPORT - # elif defined( OSGEARTHSPLAT_LIBRARY ) - # define OSGEARTHSPLAT_EXPORT __declspec(dllexport) - # else - -From 0000000000000000000000000000000000000000 -From: Boris Pek <tehnick-8@yandex.ru> -Date: Fri, 22 Dec 2017 23:15:21 +0300 -Subject: [PATCH 2/3] disable usage of extra libraries +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 100644 +index 1111111..2222222 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -126,10 +126,10 @@ FIND_PACKAGE(OpenGL) +@@ -117,10 +117,10 @@ ENDIF (OSGEARTH_USE_GLES) FIND_PACKAGE(CURL) FIND_PACKAGE(GDAL) @@ -46,26 +26,34 @@ index 1111111..2222222 100644 FIND_PACKAGE(LevelDB) FIND_PACKAGE(RocksDB) -From 0000000000000000000000000000000000000000 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Pek <tehnick-8@yandex.ru> -Date: Fri, 22 Dec 2017 23:17:03 +0300 -Subject: [PATCH 3/3] disable build of applications +Date: Fri, 16 Mar 2018 17:10:49 +0300 +Subject: [PATCH 2/2] disable build of applications and tests diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1111111..2222222 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -23,9 +23,9 @@ ENDFOREACH( lib ) +@@ -23,13 +23,13 @@ ENDFOREACH( lib ) ADD_SUBDIRECTORY( osgEarthDrivers ) --IF(NOT OSG_BUILD_PLATFORM_IPHONE AND NOT OSG_BUILD_PLATFORM_IPHONE_SIMULATOR AND NOT ANDROID) +-IF(NOT ANDROID) - ADD_SUBDIRECTORY( applications ) -ENDIF() -+#IF(NOT OSG_BUILD_PLATFORM_IPHONE AND NOT OSG_BUILD_PLATFORM_IPHONE_SIMULATOR AND NOT ANDROID) +- +-IF(NOT OSGEARTH_BUILD_PLATFORM_IPHONE AND NOT OSGEARTH_BUILD_PLATFORM_IPHONE_SIMULATOR) +- ADD_SUBDIRECTORY( tests ) +-ENDIF() ++#IF(NOT ANDROID) +# ADD_SUBDIRECTORY( applications ) +#ENDIF() ++# ++#IF(NOT OSGEARTH_BUILD_PLATFORM_IPHONE AND NOT OSGEARTH_BUILD_PLATFORM_IPHONE_SIMULATOR) ++# ADD_SUBDIRECTORY( tests ) ++#ENDIF() + - #IF (Qt5Widgets_FOUND OR QT4_FOUND AND NOT ANDROID AND OSGEARTH_USE_QT) - # ADD_SUBDIRECTORY(osgEarthQt) + IF(MSVC80) diff --git a/src/osgearth.mk b/src/osgearth.mk index 1383017..bc7d2c0 100644 --- a/src/osgearth.mk +++ b/src/osgearth.mk @@ -4,10 +4,10 @@ PKG := osgearth $(PKG)_WEBSITE := http://osgearth.org/ $(PKG)_DESCR := Geospatial SDK for OpenSceneGraph $(PKG)_IGNORE := -$(PKG)_VERSION := 2.8 -$(PKG)_CHECKSUM := 5570dc5b62f6f9e28954f5cbd7946a9b35767c06b375eff1c4cc40561e7f1655 -$(PKG)_GH_CONF := gwaldron/osgearth/tags, osgearth- -$(PKG)_DEPS := curl gcc gdal openscenegraph sqlite tinyxml2 zlib +$(PKG)_VERSION := 2.9 +$(PKG)_CHECKSUM := 22aeef42bb700c1e669d9ba57ce4155c0668caf86cc738750a6b9d34c1eaf2a4 +$(PKG)_GH_CONF := gwaldron/osgearth/releases/latest, osgearth- +$(PKG)_DEPS := curl cc gdal openscenegraph sqlite tinyxml2 zlib define $(PKG)_BUILD cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)' \ |