summaryrefslogtreecommitdiffstats
path: root/src/armadillo-1-staticlib.patch
diff options
context:
space:
mode:
authorTimothy Gu <timothygu99@gmail.com>2014-10-20 04:16:56 (GMT)
committerTimothy Gu <timothygu99@gmail.com>2014-10-20 04:57:55 (GMT)
commitaa7d1d1e16ba62ce1d8228788fa1b3cd2d1c60d0 (patch)
tree6cab5f879560d506020565e24cfb6a351dee7a41 /src/armadillo-1-staticlib.patch
parent123abec48d53d335637d9b3b860244fb94792bc1 (diff)
downloadmxe-aa7d1d1e16ba62ce1d8228788fa1b3cd2d1c60d0.zip
mxe-aa7d1d1e16ba62ce1d8228788fa1b3cd2d1c60d0.tar.gz
mxe-aa7d1d1e16ba62ce1d8228788fa1b3cd2d1c60d0.tar.bz2
armadillo: Update and use out-of-tree builds
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'src/armadillo-1-staticlib.patch')
-rw-r--r--src/armadillo-1-staticlib.patch23
1 files changed, 0 insertions, 23 deletions
diff --git a/src/armadillo-1-staticlib.patch b/src/armadillo-1-staticlib.patch
deleted file mode 100644
index a643985..0000000
--- a/src/armadillo-1-staticlib.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-diff -urN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2013-12-06 08:39:40.000000000 +0100
-+++ b/CMakeLists.txt 2013-12-06 14:05:54.098314032 +0100
-@@ -32,7 +32,7 @@
- set(ARMA_USE_ATLAS false)
- set(ARMA_USE_BOOST false)
- set(ARMA_USE_HDF5 false)
--set(ARMA_USE_WRAPPER true )
-+set(ARMA_USE_WRAPPER false)
-
- ## NOTE:
- ## Set ARMA_USE_WRAPPER to false if you're getting linking errors when compiling your programs,
-@@ -340,7 +340,7 @@
- message(STATUS "CMAKE_SHARED_LINKER_FLAGS = ${CMAKE_SHARED_LINKER_FLAGS}")
-
-
--add_library( armadillo SHARED src/wrapper )
-+add_library( armadillo STATIC src/wrapper )
- target_link_libraries( armadillo ${ARMA_LIBS} )
- set_target_properties(armadillo PROPERTIES VERSION ${ARMA_MAJOR}.${ARMA_MINOR_ALT}.${ARMA_PATCH} SOVERSION ${ARMA_MAJOR})