diff options
| author | Martin Müllenhaupt <mm@netlair.de> | 2014-08-27 06:54:16 (GMT) |
|---|---|---|
| committer | Martin Müllenhaupt <mm@netlair.de> | 2014-09-04 11:28:08 (GMT) |
| commit | e1ba5e4a66766cfe71bb832cfc26a0b3d7fa7bb1 (patch) | |
| tree | d4fdad5fcfd8e5ba8574138bb12bee42f247fb0e /src | |
| parent | 97266d6208fcc4ddd3f27bfa4f093461e6120ca0 (diff) | |
| download | mxe-e1ba5e4a66766cfe71bb832cfc26a0b3d7fa7bb1.zip mxe-e1ba5e4a66766cfe71bb832cfc26a0b3d7fa7bb1.tar.gz mxe-e1ba5e4a66766cfe71bb832cfc26a0b3d7fa7bb1.tar.bz2 | |
package oce: build more modules, add update placeholder
Diffstat (limited to 'src')
| -rw-r--r-- | src/oce-link-msvfw32.patch | 28 | ||||
| -rw-r--r-- | src/oce.mk | 6 |
2 files changed, 32 insertions, 2 deletions
diff --git a/src/oce-link-msvfw32.patch b/src/oce-link-msvfw32.patch new file mode 100644 index 0000000..3a3a271 --- /dev/null +++ b/src/oce-link-msvfw32.patch @@ -0,0 +1,28 @@ +This file is part of MXE. +See index.html for further information. + +From 23da6d6e6cadd09dd3cee17527611f19bc730356 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Martin=20M=C3=BCllenhaupt?= <mm+mxe.cc@netlair.de> +Date: Tue, 26 Aug 2014 14:04:49 +0200 +Subject: [PATCH] link msvfw32 instead of vfw32 + +--- + adm/cmake/TKOpenGl/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/adm/cmake/TKOpenGl/CMakeLists.txt b/adm/cmake/TKOpenGl/CMakeLists.txt +index f355c09..6587958 100644 +--- a/adm/cmake/TKOpenGl/CMakeLists.txt ++++ b/adm/cmake/TKOpenGl/CMakeLists.txt +@@ -59,7 +59,7 @@ if (OPENCL_FOUND AND OCE_WITH_OPENCL) + set(TOOLKIT_INCLUDE_DIRECTORIES ${TOOLKIT_INCLUDE_DIRECTORIES} ${OPENCL_INCLUDE_DIRS}) + endif (OPENCL_FOUND AND OCE_WITH_OPENCL) + if(WIN32) +- list(APPEND TOOLKIT_LIBS vfw32) ++ list(APPEND TOOLKIT_LIBS msvfw32) + endif() + + include(../BuildToolkit.cmake) +-- +1.9.1 + @@ -11,6 +11,8 @@ $(PKG)_URL := https://codeload.github.com/tpaviot/$(PKG)/tar.gz/OCE-$($(PKG $(PKG)_DEPS := gcc freetype define $(PKG)_UPDATE + echo 'TODO: write update script for $(PKG)' >&2; + echo $($(PKG)_VERSION) endef define $(PKG)_BUILD @@ -21,10 +23,10 @@ define $(PKG)_BUILD -DOCE_INSTALL_BIN_DIR=$(PREFIX)/$(TARGET)/bin \ -DOCE_INSTALL_LIB_DIR=$(PREFIX)/$(TARGET)/lib \ -DOCE_INSTALL_CMAKE_DATA_DIR=$(PREFIX)/$(TARGET)/lib/cmake/OCE \ - -DOCE_DISABLE_X11=TRUE + -DFREETYPE_INCLUDE_DIRS=$(PREFIX)/$(TARGET)/include/freetype2 + $(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1 cd '$(1)/examples/find_package_oce' && cmake . -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' $(MAKE) -C '$(1)/examples/find_package_oce' - #computeSurface.exe test-jpeg.exe endef |