summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRashad Kanavath <rashad.kanavath@c-s.fr>2015-12-03 13:25:44 (GMT)
committerTony Theodore <tonyt@logyst.com>2015-12-03 13:25:44 (GMT)
commita0f3d2ff8fc40ea15a356903039820c6ad1a4018 (patch)
tree85fc3df8549abf002e46e0adaadcb95d666ad03c /src
parent8d05f73f95a3027c14bc870134bc2d888b307040 (diff)
downloadmxe-a0f3d2ff8fc40ea15a356903039820c6ad1a4018.zip
mxe-a0f3d2ff8fc40ea15a356903039820c6ad1a4018.tar.gz
mxe-a0f3d2ff8fc40ea15a356903039820c6ad1a4018.tar.bz2
openscenegraph: use previously built openthreads
Diffstat (limited to 'src')
-rw-r--r--src/openscenegraph-4-noopenthreads.patch11
-rw-r--r--src/openscenegraph.mk2
2 files changed, 12 insertions, 1 deletions
diff --git a/src/openscenegraph-4-noopenthreads.patch b/src/openscenegraph-4-noopenthreads.patch
new file mode 100644
index 0000000..f01f1f6
--- /dev/null
+++ b/src/openscenegraph-4-noopenthreads.patch
@@ -0,0 +1,11 @@
+diff -burN OpenSceneGraph-3.4.0.orig/src/CMakeLists.txt OpenSceneGraph-3.4.0/src/CMakeLists.txt
+--- OpenSceneGraph-3.4.0.orig/src/CMakeLists.txt 2015-12-03 11:53:17.597970954 +0100
++++ OpenSceneGraph-3.4.0/src/CMakeLists.txt 2015-12-03 11:55:07.941146106 +0100
+@@ -8,7 +8,6 @@
+
+ #the old construct SUBDIRS( was substituded by ADD_SUBDIRECTORY that is to be preferred according on CMake docs.
+ FOREACH( mylibfolder
+- OpenThreads
+ osg
+ osgDB
+ osgUtil
diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk
index 952f160..e9b35aa 100644
--- a/src/openscenegraph.mk
+++ b/src/openscenegraph.mk
@@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 5c727d84755da276adf8c4a4a3a8ba9c9570fc4b4969f06f1d2e9f89b1e30
$(PKG)_SUBDIR := OpenSceneGraph-$($(PKG)_VERSION)
$(PKG)_FILE := OpenSceneGraph-$($(PKG)_VERSION).zip
$(PKG)_URL := http://trac.openscenegraph.org/downloads/developer_releases/$($(PKG)_FILE)
-$(PKG)_DEPS := gcc boost curl dcmtk ffmpeg freetype gdal giflib gta jasper jpeg libpng openal openexr poppler qt tiff xine-lib zlib
+$(PKG)_DEPS := gcc boost curl dcmtk ffmpeg freetype gdal giflib gta jasper jpeg libpng openal openexr openthreads poppler qt tiff xine-lib zlib
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://trac.openscenegraph.org/downloads/developer_releases/?C=M;O=D' | \