Mercurial > mxe-octave
view src/libshout-1-fixes.patch @ 5571:b19fb3ed330c
use cmake command line to set build shared/static options (bug #59373)
* Makefile.in (CMAKE_BUILD_SHARED_OR_STATIC): New variable.
(build-cmake-toolchain-file): Don't define BUILD_SHARED_LIBS or
BUILD_STATIC_LIBS in the toolchain file.
* armadillo.mk, cgal.mk, cmake.mk, cminpack.mk, double-conversion.mk,
eigen.mk, gdcm.mk, gl2ps.mk, hdf5.mk, lapack.mk, libical.mk,
libproxy.mk, of-dicom.mk, openal.mk, opencv.mk, openexr.mk,
openscenegraph.mk, physfs.mk, qhull.mk, qjson.mk, rapidjson.mk,
suitesparse.mk, sundials-ida.mk, taglib.mk, vigra.mk, vmime.mk,
vtk.mk, wt.mk: Use $(CMAKE_BUILD_SHARED_OR_STATIC) on the cmake
command line.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 30 Oct 2020 10:06:00 -0400 |
| parents | f79b2ad2be45 |
| children |
line wrap: on
line source
This file is part of MXE. See index.html for further information. Contains ad hoc patches for cross building. From b05b2d82333e13f637dffb93f821907f775eb585 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 20 May 2012 23:23:37 +0200 Subject: [PATCH] mingw fixes --- include/shout/shout.h.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/shout/shout.h.in b/include/shout/shout.h.in index 682ad49..f412cdc 100644 --- a/include/shout/shout.h.in +++ b/include/shout/shout.h.in @@ -23,8 +23,10 @@ #include <sys/types.h> #ifdef WIN32 +#ifndef __MINGW32__ #include <os.h> #endif +#endif #define SHOUTERR_SUCCESS (0) #define SHOUTERR_INSANE (-1) -- 1.7.9.2