diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-07-20 10:32:36 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2017-07-20 10:32:36 (GMT) |
| commit | f406275785baf3f43e3536e4a0e9d00afb377f3a (patch) | |
| tree | 9168798be778f4948fd2a959da64aca9cbbbb69c | |
| parent | 39a42c68b0b76a37aadee82ba3830b150d86b389 (diff) | |
| download | mxe-f406275785baf3f43e3536e4a0e9d00afb377f3a.zip mxe-f406275785baf3f43e3536e4a0e9d00afb377f3a.tar.gz mxe-f406275785baf3f43e3536e4a0e9d00afb377f3a.tar.bz2 | |
opencv openscenegraph: fix __STDC_LIMIT_MACROS used by jasper
| -rw-r--r-- | src/opencv.mk | 15 | ||||
| -rw-r--r-- | src/openscenegraph.mk | 8 |
2 files changed, 11 insertions, 12 deletions
diff --git a/src/opencv.mk b/src/opencv.mk index 9d99814..f847d5b 100644 --- a/src/opencv.mk +++ b/src/opencv.mk @@ -20,8 +20,7 @@ endef define $(PKG)_BUILD # build - mkdir '$(1).build' - cd '$(1).build' && '$(TARGET)-cmake' \ + cd '$(BUILD_DIR)' && '$(TARGET)-cmake' '$(SOURCE_DIR)' \ -DWITH_QT=OFF \ -DWITH_OPENGL=ON \ -DWITH_GSTREAMER=OFF \ @@ -43,19 +42,19 @@ define $(PKG)_BUILD -DBUILD_PNG=OFF \ -DBUILD_OPENEXR=OFF \ -DCMAKE_VERBOSE=ON \ - -DCMAKE_CXX_FLAGS='-D_WIN32_WINNT=0x0500' \ - '$(1)' + -DCMAKE_CXX_FLAGS='-D_WIN32_WINNT=0x0500 -D__STDC_LIMIT_MACROS' # install - $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1 + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' VERBOSE=1 + $(MAKE) -C '$(BUILD_DIR)' -j 1 install VERBOSE=1 # fixup and install pkg-config file # openexr isn't available on x86_64-w64-mingw32 # opencv builds it's own libIlmImf.a $(if $(findstring x86_64-w64-mingw32,$(TARGET)),\ - $(SED) -i 's/OpenEXR//' '$(1).build/unix-install/opencv.pc') - $(SED) -i 's,share/OpenCV/3rdparty/,,g' '$(1).build/unix-install/opencv.pc' - $(INSTALL) -m755 '$(1).build/unix-install/opencv.pc' '$(PREFIX)/$(TARGET)/lib/pkgconfig' + $(SED) -i 's/OpenEXR//' '$(BUILD_DIR)/unix-install/opencv.pc') + $(SED) -i 's,share/OpenCV/3rdparty/,,g' '$(BUILD_DIR)/unix-install/opencv.pc' + $(INSTALL) -m755 '$(BUILD_DIR)/unix-install/opencv.pc' '$(PREFIX)/$(TARGET)/lib/pkgconfig' '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk index bd958da..2f121b9 100644 --- a/src/openscenegraph.mk +++ b/src/openscenegraph.mk @@ -22,9 +22,8 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - mkdir '$(1).build' - cd '$(1).build' && '$(TARGET)-cmake' '$(1)' \ - -DCMAKE_CXX_FLAGS='-D__STDC_CONSTANT_MACROS' \ + cd '$(BUILD_DIR)' && '$(TARGET)-cmake' '$(SOURCE_DIR)' \ + -DCMAKE_CXX_FLAGS='-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS' \ -DCMAKE_HAVE_PTHREAD_H=OFF \ -DPKG_CONFIG_EXECUTABLE='$(PREFIX)/bin/$(TARGET)-pkg-config' \ -DDYNAMIC_OPENTHREADS=$(CMAKE_SHARED_BOOL) \ @@ -36,5 +35,6 @@ define $(PKG)_BUILD $(if $(filter qtbase,$($(PKG)_DEPS)), \ -DDESIRED_QT_VERSION=5, \ -DDESIRED_QT_VERSION=4) - $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1 + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' VERBOSE=1 + $(MAKE) -C '$(BUILD_DIR)' -j 1 install VERBOSE=1 endef |