Mercurial > mxe-octave
diff src/openscenegraph.mk @ 3638:af91c561ff39
openscenegraph: allow cross compile to succeed
* src/openscenegraph.mk: add -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED_EXITCODE=0,
build out of source, enable static/dynamic libs
* src/openscenegraph-1-fixes.patch: new file
* dist-files.mk: added openscenegraph-1-fixes.patch
| author | John Donoghue |
|---|---|
| date | Wed, 02 Jul 2014 15:27:12 -0400 |
| parents | 4866edf6f9f3 |
| children | abef069ac1d3 |
line wrap: on
line diff
--- a/src/openscenegraph.mk Tue Jul 01 08:39:54 2014 -0400 +++ b/src/openscenegraph.mk Wed Jul 02 15:27:12 2014 -0400 @@ -10,6 +10,12 @@ $(PKG)_URL := http://www.openscenegraph.org/downloads/developer_releases/$($(PKG)_FILE) $(PKG)_DEPS := boost curl dcmtk ffmpeg freetype gdal giflib gta jasper jpeg libpng openal openexr poppler qt tiff xine-lib zlib +ifeq ($(BUILD_SHARED),yes) + $(PKG)_SHARED := ON +else + $(PKG)_SHARED := OFF +endif + define $(PKG)_UPDATE $(WGET) -q -O- 'http://www.openscenegraph.org/downloads/developer_releases/?C=M;O=D' | \ $(SED) -n 's,.*OpenSceneGraph-\([0-9]*\.[0-9]*[02468]\.[^<]*\)\.zip.*,\1,p' | \ @@ -19,17 +25,19 @@ endef define $(PKG)_BUILD - cd '$(1)' && cmake . \ + mkdir -p '$(1)/.build' + cd '$(1)/.build' && cmake .. \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS \ - -DCMAKE_HAVE_PTHREAD_H=OFF \ + -DCMAKE_HAVE_PTHREAD_H=ON \ -DPKG_CONFIG_EXECUTABLE='$(MXE_PKG_CONFIG)' \ - -DDYNAMIC_OPENTHREADS=OFF \ - -DDYNAMIC_OPENSCENEGRAPH=OFF \ + -DDYNAMIC_OPENTHREADS=$($(PKG)_SHARED) \ + -DDYNAMIC_OPENSCENEGRAPH=$($(PKG)_SHARED) \ -DBUILD_OSG_APPLICATIONS=OFF \ -DPOPPLER_HAS_CAIRO_EXITCODE=0 \ - -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 - $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 - $(MAKE) -C '$(1)' -j 1 install + -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 \ + -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED_EXITCODE=0 + $(MAKE) -C '$(1)/.build' -j '$(JOBS)' VERBOSE=1 + $(MAKE) -C '$(1)/.build' -j 1 install endef