diff options
| author | Tony Theodore <tonyt@logyst.com> | 2014-10-02 17:33:39 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2014-10-02 17:33:39 (GMT) |
| commit | c7deb709fd4779e778a564c2bf83781486926850 (patch) | |
| tree | 6efc80f824293bad7edd55c4432ac03db18c1573 /src/openscenegraph.mk | |
| parent | bc0d5efbaa08093832c19c6265354ab9333b4501 (diff) | |
| download | mxe-c7deb709fd4779e778a564c2bf83781486926850.zip mxe-c7deb709fd4779e778a564c2bf83781486926850.tar.gz mxe-c7deb709fd4779e778a564c2bf83781486926850.tar.bz2 | |
openscenegraph: update and enable *-w64-* (see #492)
Diffstat (limited to 'src/openscenegraph.mk')
| -rw-r--r-- | src/openscenegraph.mk | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk index f38c150..25ee304 100644 --- a/src/openscenegraph.mk +++ b/src/openscenegraph.mk @@ -3,8 +3,8 @@ PKG := openscenegraph $(PKG)_IGNORE := -$(PKG)_VERSION := 3.2.0 -$(PKG)_CHECKSUM := c20891862b5876983d180fc4a3d3cfb2b4a3375c +$(PKG)_VERSION := 3.2.1 +$(PKG)_CHECKSUM := 5c666531f7d487075fd692d89f1e05036306192a $(PKG)_SUBDIR := OpenSceneGraph-$($(PKG)_VERSION) $(PKG)_FILE := OpenSceneGraph-$($(PKG)_VERSION).zip $(PKG)_URL := http://www.openscenegraph.org/downloads/developer_releases/$($(PKG)_FILE) @@ -19,7 +19,8 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && cmake . \ + mkdir '$(1).build' + cd '$(1).build' && cmake '$(1)' \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS \ -DCMAKE_HAVE_PTHREAD_H=OFF \ @@ -28,11 +29,9 @@ define $(PKG)_BUILD -DDYNAMIC_OPENSCENEGRAPH=OFF \ -DBUILD_OSG_APPLICATIONS=OFF \ -DPOPPLER_HAS_CAIRO_EXITCODE=0 \ - -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 - $(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1 + -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 \ + -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1 + $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1 endef -$(PKG)_BUILD_x86_64-w64-mingw32 = -$(PKG)_BUILD_i686-w64-mingw32 = - $(PKG)_BUILD_SHARED = |