view src/libshout-1-fixes.patch @ 4222:44b1a9b2193e

qt5: add initial qt5 to mxe-octave, based on mxe.cc * src/qt5.mk: new file * src/qtbase-1-fixes.patch: new file * src/qtbase.mk: new file * src/qtimageformats-1.patch: new file * src/qtimageformats.mk: new file * src/qtsvg.mk: new file * src/qttools-1.patch: new file * added src/qttools.mk: new file * changed Makefile.in: added ENABLE_QT5 option * configure.ac: added enable-qt5 option * index.html: added new files to packages * installer-files/octave-firsttime.vbs: added setup of qt5 bin, plugin path * installer-files/octave.vbs: added setup of qt5 bin, plugin path * installer-files/octave.bat: added setup of qt5 bin path * src/default-octave.mk: added settig fot qt5 usage * src/qscintilla.mk: added qt5 path
author John D
date Thu, 29 Sep 2016 11:22:51 -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