Mercurial > mxe-octave
view src/armadillo-1-staticlib.patch @ 3629:5aba05f2226e
update xine-lib, add mman-win32
* dist-files.mk: add mman-win32-1-include_name_change.patch, mman-win32.mk, add xine-lib-*.patch files.
* index.html: add mman-win32
* src/mman-win32-1-include_name_change.patch: new file.
* src/mman-win32.mk: new file.
* src/xine-lib-1-configure_ac.patch: new file
* src/xine-lib-1-fixes.patch: removed
* src/xine-lib-2-build_fixes.patch: new file.
* src/xine-lib-3-more_build_fixes.patch: new file
* src/xine-lib-4-mkdir.patch: new file.
* src/xine-lib-5-change_mma_h_to_mma_win32_h.patch: new file
* src/xine-lib.mk: update version
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sun, 29 Jun 2014 15:46:35 -0400 |
parents | 603f5be8a550 |
children |
line wrap: on
line source
This file is part of MXE. See index.html for further information. diff -urN a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt 2012-09-14 16:43:20.000000000 +0200 +++ b/CMakeLists.txt 2012-09-20 20:39:05.073039124 +0200 @@ -40,7 +40,7 @@ set(ARMA_USE_ATLAS false) set(ARMA_USE_BOOST false) set(ARMA_USE_HDF5 false) -set(ARMA_USE_WRAPPER true ) # set this to false if you prefer to directly link with LAPACK and/or BLAS (eg. -llapack -lblas) instead of -larmadillo +set(ARMA_USE_WRAPPER false ) # set this to false if you prefer to directly link with LAPACK and/or BLAS (eg. -llapack -lblas) instead of -larmadillo if(WIN32) @@ -263,7 +263,7 @@ #set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -add_library( armadillo SHARED src/wrap_libs ) +add_library( armadillo STATIC src/wrap_libs ) target_link_libraries( armadillo ${ARMA_LIBS} ) set_target_properties(armadillo PROPERTIES VERSION ${ARMA_MAJOR}.${ARMA_MINOR}.${ARMA_PATCH} SOVERSION 3)