view src/libshout-1-fixes.patch @ 3721:933b99febcf1

Expand options to support 3 possible sources of octave * configure.ac: modify --enable-stable rule to --enable-octave=source (stable,alpha,default) * Makefile.am: modify OCTAVE_TARGET based on octave build value set in configure. * index.html: added master-octave information. * src/default-octave.mk: new file. * src/default-octave-1-docinstall.patch * dist-files.mk: add default-octave-1-docinstall.patch default-octave.mk * binary-dist-rules.mk: use OCTAVE_TARGET to decide on tarball/installer name
author John Donoghue <john.donoghue@ieee.org>
date Sun, 19 Oct 2014 22:58:20 -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