package oce: build more modules, add update placeholder

This commit is contained in:
Martin Müllenhaupt 2014-08-27 08:54:16 +02:00
parent 97266d6208
commit e1ba5e4a66
2 changed files with 32 additions and 2 deletions

View File

@ -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

View File

@ -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