diff options
339 files changed, 471 insertions, 476 deletions
@@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. JOBS := 1 @@ -28,7 +28,7 @@ REQUIREMENTS := autoconf automake bash bison bzip2 cmake flex \ $(MAKE) openssl $(PATCH) $(PERL) pkg-config \ scons $(SED) unzip wget xz yasm -CMAKE_TOOLCHAIN_FILE := $(PREFIX)/$(TARGET)/share/cmake/mingw-cross-env-conf.cmake +CMAKE_TOOLCHAIN_FILE := $(PREFIX)/$(TARGET)/share/cmake/mxe-conf.cmake # unexport any environment variables that might cause trouble unexport AR CC CFLAGS C_INCLUDE_PATH CPATH CPLUS_INCLUDE_PATH CPP diff --git a/doc/index.html b/doc/index.html index 67a3058..1944161 100644 --- a/doc/index.html +++ b/doc/index.html @@ -4,7 +4,7 @@ <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>MinGW cross compiling environment</title> + <title>MXE (M cross environment)</title> <style type="text/css"> body { @@ -92,12 +92,12 @@ padding-right: 1em; padding-top: 1em; padding-bottom: 1em; - width: 12em; + width: 14em; background-color: #afa; } .section { width: 30em; - margin-left: 17em; + margin-left: 19em; margin-bottom: 100%; } } @@ -107,7 +107,7 @@ <body> <div id="navigation"> -<h1>MinGW cross compiling environment</h1> +<h1>MXE (M cross environment)</h1> <ul> <li><a href="#introduction" >Introduction</a></li> @@ -134,9 +134,11 @@ <h2 id="introduction">Introduction</h2> <p> - This Makefile compiles a MinGW cross compiler and cross compiles - many free libraries such as GD, SDL and Qt. Thus, it provides a nice - MinGW cross compiling environment which + MXE (M cross environment) is a Makefile that + compiles a cross compiler and cross compiles + many free libraries such as SDL and Qt. Thus, + it provides a nice cross compiling environment + for various target platforms, which </p> <ul> @@ -175,11 +177,6 @@ whenever possible </li> <li> - creates libraries to be - <a href="http://lists.nongnu.org/archive/html/mingw-cross-env-list/2009-09/msg00025.html">linked statically</a>, - no DLL hell - </li> - <li> is already <a href="#used-by">used by several projects</a> </li> @@ -208,7 +205,7 @@ <p> First, you should ensure that your system meets - mingw-cross-env's + MXE's <a href="#requirements">requirements</a>. You will almost certainly have to install some stuff. </p> @@ -228,7 +225,7 @@ <p> Now you should save any previous installation - of the mingw-cross-env. + of the MXE. Assuming you've installed it under /opt/mxe (any other directory will do as well), you should execute the following commands: @@ -252,11 +249,10 @@ exit</pre> </p> <pre>cd /opt/mxe</pre> - <h3>Step 3: Build mingw-cross-env</h3> + <h3>Step 3: Build MXE</h3> <p> - Enter the directory where you've downloaded the - mingw-cross-env. + Enter the directory where you've downloaded the MXE. Now it depends on what you actually want – or need. </p> @@ -299,14 +295,14 @@ exit</pre> <p> Edit your .bashrc script in order to change $PATH: </p> - <pre>export PATH=/<em>where mingw-cross-env is installed</em>/usr/bin:$PATH</pre> + <pre>export PATH=/<em>where MXE is installed</em>/usr/bin:$PATH</pre> <p> In case you are using custom $PKG_CONFIG_PATH entries, - you can add separate entries for MinGW cross builds: + you can add separate entries for cross builds: </p> <pre>export PKG_CONFIG_PATH="<em>entries for native builds</em>"</pre> - <pre>export PKG_CONFIG_PATH_<span class="target-underscore">i686_pc_mingw32</span>="<em>entries for mingw-cross-env builds</em>"</pre> + <pre>export PKG_CONFIG_PATH_<span class="target-underscore">i686_pc_mingw32</span>="<em>entries for MXE builds</em>"</pre> <p> Remember to use <span class="target">i686-pc-mingw32</span>-pkg-config instead of pkg-config for cross builds. @@ -357,7 +353,7 @@ If a cross compiler is detected then cross compile mode will be used.</pre> <a href="http://www.cmake.org/">CMake</a> project, you can use the provided toolchain file: </p> - <pre>cmake ... -DCMAKE_TOOLCHAIN_FILE=/<em>where mingw-cross-env is installed</em>/usr/<span class="target">i686-pc-mingw32</span>/share/cmake/mingw-cross-env-conf.cmake</pre> + <pre>cmake ... -DCMAKE_TOOLCHAIN_FILE=/<em>where MXE is installed</em>/usr/<span class="target">i686-pc-mingw32</span>/share/cmake/mingw-cross-env-conf.cmake</pre> <h3>Step 5c: Cross compile your Project (Qt)</h3> @@ -425,7 +421,7 @@ USE_OSGPLUGIN(<plugin2>) `i686-pc-mingw32-pkg-config --cflags openscenegraph-osgViewer openscenegraph-osgPlugins` \ `i686-pc-mingw32-pkg-config --libs openscenegraph-osgViewer openscenegraph-osgPlugins`</pre> <p> - The <code>i686-pc-mingw32-pkg-config</code> command from mingw-cross-env will + The <code>i686-pc-mingw32-pkg-config</code> command from MXE will automatically add <code>-DOSG_LIBRARY_STATIC</code> to your compiler flags. </p> @@ -436,7 +432,7 @@ USE_OSGPLUGIN(<plugin2>) feel free to join the <a href="http://lists.nongnu.org/mailman/listinfo/mingw-cross-env-list">project mailing list</a> where you'll get in touch with - the mingw-cross-env developers + the MXE developers and other users. </p> </div> @@ -449,7 +445,7 @@ USE_OSGPLUGIN(<plugin2>) <dt>2011-xx-xx – Release <span id="latest-version">2.22</span></dt> <dd> <p> - <a href="http://mingw-cross-env.nongnu.org/#development">Download</a> | + <a href="http://mxe.cc/#development">Download</a> | <a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.22">Changelog</a> </p> @@ -793,10 +789,10 @@ USE_OSGPLUGIN(<plugin2>) </p> <p> Since no other packages depend on it, the remainder of - mingw-cross-env can be successfully built by simply + MXE can be successfully built by simply removing the package: </p> - <pre>rm <em>where mingw-cross-env is downloaded</em>/src/nsis.mk</pre> + <pre>rm <em>where MXE is downloaded</em>/src/nsis.mk</pre> </div> <div class="section"> @@ -932,7 +928,7 @@ USE_OSGPLUGIN(<plugin2>) BTW, we're always curious about the applications people are porting. We maintain a <a href="#used-by">list of projects</a> - which use mingw-cross-env. + which use MXE. No matter whether your project is free or proprietary – as long as it has its own website, we'd be happy to link to it. @@ -976,7 +972,7 @@ USE_OSGPLUGIN(<plugin2>) The easiest way to get the dependencies right is to start with a minimal setup. That is, - initialize mingw-cross-env with <code>make gcc</code> only, + initialize MXE with <code>make gcc</code> only, then check whether your package builds successfully. </p> @@ -1006,7 +1002,7 @@ USE_OSGPLUGIN(<plugin2>) <p> and should start with: </p> - <pre>This file is part of mingw-cross-env. + <pre>This file is part of MXE. See doc/index.html for further information. This patch has been taken from: @@ -1833,7 +1829,7 @@ https://...</pre> <ul class="compact-list"> <li> - <a href="http://mingw-cross-env.nongnu.org/">Project website</a> + <a href="http://mxe.cc/">Project website</a> </li> <li> <a href="http://lists.nongnu.org/mailman/listinfo/mingw-cross-env-list">Project mailing list</a> @@ -1920,7 +1916,7 @@ https://...</pre> </li> </ul> - <h3 id="used-by">Projects which use mingw-cross-env</h3> + <h3 id="used-by">Projects which use MXE</h3> <ul class="compact-list"> <li> @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. PKG := agg @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # ATK diff --git a/src/atkmm.mk b/src/atkmm.mk index 7217553..89411d4 100644 --- a/src/atkmm.mk +++ b/src/atkmm.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # ATKmm diff --git a/src/aubio-1-fix-pkg-config.patch b/src/aubio-1-fix-pkg-config.patch index 2c52b74..ed5413c 100644 --- a/src/aubio-1-fix-pkg-config.patch +++ b/src/aubio-1-fix-pkg-config.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -urN aubio-0.3.2.orig/configure.ac aubio-0.3.2/configure.ac diff --git a/src/aubio.mk b/src/aubio.mk index 9eef489..7b8256b 100644 --- a/src/aubio.mk +++ b/src/aubio.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # aubio @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Binary File Descriptor library diff --git a/src/binutils.mk b/src/binutils.mk index 22259ea..89da400 100644 --- a/src/binutils.mk +++ b/src/binutils.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GNU Binutils diff --git a/src/blas.mk b/src/blas.mk index 78e3832..eb5cf79 100644 --- a/src/blas.mk +++ b/src/blas.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # blas diff --git a/src/boost-test.cpp b/src/boost-test.cpp index baccf94..7ec6613 100644 --- a/src/boost-test.cpp +++ b/src/boost-test.cpp @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <iostream> diff --git a/src/boost.mk b/src/boost.mk index 494b115..2ba2a90 100644 --- a/src/boost.mk +++ b/src/boost.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Boost C++ Library diff --git a/src/bzip2.mk b/src/bzip2.mk index d27c75c..ce53f00 100644 --- a/src/bzip2.mk +++ b/src/bzip2.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # bzip2 diff --git a/src/cairo.mk b/src/cairo.mk index 308786b..6165c6c 100644 --- a/src/cairo.mk +++ b/src/cairo.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # cairo diff --git a/src/cairomm.mk b/src/cairomm.mk index 84187b0..bde2b18 100644 --- a/src/cairomm.mk +++ b/src/cairomm.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # cairomm diff --git a/src/cblas.mk b/src/cblas.mk index 5217879..eb717d4 100644 --- a/src/cblas.mk +++ b/src/cblas.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # cblas diff --git a/src/cgal-1-fixes.patch b/src/cgal-1-fixes.patch index e452e65..be50106 100644 --- a/src/cgal-1-fixes.patch +++ b/src/cgal-1-fixes.patch @@ -1,12 +1,12 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From a2df8b5dea68d02643faa69b7119628eb1751d5e Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 21 Oct 2011 23:08:52 +0200 -Subject: [PATCH 1/3] adjustments for mingw-cross-env +Subject: [PATCH 1/3] adjustments for MXE diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -275,7 +275,7 @@ index bb59f8c..9cebb51 100644 From 7393c43ef7534fc8a9289992cdcb9ebefa293680 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 18 Nov 2011 00:08:25 +0100 Subject: [PATCH 2/3] prevent Qt's moc from choking on BOOST_JOIN @@ -304,7 +304,7 @@ index 62d0485..852fcc9 100644 From ac8a99188725f1cb848c6cec3e33c52363754797 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Wed, 28 Mar 2012 00:25:48 +1100 Subject: [PATCH 3/3] Cmake min version 2.8.6 is only for Windows DLLs diff --git a/src/cgal.mk b/src/cgal.mk index 6dc195c..52496d5 100644 --- a/src/cgal.mk +++ b/src/cgal.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # cgal diff --git a/src/cppunit.mk b/src/cppunit.mk index cc8f0fa..e049bf3 100644 --- a/src/cppunit.mk +++ b/src/cppunit.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # CppUnit diff --git a/src/cunit.mk b/src/cunit.mk index 1b49e0d..cc1e1cb 100644 --- a/src/cunit.mk +++ b/src/cunit.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # cunit diff --git a/src/curl-1-fixes.patch b/src/curl-1-fixes.patch index 9db720f..06043f4 100644 --- a/src/curl-1-fixes.patch +++ b/src/curl-1-fixes.patch @@ -1,14 +1,14 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Commits backported (cherry-picked) from upstream. http://github.com/bagder/curl -Also contains mingw-cross-env specific fixes. +Also contains MXE specific fixes. From ee69c33117cf616c19e9cd288f08eb4c91bf190d Mon Sep 17 00:00:00 2001 From: Volker Grabsch <vog@notjusthosting.com> Date: Fri, 28 Oct 2011 13:48:04 +0200 -Subject: [PATCH] static linking for mingw-cross-env +Subject: [PATCH] static linking for MXE --- include/curl/curlbuild.h.in | 3 +++ diff --git a/src/curl-test.c b/src/curl-test.c index 991a364..291bf6f 100644 --- a/src/curl-test.c +++ b/src/curl-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <curl/curl.h> diff --git a/src/curl.mk b/src/curl.mk index b633ded..30a4952 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # cURL diff --git a/src/dbus-1-fixes.patch b/src/dbus-1-fixes.patch index 79db32a..3a45b46 100644 --- a/src/dbus-1-fixes.patch +++ b/src/dbus-1-fixes.patch @@ -1,12 +1,12 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 9c99802fc9d0e3b2c90b00ba877ae8be9bab615f Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Tue, 4 Jan 2011 00:47:49 +0100 -Subject: [PATCH 1/2] always static in mingw-cross-env +Subject: [PATCH 1/2] always static in MXE diff --git a/dbus/dbus-macros.h b/dbus/dbus-macros.h @@ -26,9 +26,9 @@ index dcd3eeb..8324278 100644 From d7bc1aff67132c09d154999c282e1b391bbe7a39 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 23 Sep 2011 16:24:46 +0200 -Subject: [PATCH 2/2] add missing MemoryBarrier (mingw-cross-env specific) +Subject: [PATCH 2/2] add missing MemoryBarrier (MXE specific) Windows API has this, but it's not in MinGW. See http://lists-archives.org/mingw-users/15935-missing-definition-of-memorybarrier.html diff --git a/src/dbus.mk b/src/dbus.mk index 027120f..c2320d4 100644 --- a/src/dbus.mk +++ b/src/dbus.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # dbus diff --git a/src/dcmtk-1-fixes.patch b/src/dcmtk-1-fixes.patch index 37a42fc..75b79a7 100644 --- a/src/dcmtk-1-fixes.patch +++ b/src/dcmtk-1-fixes.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. diff --git a/src/dcmtk.mk b/src/dcmtk.mk index d1c0d6c..e460ebb 100644 --- a/src/dcmtk.mk +++ b/src/dcmtk.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # DCMTK diff --git a/src/devil-1-png.patch b/src/devil-1-png.patch index d51bcd7..8794a79 100644 --- a/src/devil-1-png.patch +++ b/src/devil-1-png.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -urN devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c diff --git a/src/devil.mk b/src/devil.mk index 4d5761c..330a5ae 100644 --- a/src/devil.mk +++ b/src/devil.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # DevIL diff --git a/src/eigen.mk b/src/eigen.mk index 33435ff..50b4aea 100644 --- a/src/eigen.mk +++ b/src/eigen.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # eigen diff --git a/src/exiv2-r2619.patch b/src/exiv2-r2619.patch index ae6f609..0406fc9 100644 --- a/src/exiv2-r2619.patch +++ b/src/exiv2-r2619.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from: diff --git a/src/exiv2-r2646.patch b/src/exiv2-r2646.patch index 3afe854..89be381 100644 --- a/src/exiv2-r2646.patch +++ b/src/exiv2-r2646.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from: diff --git a/src/exiv2-r2650.patch b/src/exiv2-r2650.patch index 5014cd9..90e2351 100644 --- a/src/exiv2-r2650.patch +++ b/src/exiv2-r2650.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from: diff --git a/src/exiv2.mk b/src/exiv2.mk index f0bdd3f..6aaf1a5 100644 --- a/src/exiv2.mk +++ b/src/exiv2.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Exiv2 diff --git a/src/expat.mk b/src/expat.mk index 8dde270..0f92267 100644 --- a/src/expat.mk +++ b/src/expat.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Expat XML Parser diff --git a/src/faad2-1-uint.patch b/src/faad2-1-uint.patch index 04ffe0e..6deee85 100644 --- a/src/faad2-1-uint.patch +++ b/src/faad2-1-uint.patch @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. --- ./frontend/main.c.backup 2010-07-01 16:53:48.563042615 +0200 diff --git a/src/faad2.mk b/src/faad2.mk index 3cf8de3..34de99f 100644 --- a/src/faad2.mk +++ b/src/faad2.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # faad2 diff --git a/src/ffmpeg-1-pkgconfig.patch b/src/ffmpeg-1-pkgconfig.patch index 05ad401..1ffab1e 100644 --- a/src/ffmpeg-1-pkgconfig.patch +++ b/src/ffmpeg-1-pkgconfig.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch adds a libswresample dependency to libavfilter.pc, and a libavfilter diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk index d0761de..7549ab6 100644 --- a/src/ffmpeg.mk +++ b/src/ffmpeg.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # ffmpeg diff --git a/src/fftw.mk b/src/fftw.mk index 3d615ae..a3412fa 100644 --- a/src/fftw.mk +++ b/src/fftw.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # fftw diff --git a/src/file-test.c b/src/file-test.c index 8e0e48b..337cfb9 100644 --- a/src/file-test.c +++ b/src/file-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdio.h> diff --git a/src/file.mk b/src/file.mk index 4de99ec..cc5a768 100644 --- a/src/file.mk +++ b/src/file.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # file diff --git a/src/flac-1-win32.patch b/src/flac-1-win32.patch index 0a0c051..d47d002 100644 --- a/src/flac-1-win32.patch +++ b/src/flac-1-win32.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -ru flac-1.2.1.orig/include/share/alloc.h flac-1.2.1/include/share/alloc.h diff --git a/src/flac-2-lwsock32.patch b/src/flac-2-lwsock32.patch index 6a49fa1..fe657c8 100644 --- a/src/flac-2-lwsock32.patch +++ b/src/flac-2-lwsock32.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -urN flac-1.2.1.orig/src/libFLAC/flac.pc.in flac-1.2.1/src/libFLAC/flac.pc.in diff --git a/src/flac.mk b/src/flac.mk index d92a6eb..e71462e 100644 --- a/src/flac.mk +++ b/src/flac.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # FLAC diff --git a/src/fltk-1-darwin-cross-compile.patch b/src/fltk-1-darwin-cross-compile.patch index baf2607..59d85ac 100644 --- a/src/fltk-1-darwin-cross-compile.patch +++ b/src/fltk-1-darwin-cross-compile.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from: diff --git a/src/fltk-test.cpp b/src/fltk-test.cpp index 0ade6d5..7c59564 100644 --- a/src/fltk-test.cpp +++ b/src/fltk-test.cpp @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ /* http://www.fltk.org/doc-1.3/basics.html */ diff --git a/src/fltk.mk b/src/fltk.mk index ba9a0e8..97144d6 100644 --- a/src/fltk.mk +++ b/src/fltk.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # FLTK diff --git a/src/fontconfig.mk b/src/fontconfig.mk index 712ada1..1de943e 100644 --- a/src/fontconfig.mk +++ b/src/fontconfig.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # fontconfig diff --git a/src/freeglut-1-fixes.patch b/src/freeglut-1-fixes.patch index 71aa60e..f5db7d5 100644 --- a/src/freeglut-1-fixes.patch +++ b/src/freeglut-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 87a791a05687c7737d1c50381a0de30ba1acf96e Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 24 Oct 2011 09:40:10 +0200 Subject: [PATCH] add pkg-config support diff --git a/src/freeglut-test.c b/src/freeglut-test.c index 254230b..aaa2d73 100644 --- a/src/freeglut-test.c +++ b/src/freeglut-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <GL/glut.h> diff --git a/src/freeglut.mk b/src/freeglut.mk index 1132c60..87bdd9f 100644 --- a/src/freeglut.mk +++ b/src/freeglut.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # freeglut diff --git a/src/freeimage-1-fixes.patch b/src/freeimage-1-fixes.patch index 8f157ba..8e2ceba 100644 --- a/src/freeimage-1-fixes.patch +++ b/src/freeimage-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 7b90b53e9d48aa13aaa42d60b060fb3ff9a5f11c Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 20 Feb 2012 09:02:05 +0100 Subject: [PATCH 1/3] add missing header for mingw @@ -34,9 +34,9 @@ index 33a81b9..c5d57f6 100644 1.7.9.2 From fa251a7e33ac1c73992a5825a1f1f2fa888af93c Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 20 Feb 2012 08:58:53 +0100 -Subject: [PATCH 2/3] makefile workarounds (mingw-cross-env) +Subject: [PATCH 2/3] makefile workarounds (MXE) --- FreeImage/Makefile.gnu | 13 ++++--------- @@ -89,9 +89,9 @@ index e6007ae..631eb82 100644 1.7.9.2 From 5f52e869fdcc5a18592a6b87b83ce1f6c15a3ac0 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 20 Feb 2012 09:47:08 +0100 -Subject: [PATCH 3/3] required win version (mingw-cross-env) +Subject: [PATCH 3/3] required win version (MXE) --- FreeImage/Makefile.gnu | 4 ++-- diff --git a/src/freeimage.mk b/src/freeimage.mk index b1cbfea..1f1a20a 100644 --- a/src/freeimage.mk +++ b/src/freeimage.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # FreeImage diff --git a/src/freetds.mk b/src/freetds.mk index 80500bf..ec66ecf 100644 --- a/src/freetds.mk +++ b/src/freetds.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # FreeTDS diff --git a/src/freetype.mk b/src/freetype.mk index 588c5ce..d84e7cf 100644 --- a/src/freetype.mk +++ b/src/freetype.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # freetype diff --git a/src/fribidi-1-fix-gassert.patch b/src/fribidi-1-fix-gassert.patch index 3ae42bc..baf921a 100644 --- a/src/fribidi-1-fix-gassert.patch +++ b/src/fribidi-1-fix-gassert.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -ru fribidi-0.19.2.orig/lib/fribidi-common.h fribidi-0.19.2/lib/fribidi-common.h diff --git a/src/fribidi.mk b/src/fribidi.mk index b9a7243..cbb1c6e 100644 --- a/src/fribidi.mk +++ b/src/fribidi.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # FriBidi diff --git a/src/ftgl.mk b/src/ftgl.mk index 0c8fac1..d7a63cd 100644 --- a/src/ftgl.mk +++ b/src/ftgl.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # ftgl @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # gc diff --git a/src/gcc-1-mingw-float.patch b/src/gcc-1-mingw-float.patch index 5f171d4..11fb7c6 100644 --- a/src/gcc-1-mingw-float.patch +++ b/src/gcc-1-mingw-float.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from: diff --git a/src/gcc-2-darwin-no-pie.patch b/src/gcc-2-darwin-no-pie.patch index 1debfb8..af2d714 100644 --- a/src/gcc-2-darwin-no-pie.patch +++ b/src/gcc-2-darwin-no-pie.patch @@ -1,7 +1,7 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. -mingw-cross-env specific workaround for OSX Lion's new ASLR +MXE specific workaround for OSX Lion's new ASLR causing problems with pre-compiled headers. 1. more recent native compilers don't solve the problem diff --git a/src/gcc-gmp.mk b/src/gcc-gmp.mk index a9bb108..11c6b19 100644 --- a/src/gcc-gmp.mk +++ b/src/gcc-gmp.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GMP for GCC diff --git a/src/gcc-mpc.mk b/src/gcc-mpc.mk index ebe234e..4086cd3 100644 --- a/src/gcc-mpc.mk +++ b/src/gcc-mpc.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # MPC for GCC diff --git a/src/gcc-mpfr.mk b/src/gcc-mpfr.mk index e6669c8..d841a5d 100644 --- a/src/gcc-mpfr.mk +++ b/src/gcc-mpfr.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # MPFR for GCC @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GCC diff --git a/src/gd-1-libpng15.patch b/src/gd-1-libpng15.patch index 41771c1..f659617 100644 --- a/src/gd-1-libpng15.patch +++ b/src/gd-1-libpng15.patch @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. This patch has been taken from: diff --git a/src/gd-test.c b/src/gd-test.c index 8d86e3d..a4659bc 100644 --- a/src/gd-test.c +++ b/src/gd-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ /* modified from /examples/arc.c */ @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GD (without support for xpm) diff --git a/src/gdal.mk b/src/gdal.mk index f4d556e..de7ad09 100644 --- a/src/gdal.mk +++ b/src/gdal.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GDAL diff --git a/src/gdb-1-fix-shell.patch b/src/gdb-1-fix-shell.patch index 5263f86..ff058e5 100644 --- a/src/gdb-1-fix-shell.patch +++ b/src/gdb-1-fix-shell.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from: diff --git a/src/gdb-2-fix-makeinfo.patch b/src/gdb-2-fix-makeinfo.patch index 47a849e..0a60985 100644 --- a/src/gdb-2-fix-makeinfo.patch +++ b/src/gdb-2-fix-makeinfo.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from: @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # gdb diff --git a/src/gdk-pixbuf-1-fixes.patch b/src/gdk-pixbuf-1-fixes.patch index ef4479f..5095798 100644 --- a/src/gdk-pixbuf-1-fixes.patch +++ b/src/gdk-pixbuf-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 74e785e4ee6cf375f1c04d9e57e4b70caec6742c Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 23:31:24 +0200 Subject: [PATCH 1/3] s,DllMain,static _disabled_DllMain, diff --git a/src/gdk-pixbuf.mk b/src/gdk-pixbuf.mk index 2ac9e54..0615973 100644 --- a/src/gdk-pixbuf.mk +++ b/src/gdk-pixbuf.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GDK-pixbuf diff --git a/src/geos-test.c b/src/geos-test.c index bf2c59d..9762e99 100644 --- a/src/geos-test.c +++ b/src/geos-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdarg.h> diff --git a/src/geos.mk b/src/geos.mk index 6e28b83..83820ae 100644 --- a/src/geos.mk +++ b/src/geos.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GEOS diff --git a/src/gettext.mk b/src/gettext.mk index c24f59b..42e4f4c 100644 --- a/src/gettext.mk +++ b/src/gettext.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # gettext diff --git a/src/giflib.mk b/src/giflib.mk index 382aa10..8c2027a 100644 --- a/src/giflib.mk +++ b/src/giflib.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # giflib diff --git a/src/glew-test.c b/src/glew-test.c index e37a520..bdc36f1 100644 --- a/src/glew-test.c +++ b/src/glew-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdio.h> diff --git a/src/glew.mk b/src/glew.mk index 595de28..80c6d95 100644 --- a/src/glew.mk +++ b/src/glew.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GLEW diff --git a/src/glib-1-fixes.patch b/src/glib-1-fixes.patch index 9009a44..b4166df 100644 --- a/src/glib-1-fixes.patch +++ b/src/glib-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 4693f62d3f01f7b7d26607e6eed843202cbf90f7 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 23 Sep 2010 21:36:04 +0200 Subject: [PATCH 1/5] no gtk doc check @@ -27,7 +27,7 @@ index a821267..2e541d2 100644 From 46d0d473e6fb32c5204d063cad5f5073d2a139a5 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 23 Sep 2010 21:41:51 +0200 Subject: [PATCH 2/5] optional gettext @@ -69,7 +69,7 @@ index c710046..269bfdf 100644 From 3473b5183b2e59d247cd1db053efc6c9ecaf2aab Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 23 Sep 2010 21:42:46 +0200 Subject: [PATCH 3/5] fix tool paths @@ -96,7 +96,7 @@ index 3d1ac12..58e1ecf 100644 From 0e57514812500d5d4dee03e1be8059a25876dd99 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 23 Sep 2010 21:45:50 +0200 Subject: [PATCH 4/5] fix dependency libs @@ -130,7 +130,7 @@ index 58e1ecf..17b2133 100644 From 87931c81f6401fb0c25064ec0ba2edca9ec53924 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Sat, 25 Sep 2010 00:07:33 +0200 Subject: [PATCH 5/5] add -ldnsapi to gio-2.0.pc diff --git a/src/glib.mk b/src/glib.mk index d3aa6aa..89bc0d3 100644 --- a/src/glib.mk +++ b/src/glib.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GLib diff --git a/src/glibmm.mk b/src/glibmm.mk index 32d35b7..3f34824 100644 --- a/src/glibmm.mk +++ b/src/glibmm.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GLibmm @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GMP diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch index ccff9b6..b6208a8 100644 --- a/src/gnutls-1-fixes.patch +++ b/src/gnutls-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 6e89465f1e792f5d527708544cce1ef92ae4669b Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 28 Oct 2011 09:23:41 +0200 Subject: [PATCH 1/2] add missing static library linking @@ -26,9 +26,9 @@ index c45f8f3..57d0dbb 100644 From aa11a6f645ce93f80fbffd7e72c6964bdfd68542 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 24 Nov 2011 15:06:06 +0100 -Subject: [PATCH 2/2] disable doc and test (mingw-cross-env specific) +Subject: [PATCH 2/2] disable doc and test (MXE specific) diff --git a/Makefile.am b/Makefile.am diff --git a/src/gnutls-test.c b/src/gnutls-test.c index 06ebb39..c0bbef0 100644 --- a/src/gnutls-test.c +++ b/src/gnutls-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <gnutls/gnutls.h> diff --git a/src/gnutls.mk b/src/gnutls.mk index c783fe3..cda9b1a 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GnuTLS diff --git a/src/graphicsmagick-1-fix-xml2-config.patch b/src/graphicsmagick-1-fix-xml2-config.patch index 1775610..5402290 100644 --- a/src/graphicsmagick-1-fix-xml2-config.patch +++ b/src/graphicsmagick-1-fix-xml2-config.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from: diff --git a/src/graphicsmagick-test.cpp b/src/graphicsmagick-test.cpp index 00995b7..e6dc8ac 100644 --- a/src/graphicsmagick-test.cpp +++ b/src/graphicsmagick-test.cpp @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <Magick++.h> diff --git a/src/graphicsmagick.mk b/src/graphicsmagick.mk index a1e51d5..befbad6 100644 --- a/src/graphicsmagick.mk +++ b/src/graphicsmagick.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GraphicsMagick diff --git a/src/gsl-test.c b/src/gsl-test.c index fd13b2b..82bdcf8 100644 --- a/src/gsl-test.c +++ b/src/gsl-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdio.h> @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GSL diff --git a/src/gsoap-1-fixes.patch b/src/gsoap-1-fixes.patch index 63322eb..c1129d6 100644 --- a/src/gsoap-1-fixes.patch +++ b/src/gsoap-1-fixes.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. diff --git a/src/gsoap.mk b/src/gsoap.mk index 5bc8cb6..37a7819 100644 --- a/src/gsoap.mk +++ b/src/gsoap.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # gSOAP @@ -55,6 +55,6 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j '$(JOBS)' install # Apparently there is a tradition of compiling gsoap source files into applications. # Since we linked dom.cpp and dom.c into the libraries, this should not be necessary. - # But we bend to tradition and install these sources into mingw-cross-env. + # But we bend to tradition and install these sources into MXE. $(INSTALL) -m644 '$(1)/gsoap/'*.c '$(1)/gsoap/'*.cpp '$(PREFIX)/$(TARGET)/share/gsoap' endef diff --git a/src/gst-plugins-base.mk b/src/gst-plugins-base.mk index ea81ed0..79bdd33 100644 --- a/src/gst-plugins-base.mk +++ b/src/gst-plugins-base.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # gst-plugins-base diff --git a/src/gst-plugins-good.mk b/src/gst-plugins-good.mk index 98f3db8..3d15290 100644 --- a/src/gst-plugins-good.mk +++ b/src/gst-plugins-good.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # gst-plugins-good diff --git a/src/gstreamer.mk b/src/gstreamer.mk index 603a333..00971c5 100644 --- a/src/gstreamer.mk +++ b/src/gstreamer.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # gstreamer diff --git a/src/gta-test.c b/src/gta-test.c index 4838fcb..66e77ab 100644 --- a/src/gta-test.c +++ b/src/gta-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <gta/gta.h> @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # gta diff --git a/src/gtk2-1-fixes.patch b/src/gtk2-1-fixes.patch index 57cdfa7..06f9c71 100644 --- a/src/gtk2-1-fixes.patch +++ b/src/gtk2-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 2e42ff35296c81959a8fab06aa8d3dacf19632d8 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 14:43:43 +0200 Subject: [PATCH 01/10] s,DllMain,static _disabled_DllMain, @@ -40,7 +40,7 @@ index d081f70..aa2973d 100644 From 86527a238545e47b4770531c79f5f2ead59aab85 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 14:46:20 +0200 Subject: [PATCH 02/10] s,__declspec(dllimport),, @@ -102,7 +102,7 @@ index c624aea..b792ea5 100644 From 7277a7022eb4ffb498475d969057d3a57e687222 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 15:03:28 +0200 Subject: [PATCH 03/10] s,__declspec(dllexport),, @@ -164,7 +164,7 @@ index b792ea5..f382a64 100644 From 604fcdb64972a82c6a430c36debc9f66c7f05d90 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 14:17:22 +0200 Subject: [PATCH 04/10] fix gtk+-2.0.pc.in @@ -185,7 +185,7 @@ index 46853e1..7f3eb22 100644 From a778e96b43b556389f1e3a6712072eaee9e2adb2 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 14:48:31 +0200 Subject: [PATCH 05/10] disable gtkbuiltincache @@ -208,7 +208,7 @@ index 76981d8..b6d170f 100644 From 58310acc28f8e6994281eacac1989e8e6c51c150 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 14:49:50 +0200 Subject: [PATCH 06/10] disable test-inline-pixbufs.h @@ -231,7 +231,7 @@ index 9f90d09..2e4f967 100644 From 7532813f3bfe95fe088c06ce11d31c0d3d66c559 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 14:51:04 +0200 Subject: [PATCH 07/10] permit static building @@ -332,7 +332,7 @@ index 5eedff6..6380da5 100755 From 821882bb862fc86b7152eba82966163d054b488e Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 14:53:18 +0200 Subject: [PATCH 08/10] no -Wl @@ -355,7 +355,7 @@ index 6380da5..7283f17 100755 From 80745459d75da07c53dbb83c6a79c3d9896e5fd3 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 14:54:15 +0200 Subject: [PATCH 09/10] gio not gio-unix @@ -381,7 +381,7 @@ index 7283f17..50e6a86 100755 From 337e54ef8aa5a4d131e9d9007dedcc42b164e68c Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 15:30:49 +0200 Subject: [PATCH 10/10] removed duplicate _gtk_marshal_OBJECT__VOID() diff --git a/src/gtk2-test.c b/src/gtk2-test.c index 75b7460..53db936 100644 --- a/src/gtk2-test.c +++ b/src/gtk2-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <gtk/gtk.h> diff --git a/src/gtk2.mk b/src/gtk2.mk index 98db27f..10d2d36 100644 --- a/src/gtk2.mk +++ b/src/gtk2.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GTK+ diff --git a/src/gtkglext-1-fixes.patch b/src/gtkglext-1-fixes.patch index 26edc7c..ba812a0 100644 --- a/src/gtkglext-1-fixes.patch +++ b/src/gtkglext-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From c79e894db7f1a5cbd6ba57352f79d68595175666 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 1 Oct 2010 14:43:15 +0200 Subject: [PATCH 1/4] remove pangox dependency @@ -35,7 +35,7 @@ index e5b678c..54bb867 100644 From a6894898cad4238a3676cf6fbfe6c378217317ca Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 1 Oct 2010 14:44:37 +0200 Subject: [PATCH 2/4] use correct glib mkenums patch @@ -91,7 +91,7 @@ index 005bd1b..ace11c7 100644 From 9080ce06af85a0beee38f0d391ee8fab8dc07fdf Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 1 Oct 2010 14:47:30 +0200 Subject: [PATCH 3/4] don't use deprecated functions @@ -181,7 +181,7 @@ index ecb41ef..2a31c5a 100644 From eb64eb053481321cb1b0d3ec9e2fcb46c55c0972 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 1 Oct 2010 14:50:25 +0200 Subject: [PATCH 4/4] removed import declarations diff --git a/src/gtkglext-test.c b/src/gtkglext-test.c index 5ceb99d..e4c25d5 100644 --- a/src/gtkglext-test.c +++ b/src/gtkglext-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <gtk/gtk.h> diff --git a/src/gtkglext.mk b/src/gtkglext.mk index d598612..f713ecc 100644 --- a/src/gtkglext.mk +++ b/src/gtkglext.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GtkGLExt diff --git a/src/gtkglextmm-1-fixes.patch b/src/gtkglextmm-1-fixes.patch index 003832b..510f954 100644 --- a/src/gtkglextmm-1-fixes.patch +++ b/src/gtkglextmm-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 865936e91293bdc59c2e9c47e5a4b54fb6f1629e Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Wed, 29 Sep 2010 23:08:44 +0200 Subject: [PATCH] allow deprecated GdkSpanFunc diff --git a/src/gtkglextmm-test.cpp b/src/gtkglextmm-test.cpp index 99fb1c7..20e0bdf 100644 --- a/src/gtkglextmm-test.cpp +++ b/src/gtkglextmm-test.cpp @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */
+/* This file is part of MXE. */
/* See doc/index.html for further information. */
#include <gtkmm/main.h>
diff --git a/src/gtkglextmm.mk b/src/gtkglextmm.mk index dbf2466..592a972 100644 --- a/src/gtkglextmm.mk +++ b/src/gtkglextmm.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GtkGLExtmm diff --git a/src/gtkmm2-test.cpp b/src/gtkmm2-test.cpp index d92177a..dffd751 100644 --- a/src/gtkmm2-test.cpp +++ b/src/gtkmm2-test.cpp @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <gtkmm/window.h> @@ -9,7 +9,7 @@ int main(int argc, char *argv[]) Gtk::Main g(argc, argv); Gtk::Window window; - window.set_title("Test App mingw-cross-env"); + window.set_title("Test App MXE"); window.set_default_size(200, 200); window.show_all(); g.run(window); diff --git a/src/gtkmm2.mk b/src/gtkmm2.mk index 5dee5b3..c3f8d3d 100644 --- a/src/gtkmm2.mk +++ b/src/gtkmm2.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GTKMM diff --git a/src/gtksourceview.mk b/src/gtksourceview.mk index ac6f48f..cb3ace3 100644 --- a/src/gtksourceview.mk +++ b/src/gtksourceview.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GTKSourceView diff --git a/src/gtksourceviewmm2.mk b/src/gtksourceviewmm2.mk index 00b3b23..64998bb 100644 --- a/src/gtksourceviewmm2.mk +++ b/src/gtksourceviewmm2.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GtkSourceViewmm diff --git a/src/guile-1-win32.patch b/src/guile-1-win32.patch index 383bac7..8f94a96 100644 --- a/src/guile-1-win32.patch +++ b/src/guile-1-win32.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -ruN guile-1.8.7.orig/configure guile-1.8.7/configure diff --git a/src/guile-test.c b/src/guile-test.c index d1bcd58..b8cc22d 100644 --- a/src/guile-test.c +++ b/src/guile-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <libguile.h> diff --git a/src/guile.mk b/src/guile.mk index 32a9a4e..0c54628 100644 --- a/src/guile.mk +++ b/src/guile.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GNU Guile diff --git a/src/id3lib-1-win32.patch b/src/id3lib-1-win32.patch index 7867f2b..0052c61 100644 --- a/src/id3lib-1-win32.patch +++ b/src/id3lib-1-win32.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -ru id3lib-3.8.3-orig/configure.in id3lib-3.8.3/configure.in diff --git a/src/id3lib.mk b/src/id3lib.mk index 57f6832..bde0f25 100644 --- a/src/id3lib.mk +++ b/src/id3lib.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # id3lib diff --git a/src/ilmbase-1-gcc45-include.patch b/src/ilmbase-1-gcc45-include.patch index fc83a0b..c117aed 100644 --- a/src/ilmbase-1-gcc45-include.patch +++ b/src/ilmbase-1-gcc45-include.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from: diff --git a/src/ilmbase-2-osx-cxxflags.patch b/src/ilmbase-2-osx-cxxflags.patch index 735c2ee..a9c21b3 100644 --- a/src/ilmbase-2-osx-cxxflags.patch +++ b/src/ilmbase-2-osx-cxxflags.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from http://lists.nongnu.org/archive/html/openexr-devel/2010-08/msg00011.html diff --git a/src/ilmbase.mk b/src/ilmbase.mk index 6da520f..4a8d6b1 100644 --- a/src/ilmbase.mk +++ b/src/ilmbase.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # IlmBase diff --git a/src/imagemagick.mk b/src/imagemagick.mk index b7ebbfa..d5758dd 100644 --- a/src/imagemagick.mk +++ b/src/imagemagick.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # ImageMagick diff --git a/src/jasper.mk b/src/jasper.mk index 675f614..56a2f3d 100644 --- a/src/jasper.mk +++ b/src/jasper.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # JasPer diff --git a/src/jpeg-test.c b/src/jpeg-test.c index 0b8cdb2..8d442fe 100644 --- a/src/jpeg-test.c +++ b/src/jpeg-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdio.h> diff --git a/src/jpeg.mk b/src/jpeg.mk index 4b9b269..a362fab 100644 --- a/src/jpeg.mk +++ b/src/jpeg.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # jpeg diff --git a/src/json-c.mk b/src/json-c.mk index 7571484..bf4f593 100644 --- a/src/json-c.mk +++ b/src/json-c.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # json-c diff --git a/src/lame.mk b/src/lame.mk index 6d488e5..5175516 100644 --- a/src/lame.mk +++ b/src/lame.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # lame diff --git a/src/lapack.mk b/src/lapack.mk index 02149b9..ff5c705 100644 --- a/src/lapack.mk +++ b/src/lapack.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # lapack diff --git a/src/lcms-1-fixes.patch b/src/lcms-1-fixes.patch index a4b4b75..5f3da60 100644 --- a/src/lcms-1-fixes.patch +++ b/src/lcms-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 664fb3591893facfe280cb930e20b61355e32ac1 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 23 Dec 2011 00:01:31 +0100 Subject: [PATCH] add missing static dependencies to .pc file diff --git a/src/lcms.mk b/src/lcms.mk index 5a37c12..66c8f71 100644 --- a/src/lcms.mk +++ b/src/lcms.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # lcms diff --git a/src/lcms1-1-fixes.patch b/src/lcms1-1-fixes.patch index 5bd16fa..6e8cd13 100644 --- a/src/lcms1-1-fixes.patch +++ b/src/lcms1-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 6f4063fc97b3acc653605c077c94b862a9808fd4 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 23 Dec 2011 00:07:18 +0100 Subject: [PATCH] add missing static dependencies to .pc file diff --git a/src/lcms1.mk b/src/lcms1.mk index b3cbeeb..1dba682 100644 --- a/src/lcms1.mk +++ b/src/lcms1.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # lcms1 diff --git a/src/libarchive-1-fixes.patch b/src/libarchive-1-fixes.patch index f4cb86b..68fe6de 100644 --- a/src/libarchive-1-fixes.patch +++ b/src/libarchive-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 47b80beedcb3d8e6296e2d0b970bb0c82abb4424 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Tue, 14 Feb 2012 12:40:24 +0100 Subject: [PATCH] fix pkg-config diff --git a/src/libarchive-test.c b/src/libarchive-test.c index 46f28c1..d6ab632 100644 --- a/src/libarchive-test.c +++ b/src/libarchive-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <archive.h> diff --git a/src/libarchive.mk b/src/libarchive.mk index 26596c2..683bc4e 100644 --- a/src/libarchive.mk +++ b/src/libarchive.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Libarchive diff --git a/src/libass-test.c b/src/libass-test.c index ba847a5..71e069c 100644 --- a/src/libass-test.c +++ b/src/libass-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <ass/ass.h> diff --git a/src/libass.mk b/src/libass.mk index ef182ec..5b5ba41 100644 --- a/src/libass.mk +++ b/src/libass.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libass diff --git a/src/libcroco.mk b/src/libcroco.mk index 651810a..fc809be 100644 --- a/src/libcroco.mk +++ b/src/libcroco.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Libcroco diff --git a/src/libdnet-1-fixes.patch b/src/libdnet-1-fixes.patch index c3cd858..4c26079 100644 --- a/src/libdnet-1-fixes.patch +++ b/src/libdnet-1-fixes.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Patch taken from http://sourceforge.net/mailarchive/message.php?msg_id=27995461 diff --git a/src/libdnet.mk b/src/libdnet.mk index 579e95e..3d5dbd0 100644 --- a/src/libdnet.mk +++ b/src/libdnet.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libdnet diff --git a/src/libevent.mk b/src/libevent.mk index 8bb2b08..9ae5b42 100644 --- a/src/libevent.mk +++ b/src/libevent.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libevent diff --git a/src/libffi-test.c b/src/libffi-test.c index ccc5d2a..630ce05 100644 --- a/src/libffi-test.c +++ b/src/libffi-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdio.h> diff --git a/src/libffi.mk b/src/libffi.mk index e397ce2..f5867bd 100644 --- a/src/libffi.mk +++ b/src/libffi.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libffi diff --git a/src/libgcrypt.mk b/src/libgcrypt.mk index 72f358f..5ecec24 100644 --- a/src/libgcrypt.mk +++ b/src/libgcrypt.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libgcrypt diff --git a/src/libgee.mk b/src/libgee.mk index e76467f..1d2be1e 100644 --- a/src/libgee.mk +++ b/src/libgee.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libgee diff --git a/src/libgeotiff.mk b/src/libgeotiff.mk index 9c9b693..c127b53 100644 --- a/src/libgeotiff.mk +++ b/src/libgeotiff.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GeoTiff diff --git a/src/libgnurx-1-build-static-lib.patch b/src/libgnurx-1-build-static-lib.patch index a62268a..fc0817b 100644 --- a/src/libgnurx-1-build-static-lib.patch +++ b/src/libgnurx-1-build-static-lib.patch @@ -1,9 +1,9 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. -diff -Nur mingw-libgnurx-2.5.1/Makefile.mingw-cross-env mingw-libgnurx-2.5.1-mingw-cross-env/Makefile.mingw-cross-env ---- mingw-libgnurx-2.5.1/Makefile.mingw-cross-env 1970-01-01 01:00:00.000000000 +0100 -+++ mingw-libgnurx-2.5.1-mingw-cross-env/Makefile.mingw-cross-env 2011-10-23 16:57:18.579312050 +0200 +diff -Nur mingw-libgnurx-2.5.1/Makefile.mxe mingw-libgnurx-2.5.1-mxe/Makefile.mxe +--- mingw-libgnurx-2.5.1/Makefile.mxe 1970-01-01 01:00:00.000000000 +0100 ++++ mingw-libgnurx-2.5.1-mxe/Makefile.mxe 2011-10-23 16:57:18.579312050 +0200 @@ -0,0 +1,11 @@ +include Makefile + diff --git a/src/libgnurx.mk b/src/libgnurx.mk index 25aa322..bed9eb0 100644 --- a/src/libgnurx.mk +++ b/src/libgnurx.mk @@ -1,4 +1,4 @@ -# This libgnurx is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libgnurx @@ -25,5 +25,5 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' - $(MAKE) -C '$(1)' -f Makefile.mingw-cross-env -j '$(JOBS)' TARGET=$(TARGET) bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= install-static + $(MAKE) -C '$(1)' -f Makefile.mxe -j '$(JOBS)' TARGET=$(TARGET) bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= install-static endef diff --git a/src/libgomp-test.c b/src/libgomp-test.c index b0db0b0..065b328 100644 --- a/src/libgomp-test.c +++ b/src/libgomp-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <omp.h> diff --git a/src/libgomp.mk b/src/libgomp.mk index fc566a6..52cf0e3 100644 --- a/src/libgomp.mk +++ b/src/libgomp.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GCC-libgomp diff --git a/src/libgpg_error.mk b/src/libgpg_error.mk index c8b745e..a0106d8 100644 --- a/src/libgpg_error.mk +++ b/src/libgpg_error.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libgpg-error diff --git a/src/libgsasl-1-fixes.patch b/src/libgsasl-1-fixes.patch index cc18caf..ee5c2a6 100644 --- a/src/libgsasl-1-fixes.patch +++ b/src/libgsasl-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 1f0955db1bf81de15e1dd04f1fe29f73ef3983c8 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 7 Nov 2011 18:01:56 +0100 Subject: [PATCH] use memxor from nettle diff --git a/src/libgsasl-test.c b/src/libgsasl-test.c index 0fe5ff7..cddbca6 100644 --- a/src/libgsasl-test.c +++ b/src/libgsasl-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <gsasl.h> diff --git a/src/libgsasl.mk b/src/libgsasl.mk index c14f021..2e8825d 100644 --- a/src/libgsasl.mk +++ b/src/libgsasl.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Libgsasl diff --git a/src/libgsf-1-fixes.patch b/src/libgsf-1-fixes.patch index 4fa91b9..72cbc6e 100644 --- a/src/libgsf-1-fixes.patch +++ b/src/libgsf-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From f2970c9c697dd6a6104495ea91ed2488ead297b7 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 23:34:26 +0200 Subject: [PATCH 1/1] s,DllMain,static _disabled_DllMain, diff --git a/src/libgsf.mk b/src/libgsf.mk index 175b70b..4e2b85c 100644 --- a/src/libgsf.mk +++ b/src/libgsf.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libgsf diff --git a/src/libharu-1-fixes.patch b/src/libharu-1-fixes.patch index fc12fdb..0ad18d1 100644 --- a/src/libharu-1-fixes.patch +++ b/src/libharu-1-fixes.patch @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. From 531d2a9af8c51ad8badc32bc9ba43bb3b87b0e9f Mon Sep 17 00:00:00 2001 diff --git a/src/libharu.mk b/src/libharu.mk index e2bbf28..e36b5d1 100644 --- a/src/libharu.mk +++ b/src/libharu.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libharu diff --git a/src/libiberty-test.c b/src/libiberty-test.c index aca6c48..4f0d38b 100644 --- a/src/libiberty-test.c +++ b/src/libiberty-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #define _GNU_SOURCE diff --git a/src/libiberty.mk b/src/libiberty.mk index f6ed3f0..a6548f6 100644 --- a/src/libiberty.mk +++ b/src/libiberty.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libiberty diff --git a/src/libical-test.c b/src/libical-test.c index e5ffbae..38505a4 100644 --- a/src/libical-test.c +++ b/src/libical-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdio.h> diff --git a/src/libical.mk b/src/libical.mk index 8ac10bd..165c1cc 100644 --- a/src/libical.mk +++ b/src/libical.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libical diff --git a/src/libiconv.mk b/src/libiconv.mk index d39643e..bb58bb9 100644 --- a/src/libiconv.mk +++ b/src/libiconv.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libiconv diff --git a/src/libidn-1-fixes.patch b/src/libidn-1-fixes.patch index d2f4ee0..7105afd 100644 --- a/src/libidn-1-fixes.patch +++ b/src/libidn-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 2d8680323de1e709bfec5194db0119a7395ab78a Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 25 Nov 2011 15:58:28 +0100 Subject: [PATCH] fix Libs.private diff --git a/src/libidn-test.c b/src/libidn-test.c index 24d9f0a..22f46f6 100644 --- a/src/libidn-test.c +++ b/src/libidn-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdlib.h> diff --git a/src/libidn.mk b/src/libidn.mk index 221bc34..a91bc93 100644 --- a/src/libidn.mk +++ b/src/libidn.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Libidn diff --git a/src/libircclient-1-fixes.patch b/src/libircclient-1-fixes.patch index efe93ef..8c273b6 100644 --- a/src/libircclient-1-fixes.patch +++ b/src/libircclient-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 06b27e262de1d156ea31b52762ed372211b72de9 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 23 Jan 2012 08:26:14 +0100 Subject: [PATCH 1/2] use the proper WIN32 define @@ -66,7 +66,7 @@ index 2dcd44c..af7d769 100644 From 1a54c4dda67b99c1c0c0c68b45a395b741cb7030 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Sun, 22 Jan 2012 22:39:23 +0100 Subject: [PATCH 2/2] fix missing header diff --git a/src/libircclient-test.cpp b/src/libircclient-test.cpp index 5365aa8..bdfbbbf 100644 --- a/src/libircclient-test.cpp +++ b/src/libircclient-test.cpp @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <libircclient/libircclient.h> diff --git a/src/libircclient.mk b/src/libircclient.mk index 00dd07e..27c70d1 100644 --- a/src/libircclient.mk +++ b/src/libircclient.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libircclient diff --git a/src/liblo.mk b/src/liblo.mk index aa83ffb..2530602 100644 --- a/src/liblo.mk +++ b/src/liblo.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # liblo diff --git a/src/libmad.mk b/src/libmad.mk index 0f01aaa..55008fb 100644 --- a/src/libmad.mk +++ b/src/libmad.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libmad diff --git a/src/libmikmod-1-fixes.patch b/src/libmikmod-1-fixes.patch index e3c2094..c0a22e0 100644 --- a/src/libmikmod-1-fixes.patch +++ b/src/libmikmod-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From e740945ac2db92c3d1de0e805e0e8ea76f2e1373 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Sat, 24 Mar 2012 01:43:51 +0100 Subject: [PATCH] libmikmod-config should include -pthread for static diff --git a/src/libmikmod-test.c b/src/libmikmod-test.c index 133d6be..654e6f7 100644 --- a/src/libmikmod-test.c +++ b/src/libmikmod-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <mikmod.h> diff --git a/src/libmikmod.mk b/src/libmikmod.mk index 78a6adb..b64c9a7 100644 --- a/src/libmikmod.mk +++ b/src/libmikmod.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libMikMod diff --git a/src/libmng-1-fixes.patch b/src/libmng-1-fixes.patch index a78eeef..b482a5d 100644 --- a/src/libmng-1-fixes.patch +++ b/src/libmng-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 1a94342a8f86ab72b8d6c24b8ecd974d2821be04 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 3 Nov 2011 14:40:24 +0100 Subject: [PATCH] add pkg-config file diff --git a/src/libmng.mk b/src/libmng.mk index 26a3507..e63974e 100644 --- a/src/libmng.mk +++ b/src/libmng.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libmng diff --git a/src/libntlm.mk b/src/libntlm.mk index 7bebf64..3129f28 100644 --- a/src/libntlm.mk +++ b/src/libntlm.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Libntlm diff --git a/src/liboauth-test.c b/src/liboauth-test.c index 74e5974..4aad98e 100644 --- a/src/liboauth-test.c +++ b/src/liboauth-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdio.h> diff --git a/src/liboauth.mk b/src/liboauth.mk index 5a6f6ca..d1a2f85 100644 --- a/src/liboauth.mk +++ b/src/liboauth.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # liboauth diff --git a/src/libodbc++-1-win32.patch b/src/libodbc++-1-win32.patch index c4ae4c1..3183170 100644 --- a/src/libodbc++-1-win32.patch +++ b/src/libodbc++-1-win32.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. --- libodbc++-0.2.5.orig/configure.ac 2009-08-20 23:39:08.000000000 +0200 diff --git a/src/libodbc++.mk b/src/libodbc++.mk index b21826d..c116a11 100644 --- a/src/libodbc++.mk +++ b/src/libodbc++.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libodbc++ diff --git a/src/liboil.mk b/src/liboil.mk index e1010bf..5a73fff 100644 --- a/src/liboil.mk +++ b/src/liboil.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # liboil diff --git a/src/libpano13.mk b/src/libpano13.mk index 4da1fe7..d12d089 100644 --- a/src/libpano13.mk +++ b/src/libpano13.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libpano13 diff --git a/src/libpaper.mk b/src/libpaper.mk index d13e640..9af0658 100644 --- a/src/libpaper.mk +++ b/src/libpaper.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libpaper diff --git a/src/libpng-test.c b/src/libpng-test.c index 37304d6..d9ee8a6 100644 --- a/src/libpng-test.c +++ b/src/libpng-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ /* This is a slightly modified version of: */ diff --git a/src/libpng.mk b/src/libpng.mk index df323d2..3152edc 100644 --- a/src/libpng.mk +++ b/src/libpng.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libpng diff --git a/src/librsvg-1-fixes.patch b/src/librsvg-1-fixes.patch index db61a2f..4f4ff68 100644 --- a/src/librsvg-1-fixes.patch +++ b/src/librsvg-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains an ad hoc patch for cross building. From 1ff5a73bee660f1d61f9cdd7c8d7aff29e959c4c Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 27 Sep 2010 12:00:52 +0200 Subject: [PATCH 1/2] fix .pc requirements diff --git a/src/librsvg-test.c b/src/librsvg-test.c index 5b15461..3bfe8fb 100644 --- a/src/librsvg-test.c +++ b/src/librsvg-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <librsvg/rsvg.h> diff --git a/src/librsvg.mk b/src/librsvg.mk index 71617f0..9ac81d9 100644 --- a/src/librsvg.mk +++ b/src/librsvg.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # librsvg diff --git a/src/libsamplerate.mk b/src/libsamplerate.mk index 52e8370..fbc6940 100644 --- a/src/libsamplerate.mk +++ b/src/libsamplerate.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libsamplerate diff --git a/src/libshout-1-fixes.patch b/src/libshout-1-fixes.patch index 7488eb3..b9aadb6 100644 --- a/src/libshout-1-fixes.patch +++ b/src/libshout-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 25255ff19813e122e6442518b29a55c15860d3a3 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 1 Oct 2010 17:20:29 +0200 Subject: [PATCH] mingw fixes diff --git a/src/libshout.mk b/src/libshout.mk index 156c731..19538eb 100644 --- a/src/libshout.mk +++ b/src/libshout.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libshout diff --git a/src/libsigc++.mk b/src/libsigc++.mk index 4046fe5..19d63f0 100644 --- a/src/libsigc++.mk +++ b/src/libsigc++.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libsigc++ diff --git a/src/libsndfile.mk b/src/libsndfile.mk index 32b5469..077fba0 100644 --- a/src/libsndfile.mk +++ b/src/libsndfile.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libsndfile diff --git a/src/libssh2-1-fixes.patch b/src/libssh2-1-fixes.patch index 7bdccde..fca9e3d 100644 --- a/src/libssh2-1-fixes.patch +++ b/src/libssh2-1-fixes.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. From b3ade9a63e881e69b4c9cfe7b5dbad78dcc4a0e0 Mon Sep 17 00:00:00 2001 diff --git a/src/libssh2-test.c b/src/libssh2-test.c index f4b5630..3b5d73b 100644 --- a/src/libssh2-test.c +++ b/src/libssh2-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdio.h> diff --git a/src/libssh2.mk b/src/libssh2.mk index e7e10e8..4730f96 100644 --- a/src/libssh2.mk +++ b/src/libssh2.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libssh2 diff --git a/src/libtool.mk b/src/libtool.mk index b79b772..8cb5266 100644 --- a/src/libtool.mk +++ b/src/libtool.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GNU Libtool diff --git a/src/libunistring.mk b/src/libunistring.mk index bebffcb..7460c75 100644 --- a/src/libunistring.mk +++ b/src/libunistring.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libunistring diff --git a/src/libusb.mk b/src/libusb.mk index c1f13e4..f961132 100644 --- a/src/libusb.mk +++ b/src/libusb.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # LibUsb diff --git a/src/libvpx-1-config.patch b/src/libvpx-1-config.patch index 2f7ac9c..cf704e8 100644 --- a/src/libvpx-1-config.patch +++ b/src/libvpx-1-config.patch @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. diff --git a/configure b/configure diff --git a/src/libvpx-2-fix-bin-bash.patch b/src/libvpx-2-fix-bin-bash.patch index 929ca14..7492a54 100644 --- a/src/libvpx-2-fix-bin-bash.patch +++ b/src/libvpx-2-fix-bin-bash.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from: diff --git a/src/libvpx.mk b/src/libvpx.mk index debc7a3..093bd23 100644 --- a/src/libvpx.mk +++ b/src/libvpx.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # vpx diff --git a/src/libxml++.mk b/src/libxml++.mk index fe3b10e..c3e23a2 100644 --- a/src/libxml++.mk +++ b/src/libxml++.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libxml2 diff --git a/src/libxml2.mk b/src/libxml2.mk index e4bf3d9..8f1c7d3 100644 --- a/src/libxml2.mk +++ b/src/libxml2.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libxml2 diff --git a/src/libxslt.mk b/src/libxslt.mk index 6ace238..19ed75e 100644 --- a/src/libxslt.mk +++ b/src/libxslt.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libxslt diff --git a/src/llvm.mk b/src/llvm.mk index eee2164..a790cfa 100644 --- a/src/llvm.mk +++ b/src/llvm.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # llvm diff --git a/src/lua-test.c b/src/lua-test.c index efb9126..f13fcfe 100644 --- a/src/lua-test.c +++ b/src/lua-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdio.h> @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Lua @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # lzo diff --git a/src/matio.mk b/src/matio.mk index f602389..a08f9e5 100644 --- a/src/matio.mk +++ b/src/matio.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # matio diff --git a/src/mingw-utils-1-portability-fix.patch b/src/mingw-utils-1-portability-fix.patch index 644130c..547afbe 100644 --- a/src/mingw-utils-1-portability-fix.patch +++ b/src/mingw-utils-1-portability-fix.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from: diff --git a/src/mingw-utils.mk b/src/mingw-utils.mk index 6cb42b6..8e0e335 100644 --- a/src/mingw-utils.mk +++ b/src/mingw-utils.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # MinGW Utilities diff --git a/src/mingwrt.mk b/src/mingwrt.mk index 950eddd..2abffe3 100644 --- a/src/mingwrt.mk +++ b/src/mingwrt.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # MinGW Runtime diff --git a/src/mpfr.mk b/src/mpfr.mk index c41405d..3d27701 100644 --- a/src/mpfr.mk +++ b/src/mpfr.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # mpfr diff --git a/src/muparser.mk b/src/muparser.mk index d873d07..8077f05 100644 --- a/src/muparser.mk +++ b/src/muparser.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # muParser diff --git a/src/mxml-test.c b/src/mxml-test.c index 80be2ea..405096f 100644 --- a/src/mxml-test.c +++ b/src/mxml-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <mxml.h> diff --git a/src/mxml.mk b/src/mxml.mk index 8fb2473..8b1e574 100644 --- a/src/mxml.mk +++ b/src/mxml.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Mini-XML diff --git a/src/nettle.mk b/src/nettle.mk index bf24eb3..1a6258c 100644 --- a/src/nettle.mk +++ b/src/nettle.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # nettle diff --git a/src/nsis-1-explicit-mingw-cross-prefix.patch b/src/nsis-1-explicit-mingw-cross-prefix.patch index df28944..f851b76 100644 --- a/src/nsis-1-explicit-mingw-cross-prefix.patch +++ b/src/nsis-1-explicit-mingw-cross-prefix.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from: diff --git a/src/nsis.mk b/src/nsis.mk index 2d89c5b..d528914 100644 --- a/src/nsis.mk +++ b/src/nsis.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # NSIS @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # OGG @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # old diff --git a/src/openal-1-luuid-pkg-config.patch b/src/openal-1-luuid-pkg-config.patch index 714a4b4..1f9162a 100644 --- a/src/openal-1-luuid-pkg-config.patch +++ b/src/openal-1-luuid-pkg-config.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from: diff --git a/src/openal-2-guid-static-link.patch b/src/openal-2-guid-static-link.patch index 239402c..984ad97 100644 --- a/src/openal-2-guid-static-link.patch +++ b/src/openal-2-guid-static-link.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from: diff --git a/src/openal-test.c b/src/openal-test.c index 59f08cd..d8d0c47 100644 --- a/src/openal-test.c +++ b/src/openal-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <AL/alc.h> @@ -18,4 +18,4 @@ int main(int argc, char **argv) alcCloseDevice(dev); return 0; -}
\ No newline at end of file +} diff --git a/src/openal.mk b/src/openal.mk index 60522c2..8141089 100644 --- a/src/openal.mk +++ b/src/openal.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # openal diff --git a/src/opencore-amr.mk b/src/opencore-amr.mk index 418f7f1..baa5cfc 100644 --- a/src/opencore-amr.mk +++ b/src/opencore-amr.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # opencore-amr diff --git a/src/opencsg-1-fixes.patch b/src/opencsg-1-fixes.patch index 02c8a83..134b340 100644 --- a/src/opencsg-1-fixes.patch +++ b/src/opencsg-1-fixes.patch @@ -1,12 +1,12 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 71c4f0a34399fd74d4e39f9985a4c2c56f8b9a43 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Sat, 22 Oct 2011 01:29:03 +0200 -Subject: [PATCH] configure for mingw-cross-env +Subject: [PATCH] configure for MXE diff --git a/example/example.pro b/example/example.pro diff --git a/src/opencsg.mk b/src/opencsg.mk index 317e10c..2c8ec53 100644 --- a/src/opencsg.mk +++ b/src/opencsg.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # opencsg diff --git a/src/openexr-1-disable-zlib_winapi.patch b/src/openexr-1-disable-zlib_winapi.patch index 2eb6049..0bf87d8 100644 --- a/src/openexr-1-disable-zlib_winapi.patch +++ b/src/openexr-1-disable-zlib_winapi.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -urN a/IlmImf/ImfPxr24Compressor.cpp b/IlmImf/ImfPxr24Compressor.cpp diff --git a/src/openexr.mk b/src/openexr.mk index ba44332..e0c4441 100644 --- a/src/openexr.mk +++ b/src/openexr.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # OpenEXR diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk index e99c003..eb64686 100644 --- a/src/openscenegraph.mk +++ b/src/openscenegraph.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # OpenSceneGraph diff --git a/src/openssl-1-winsock2.patch b/src/openssl-1-winsock2.patch index 344f5c6..847ebea 100644 --- a/src/openssl-1-winsock2.patch +++ b/src/openssl-1-winsock2.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from: diff --git a/src/openssl.mk b/src/openssl.mk index f6cc8fe..9eb5c0d 100644 --- a/src/openssl.mk +++ b/src/openssl.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # openssl diff --git a/src/pango-1-fixes.patch b/src/pango-1-fixes.patch index 8292e84..95f6dd5 100644 --- a/src/pango-1-fixes.patch +++ b/src/pango-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 987d02305fd8187bd10bfd292db38f7da705a7f3 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Wed, 29 Sep 2010 00:52:59 +0200 Subject: [PATCH 1/4] s,DllMain,static _disabled_DllMain, @@ -33,7 +33,7 @@ index 44ec353..72e13f1 100644 From f0c5d358e54fd9d69133eeff972fdb05592789f3 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Wed, 29 Sep 2010 00:55:07 +0200 Subject: [PATCH 2/4] static, not shared @@ -134,7 +134,7 @@ index fb173ce..beb3290 100755 From 08292532296e3a0f135f6bcd683851d2f41836c6 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Wed, 29 Sep 2010 00:57:12 +0200 Subject: [PATCH 3/4] no pango-querymodules @@ -157,7 +157,7 @@ index 49813f7..afc29c5 100644 From c646ee7869c20a1e093f63ec8de8e83e7ca88b27 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Wed, 29 Sep 2010 00:50:08 +0200 Subject: [PATCH 4/4] add missing lib to pango.pc for static linking diff --git a/src/pango.mk b/src/pango.mk index 3340523..ae79108 100644 --- a/src/pango.mk +++ b/src/pango.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Pango diff --git a/src/pangomm.mk b/src/pangomm.mk index 919c707..b94455e 100644 --- a/src/pangomm.mk +++ b/src/pangomm.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Pangomm diff --git a/src/pcre.mk b/src/pcre.mk index 4f4d41a..1735907 100644 --- a/src/pcre.mk +++ b/src/pcre.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # PCRE diff --git a/src/pdcurses.mk b/src/pdcurses.mk index d8bc947..4251169 100644 --- a/src/pdcurses.mk +++ b/src/pdcurses.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # PDcurses diff --git a/src/pdflib_lite-1-mingw.patch b/src/pdflib_lite-1-mingw.patch index 16484c3..d28ca0a 100644 --- a/src/pdflib_lite-1-mingw.patch +++ b/src/pdflib_lite-1-mingw.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from: diff --git a/src/pdflib_lite.mk b/src/pdflib_lite.mk index b6383e6..770a270 100644 --- a/src/pdflib_lite.mk +++ b/src/pdflib_lite.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # PDFlib Lite diff --git a/src/pfstools.mk b/src/pfstools.mk index 74551c9..c63c3e4 100644 --- a/src/pfstools.mk +++ b/src/pfstools.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # pfstools diff --git a/src/physfs-1-fix-gcc46-warnings.patch b/src/physfs-1-fix-gcc46-warnings.patch index adf92b7..0de991e 100644 --- a/src/physfs-1-fix-gcc46-warnings.patch +++ b/src/physfs-1-fix-gcc46-warnings.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from: diff --git a/src/physfs-test.c b/src/physfs-test.c index 34e582d..1ca1fc0 100644 --- a/src/physfs-test.c +++ b/src/physfs-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ /* modified from test/physfs_test.c */ diff --git a/src/physfs.mk b/src/physfs.mk index 09ba205..1003015 100644 --- a/src/physfs.mk +++ b/src/physfs.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # physfs diff --git a/src/pixman.mk b/src/pixman.mk index dc1c48a..cdeac51 100644 --- a/src/pixman.mk +++ b/src/pixman.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # pixman diff --git a/src/plotmm-1-fixes.patch b/src/plotmm-1-fixes.patch index 2ec0c08..93cb2f0 100644 --- a/src/plotmm-1-fixes.patch +++ b/src/plotmm-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From cd2b1b4a0ae81dddd3fa70c06528a7024ada7a5f Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 1 Oct 2010 12:54:06 +0200 Subject: [PATCH] SigC changed to sigc diff --git a/src/plotmm.mk b/src/plotmm.mk index 3fd06fe..98623c9 100644 --- a/src/plotmm.mk +++ b/src/plotmm.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # PlotMM diff --git a/src/plotutils-2.6-libpng-1.5.patch b/src/plotutils-2.6-libpng-1.5.patch index 01a85eb..63d1c3f 100644 --- a/src/plotutils-2.6-libpng-1.5.patch +++ b/src/plotutils-2.6-libpng-1.5.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch diff --git a/src/plotutils.mk b/src/plotutils.mk index faf0066..20caa4d 100644 --- a/src/plotutils.mk +++ b/src/plotutils.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # plotutils diff --git a/src/poco-1-fix-mno-cygwin.patch b/src/poco-1-fix-mno-cygwin.patch index 75b63af..1fe1c92 100644 --- a/src/poco-1-fix-mno-cygwin.patch +++ b/src/poco-1-fix-mno-cygwin.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. --- a/build/config/MinGW-CrossEnv diff --git a/src/poco-test.cpp b/src/poco-test.cpp index 7d98dcc..caed18b 100644 --- a/src/poco-test.cpp +++ b/src/poco-test.cpp @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <iostream> diff --git a/src/poco.mk b/src/poco.mk index 156d8c7..01e5a30 100644 --- a/src/poco.mk +++ b/src/poco.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # POCO C++ Libraries diff --git a/src/popt-1-win32.patch b/src/popt-1-win32.patch index 6a438a8..0207ce1 100644 --- a/src/popt-1-win32.patch +++ b/src/popt-1-win32.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -urN a/popt.c b/popt.c diff --git a/src/popt.mk b/src/popt.mk index b21c3d2..70be422 100644 --- a/src/popt.mk +++ b/src/popt.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # popt diff --git a/src/portaudio-1-win32.patch b/src/portaudio-1-win32.patch index a6f359f..827d060 100644 --- a/src/portaudio-1-win32.patch +++ b/src/portaudio-1-win32.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -ru portaudio-orig/configure.in portaudio/configure.in diff --git a/src/portaudio-test.c b/src/portaudio-test.c index 16d6dd0..872ef1a 100644 --- a/src/portaudio-test.c +++ b/src/portaudio-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <portaudio.h> diff --git a/src/portaudio.mk b/src/portaudio.mk index c3f7c16..f472671 100644 --- a/src/portaudio.mk +++ b/src/portaudio.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # portaudio diff --git a/src/postgresql-1-fixes.patch b/src/postgresql-1-fixes.patch index 24cc329..e360ece 100644 --- a/src/postgresql-1-fixes.patch +++ b/src/postgresql-1-fixes.patch @@ -1,12 +1,12 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 7985f049ed030c1f49927828a4b8e3d7552e52a4 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 24 Oct 2011 14:02:33 +0200 -Subject: [PATCH 1/2] use unix style names for openssl on mingw-cross-env +Subject: [PATCH 1/2] use unix style names for openssl on MXE diff --git a/configure.in b/configure.in @@ -34,7 +34,7 @@ index 7c0e94e..2ee79c7 100644 From 9471812a4e7021fea291469d636bdeca6078c1e5 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 24 Oct 2011 14:09:38 +0200 Subject: [PATCH 2/2] do not check autoconf version diff --git a/src/postgresql.mk b/src/postgresql.mk index bf31c5f..7c55bb4 100644 --- a/src/postgresql.mk +++ b/src/postgresql.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # PostgreSQL diff --git a/src/proj.mk b/src/proj.mk index 4567811..fe64d14 100644 --- a/src/proj.mk +++ b/src/proj.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # proj diff --git a/src/pthreads-1-autostatic.patch b/src/pthreads-1-autostatic.patch index 2f64c2c..a0dc600 100644 --- a/src/pthreads-1-autostatic.patch +++ b/src/pthreads-1-autostatic.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from: diff --git a/src/pthreads-test.c b/src/pthreads-test.c index 88d3378..1072713 100644 --- a/src/pthreads-test.c +++ b/src/pthreads-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdio.h> diff --git a/src/pthreads.mk b/src/pthreads.mk index 4c62ed8..2b00ce7 100644 --- a/src/pthreads.mk +++ b/src/pthreads.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Pthreads-w32 diff --git a/src/qjson-1-static.patch b/src/qjson-1-static.patch index 8a326e1..7b682e8 100644 --- a/src/qjson-1-static.patch +++ b/src/qjson-1-static.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch taken from: diff --git a/src/qjson.mk b/src/qjson.mk index 9a9c88d..2a155a4 100644 --- a/src/qjson.mk +++ b/src/qjson.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. PKG := qjson diff --git a/src/qt-1-cherrypicks.patch b/src/qt-1-cherrypicks.patch index 37659a5..7ef833b 100644 --- a/src/qt-1-cherrypicks.patch +++ b/src/qt-1-cherrypicks.patch @@ -1,9 +1,9 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Commits backported (cherry-picked) from upstream branch or merge requests. http://qt.gitorious.org/qt -Also contains mingw-cross-env specific fixes. +Also contains MXE specific fixes. From a140e010a213e993f8edf379a7d42c32bc61a672 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> @@ -80757,7 +80757,7 @@ index dea05e0..12cd8ea 100644 From 6162902afd0bf5f18d87bdbec16b19dc250d1ebc Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 3 Nov 2011 15:10:26 +0100 -Subject: [PATCH 13/19] use pkg-config for libmng (mingw-cross-env specific) +Subject: [PATCH 13/19] use pkg-config for libmng (MXE specific) --- src/gui/image/qmnghandler.pri | 4 +++- @@ -80785,8 +80785,7 @@ index ffb98de..6aab68f 100644 From 85c260ba643defd31292d4cc26ee377161d6092a Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 3 Nov 2011 14:11:02 +0100 -Subject: [PATCH 14/19] use pkg-config for libtiff-4 (mingw-cross-env - specific) +Subject: [PATCH 14/19] use pkg-config for libtiff-4 (MXE specific) --- src/gui/image/qtiffhandler.pri | 4 +++- @@ -80815,7 +80814,7 @@ From 38b30f61ac37b13372408308796dc92360d7752c Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sat, 5 Jun 2010 23:41:04 +0200 Subject: [PATCH 15/19] restore support for static linking of QtWebKit - (mingw-cross-env specific) + (MXE specific) Support was removed by 4221d629e2cf37ee8c5ba7cb595b05ab8c82f113. @@ -80942,7 +80941,7 @@ From aca717c3ed2b0a63f88ad7ad0a4d944d3ca643d3 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Thu, 1 Sep 2011 13:49:47 +0200 Subject: [PATCH 17/19] fix missing platform when building on GNU/kFreeBSD - (mingw-cross-env specific) + (MXE specific) This patch is inspired by: http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qt4-x11.git;a=blob;f=debian/rules;h=47e5efbf09f77e6da51a3d719d2f6be47f69d096;hb=HEAD @@ -80973,7 +80972,7 @@ index 222308e..7b52179 100755 From c309d3adb75c75a2e47ce5fda1ec3016e336b84b Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Thu, 1 Sep 2011 13:51:50 +0200 -Subject: [PATCH 18/19] fix building on dragonfly (mingw-cross-env specific) +Subject: [PATCH 18/19] fix building on dragonfly (MXE specific) This patch is inspired by: http://cvsweb.NetBSD.org/bsdweb.cgi/pkgsrc/x11/qt4-libs/Makefile.common?rev=1.27&content-type=text/x-cvsweb-markup diff --git a/src/qt-test.cpp b/src/qt-test.cpp index 5b4790f..de15e01 100644 --- a/src/qt-test.cpp +++ b/src/qt-test.cpp @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <QApplication> diff --git a/src/qt-test.pro b/src/qt-test.pro index f22e4ed..55237b8 100644 --- a/src/qt-test.pro +++ b/src/qt-test.pro @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. TARGET = test-qt diff --git a/src/qt-test.ui b/src/qt-test.ui index b185db9..26ba03a 100644 --- a/src/qt-test.ui +++ b/src/qt-test.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- This file is part of mingw-cross-env. --> +<!-- This file is part of MXE. --> <!-- See doc/index.html for further information. --> <ui version="4.0"> @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Qt diff --git a/src/qwtplot3d-1-fixes.patch b/src/qwtplot3d-1-fixes.patch index 0adb381..fdd434b 100644 --- a/src/qwtplot3d-1-fixes.patch +++ b/src/qwtplot3d-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 0ee512abc5ac926ebe37ea50ecac9c314efd8f53 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 20 Oct 2011 21:05:36 +0200 Subject: [PATCH 1/4] add missing #include <cstdio> @@ -23,7 +23,7 @@ index 28d874e..72f93a9 100644 From 252126201db746fd5772e0ac201d7975aa705236 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 20 Oct 2011 21:06:42 +0200 Subject: [PATCH 2/4] add missing #include <GL/glu.h> @@ -44,9 +44,9 @@ index e5499c2..48052ae 100644 From ac2860d954caeac6ce7701a0ee196e1533bc047e Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 20 Oct 2011 21:22:24 +0200 -Subject: [PATCH 3/4] configure project for mingw-cross-env +Subject: [PATCH 3/4] configure project for MXE diff --git a/qwtplot3d.pro b/qwtplot3d.pro @@ -84,9 +84,9 @@ index d4fa0c1..94f92ee 100644 From 6a316d1844a2634ebc4374e1e9d01502204d8c7e Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 20 Oct 2011 21:47:18 +0200 -Subject: [PATCH 4/4] fix building examples for mingw-cross-env +Subject: [PATCH 4/4] fix building examples for MXE diff --git a/examples/common.pro b/examples/common.pro diff --git a/src/qwtplot3d.mk b/src/qwtplot3d.mk index c996fa0..cb4d7a4 100644 --- a/src/qwtplot3d.mk +++ b/src/qwtplot3d.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. PKG := qwtplot3d diff --git a/src/readline.mk b/src/readline.mk index 8cec931..8c29e7d 100644 --- a/src/readline.mk +++ b/src/readline.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Readline diff --git a/src/sdl-test.c b/src/sdl-test.c index 0ebf4ee..8642d91 100644 --- a/src/sdl-test.c +++ b/src/sdl-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <SDL.h> @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # SDL diff --git a/src/sdl_image-test.c b/src/sdl_image-test.c index 59b9d44..e219f3c 100644 --- a/src/sdl_image-test.c +++ b/src/sdl_image-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <SDL.h> diff --git a/src/sdl_image.mk b/src/sdl_image.mk index 422e7eb..27465c8 100644 --- a/src/sdl_image.mk +++ b/src/sdl_image.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # SDL_image diff --git a/src/sdl_mixer-test.c b/src/sdl_mixer-test.c index 02b9306..902fa10 100644 --- a/src/sdl_mixer-test.c +++ b/src/sdl_mixer-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <SDL_mixer.h> diff --git a/src/sdl_mixer.mk b/src/sdl_mixer.mk index 095fa7b..106a06e 100644 --- a/src/sdl_mixer.mk +++ b/src/sdl_mixer.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # SDL_mixer diff --git a/src/sdl_net-1-fixes.patch b/src/sdl_net-1-fixes.patch index 9e3a09d..3d95ce4 100644 --- a/src/sdl_net-1-fixes.patch +++ b/src/sdl_net-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 50ebb3d0a7e28fa3e85dff386cde7a6315865e76 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 27 Feb 2012 14:41:08 +0100 Subject: [PATCH] add static dependency to .pc file diff --git a/src/sdl_net-test.c b/src/sdl_net-test.c index f3a2e08..24c4753 100644 --- a/src/sdl_net-test.c +++ b/src/sdl_net-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <SDL_net.h> diff --git a/src/sdl_net.mk b/src/sdl_net.mk index acb9248..7ac87f4 100644 --- a/src/sdl_net.mk +++ b/src/sdl_net.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # SDL_net diff --git a/src/sdl_pango-1-api-adds.patch b/src/sdl_pango-1-api-adds.patch index 6caf1cd..9f0990c 100644 --- a/src/sdl_pango-1-api-adds.patch +++ b/src/sdl_pango-1-api-adds.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from: diff --git a/src/sdl_pango-2-static-matrices.patch b/src/sdl_pango-2-static-matrices.patch index 57cb6c1..feea09b 100644 --- a/src/sdl_pango-2-static-matrices.patch +++ b/src/sdl_pango-2-static-matrices.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. --- SDL_Pango-0.1.2.orig/src/SDL_Pango.h 2010-04-08 11:33:48.000000000 +0200 diff --git a/src/sdl_pango.mk b/src/sdl_pango.mk index 992f186..ccc6033 100644 --- a/src/sdl_pango.mk +++ b/src/sdl_pango.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # SDL_Pango diff --git a/src/sdl_sound.mk b/src/sdl_sound.mk index 92e8a46..2146907 100644 --- a/src/sdl_sound.mk +++ b/src/sdl_sound.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # SDL_sound diff --git a/src/sdl_ttf.mk b/src/sdl_ttf.mk index 58ef79a..784ea04 100644 --- a/src/sdl_ttf.mk +++ b/src/sdl_ttf.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # SDL_ttf diff --git a/src/smpeg-test.c b/src/smpeg-test.c index 787b212..348f666 100644 --- a/src/smpeg-test.c +++ b/src/smpeg-test.c @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <smpeg.h> diff --git a/src/smpeg.mk b/src/smpeg.mk index 624a2bc..79727d8 100644 --- a/src/smpeg.mk +++ b/src/smpeg.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # smpeg diff --git a/src/speex.mk b/src/speex.mk index ce053fa..d8dba43 100644 --- a/src/speex.mk +++ b/src/speex.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Speex diff --git a/src/sqlite.mk b/src/sqlite.mk index 33ef39e..3ca87b8 100644 --- a/src/sqlite.mk +++ b/src/sqlite.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # SQLite diff --git a/src/suitesparse.mk b/src/suitesparse.mk index aab0c78..11f4c09 100644 --- a/src/suitesparse.mk +++ b/src/suitesparse.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # SuiteSparse diff --git a/src/t4k_common.mk b/src/t4k_common.mk index 0816b1b..7737302 100644 --- a/src/t4k_common.mk +++ b/src/t4k_common.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # t4k_common diff --git a/src/taglib-1-static.patch b/src/taglib-1-static.patch index 8ad518b..0766147 100644 --- a/src/taglib-1-static.patch +++ b/src/taglib-1-static.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from: diff --git a/src/taglib.mk b/src/taglib.mk index 11462a4..f396eb3 100644 --- a/src/taglib.mk +++ b/src/taglib.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # TagLib diff --git a/src/theora.mk b/src/theora.mk index 5e80794..badca23 100644 --- a/src/theora.mk +++ b/src/theora.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Theora diff --git a/src/tiff.mk b/src/tiff.mk index 92ba985..473cec5 100644 --- a/src/tiff.mk +++ b/src/tiff.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # LibTIFF diff --git a/src/tinyxml-test.cpp b/src/tinyxml-test.cpp index 4cf444f..9508016 100644 --- a/src/tinyxml-test.cpp +++ b/src/tinyxml-test.cpp @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <iostream> diff --git a/src/tinyxml.mk b/src/tinyxml.mk index 089c142..e7a4454 100644 --- a/src/tinyxml.mk +++ b/src/tinyxml.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # tinyxml @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # TRE diff --git a/src/vigra-test.cpp b/src/vigra-test.cpp index 7c7c95b..032b83a 100644 --- a/src/vigra-test.cpp +++ b/src/vigra-test.cpp @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <string> diff --git a/src/vigra.mk b/src/vigra.mk index 3243e3d..a4534b9 100644 --- a/src/vigra.mk +++ b/src/vigra.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # vigra diff --git a/src/vmime-1-fixes.patch b/src/vmime-1-fixes.patch index e0da2b4..649fa07 100644 --- a/src/vmime-1-fixes.patch +++ b/src/vmime-1-fixes.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Cherry picked fixes from svn @@ -9,7 +9,7 @@ Produced with this script: #!/usr/bin/env bash ( - echo "This file is part of mingw-cross-env." + echo "This file is part of MXE." echo "See doc/index.html for further information." echo echo "Cherry picked fixes from svn" @@ -569,7 +569,7 @@ index df2bf85..b129913 100644 From 22ca7dc23b6bbbc8cc6aedd569ec938ecae96e92 Mon Sep 17 00:00:00 2001 From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009> Date: Sun, 27 Mar 2011 11:26:55 +0000 -Subject: [PATCH 10/27] Allow static linking in mingw-cross-env. Added 'iconv' +Subject: [PATCH 10/27] Allow static linking in MXE. Added 'iconv' and uses 'ws2_32' instead of 'winsock32' (#3213487). git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@585 5301114d-f842-0410-bbdd-996ee0417009 diff --git a/src/vmime.mk b/src/vmime.mk index 79212f8..7f59937 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # VMime diff --git a/src/vorbis.mk b/src/vorbis.mk index d955261..72899c1 100644 --- a/src/vorbis.mk +++ b/src/vorbis.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Vorbis diff --git a/src/vtk-1-tryrun.patch b/src/vtk-1-tryrun.patch index 5de3ab3..6ddbfa7 100644 --- a/src/vtk-1-tryrun.patch +++ b/src/vtk-1-tryrun.patch @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. --- blubb 1970-01-01 01:00:00.000000000 +0100 diff --git a/src/vtk-2-findfreetype.patch b/src/vtk-2-findfreetype.patch index 560c4ea..1cdf609 100644 --- a/src/vtk-2-findfreetype.patch +++ b/src/vtk-2-findfreetype.patch @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. This patch has been taken from: diff --git a/src/vtk-3-compile-tools.patch b/src/vtk-3-compile-tools.patch index ea4d07e..3da4eb8 100644 --- a/src/vtk-3-compile-tools.patch +++ b/src/vtk-3-compile-tools.patch @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. This patch has been taken from: diff --git a/src/vtk-4-native-no-gui.patch b/src/vtk-4-native-no-gui.patch index 247dcbd..3c0641b 100644 --- a/src/vtk-4-native-no-gui.patch +++ b/src/vtk-4-native-no-gui.patch @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. diff -r 26cf498f1dac Utilities/CMakeLists.txt diff --git a/src/vtk-5-module-path.patch b/src/vtk-5-module-path.patch index 8c40412..8866d8a 100644 --- a/src/vtk-5-module-path.patch +++ b/src/vtk-5-module-path.patch @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. This patch has been taken from: diff --git a/src/vtk-6-kfreebsd.patch b/src/vtk-6-kfreebsd.patch index af95fd0..934dc79 100644 --- a/src/vtk-6-kfreebsd.patch +++ b/src/vtk-6-kfreebsd.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -ur VTK.orig/Utilities/vtkhdf5/src/H5private.h VTK/Utilities/vtkhdf5/src/H5private.h @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # vtk diff --git a/src/w32api-1-dinput-dsound.patch b/src/w32api-1-dinput-dsound.patch index ee195ea..3ebf9ba 100644 --- a/src/w32api-1-dinput-dsound.patch +++ b/src/w32api-1-dinput-dsound.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch contains some DirectX additions for MinGW's w32api diff --git a/src/w32api-2-directx-additions-for-qt.patch b/src/w32api-2-directx-additions-for-qt.patch index 262632a..8418b28 100644 --- a/src/w32api-2-directx-additions-for-qt.patch +++ b/src/w32api-2-directx-additions-for-qt.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch contains some DirectX additions for MinGW's w32api diff --git a/src/w32api.mk b/src/w32api.mk index 6e64c9f..1a1b34a 100644 --- a/src/w32api.mk +++ b/src/w32api.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # MinGW Windows API diff --git a/src/winpcap-1-fixes.patch b/src/winpcap-1-fixes.patch index 7f79bf7..3c75299 100644 --- a/src/winpcap-1-fixes.patch +++ b/src/winpcap-1-fixes.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. diff --git a/src/winpcap.mk b/src/winpcap.mk index 968f5e7..448484f 100644 --- a/src/winpcap.mk +++ b/src/winpcap.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # WinPcap diff --git a/src/wt-1-fixes.patch b/src/wt-1-fixes.patch index 53d6c6a..e41597b 100644 --- a/src/wt-1-fixes.patch +++ b/src/wt-1-fixes.patch @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. diff -ur a/cmake/WtFindBoost-vintage.txt b/cmake/WtFindBoost-vintage.txt @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Wt diff --git a/src/wxwidgets-test.cpp b/src/wxwidgets-test.cpp index 714f917..3423d3b 100644 --- a/src/wxwidgets-test.cpp +++ b/src/wxwidgets-test.cpp @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <wx/wx.h> diff --git a/src/wxwidgets.mk b/src/wxwidgets.mk index dbfb805..3156ee8 100644 --- a/src/wxwidgets.mk +++ b/src/wxwidgets.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # wxWidgets diff --git a/src/x264-1-fix-bin-bash.patch b/src/x264-1-fix-bin-bash.patch index fa5b7e7..059ba98 100644 --- a/src/x264-1-fix-bin-bash.patch +++ b/src/x264-1-fix-bin-bash.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -urN x264-snapshot-20100714-2245/configure x264-snapshot-20100714-2245.new/configure diff --git a/src/x264.mk b/src/x264.mk index d11d2bc..761b698 100644 --- a/src/x264.mk +++ b/src/x264.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # x264 diff --git a/src/xerces-1-fix-pkgconfig.patch b/src/xerces-1-fix-pkgconfig.patch index db07d02..d13a7f5 100644 --- a/src/xerces-1-fix-pkgconfig.patch +++ b/src/xerces-1-fix-pkgconfig.patch @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. This patch has been taken from: diff --git a/src/xerces-test.cpp b/src/xerces-test.cpp index feba8d3..5348b9c 100644 --- a/src/xerces-test.cpp +++ b/src/xerces-test.cpp @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <xercesc/parsers/SAXParser.hpp> diff --git a/src/xerces.mk b/src/xerces.mk index eda448e..2d56558 100644 --- a/src/xerces.mk +++ b/src/xerces.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Xerces-C++ diff --git a/src/xine-lib-1-fixes.patch b/src/xine-lib-1-fixes.patch index f26ec8b..aa10ab9 100644 --- a/src/xine-lib-1-fixes.patch +++ b/src/xine-lib-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 4968ed3c3300976ce8b24c52c729db6bd264057c Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Sun, 13 Nov 2011 11:48:07 +0100 Subject: [PATCH 1/4] fix-install-def-file @@ -48,7 +48,7 @@ index 167a32b..0664e1f 100644 From 86f2d23f9229e17aa4a54ca982b8f95de5ee4644 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Sun, 13 Nov 2011 12:05:22 +0100 Subject: [PATCH 2/4] fake missing definitions for WIN32 @@ -83,7 +83,7 @@ index 802461e..8b9b704 100644 From 42946ec1f900d22b62cb28996b9f12d11d7be7a8 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Sun, 13 Nov 2011 13:45:21 +0100 Subject: [PATCH 3/4] force graphicsmagick over imagemagick @@ -120,7 +120,7 @@ index b175301..d37ba36 100644 From f0fa8b5b9570cdf88788067b1a76669c6863ac9f Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 30 Jan 2012 09:21:33 +0100 Subject: [PATCH 4/4] zlib 1.2.6 compatibility diff --git a/src/xine-lib.mk b/src/xine-lib.mk index 5d72920..cea25b5 100644 --- a/src/xine-lib.mk +++ b/src/xine-lib.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # xine-lib diff --git a/src/xmlwrapp.mk b/src/xmlwrapp.mk index f45301c..15484bd 100644 --- a/src/xmlwrapp.mk +++ b/src/xmlwrapp.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # xmlwrapp diff --git a/src/xvidcore-1-fixes.patch b/src/xvidcore-1-fixes.patch index b0d6f1d..6af9427 100644 --- a/src/xvidcore-1-fixes.patch +++ b/src/xvidcore-1-fixes.patch @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From dce4564d204160aee0da5107e69cbdefe2bec921 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 28 Mar 2011 00:00:51 +0200 Subject: [PATCH] remove obsolete -mno-cygwin diff --git a/src/xvidcore.mk b/src/xvidcore.mk index b5d181b..5bd691e 100644 --- a/src/xvidcore.mk +++ b/src/xvidcore.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # xvidcore @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # XZ diff --git a/src/zlib-1-win32-static.patch b/src/zlib-1-win32-static.patch index d8019d9..0f2178b 100644 --- a/src/zlib-1-win32-static.patch +++ b/src/zlib-1-win32-static.patch @@ -1,12 +1,12 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From dfe5701faf3683be7ea53885c58d4bd3499c4d1c Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Sun, 29 Jan 2012 21:51:03 +0100 -Subject: [PATCH] workarounds for mingw-cross-env +Subject: [PATCH] workarounds for MXE diff --git a/Makefile.in b/Makefile.in diff --git a/src/zlib.mk b/src/zlib.mk index 1623cee..0f704f0 100644 --- a/src/zlib.mk +++ b/src/zlib.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # zlib diff --git a/src/zziplib-1-fix-fnmatch.patch b/src/zziplib-1-fix-fnmatch.patch index b567552..e755515 100644 --- a/src/zziplib-1-fix-fnmatch.patch +++ b/src/zziplib-1-fix-fnmatch.patch @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from: diff --git a/src/zziplib.mk b/src/zziplib.mk index 74ab911..c2c4f38 100644 --- a/src/zziplib.mk +++ b/src/zziplib.mk @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # ZZIPlib diff --git a/tools/patch-tool-mingw b/tools/patch-tool-mxe index bebe0fe..342380f 100755 --- a/tools/patch-tool-mingw +++ b/tools/patch-tool-mxe @@ -1,13 +1,13 @@ #!/bin/bash -# Tool for converting between mingw-cross-env patch files and git repos +# Tool for converting between MXE patch files and git repos # Imports and exports patch files in "git format-patch" format. cmd=$1 pkg=$2 -# mingw-cross-env directory -mcedir=~/mingw-cross-env +# MXE directory +mxedir=~/mxe # directory for unpacked tarballs/git repos gitsdir=~/gits @@ -16,18 +16,18 @@ gitsdir=~/gits # John Doe <John Doe@acme.org> author=`git var GIT_AUTHOR_IDENT | sed 's/^\(.* [<].*[>]\).*$/\1/'` -pkg_version=`grep '^$(PKG)_VERSION' $mcedir/src/$pkg.mk | \ +pkg_version=`grep '^$(PKG)_VERSION' $mxedir/src/$pkg.mk | \ sed 's/.*:= \(.*\)/\1/'` pkg_short_version=`echo $pkg_version | sed s/'\(.*\)\.[^.]*$'/'\1'/` -pkg_subdir=`grep '^$(PKG)_SUBDIR' $mcedir/src/$pkg.mk | \ +pkg_subdir=`grep '^$(PKG)_SUBDIR' $mxedir/src/$pkg.mk | \ sed 's/.*:= \(.*\)/\1/' | \ sed s/'$($(PKG)_VERSION)'/$pkg_version/ | \ sed s/'$(call SHORT_PKG_VERSION,$(PKG))'/$pkg_short_version/ | \ sed s/'$(PKG)'/$pkg/;` -pkg_file=`grep '^$(PKG)_FILE' $mcedir/src/$pkg.mk | \ +pkg_file=`grep '^$(PKG)_FILE' $mxedir/src/$pkg.mk | \ sed 's/.*:= \(.*\)/\1/' | \ sed s/'$($(PKG)_VERSION)'/$pkg_version/ | \ sed s/'$(call SHORT_PKG_VERSION,$(PKG))'/$pkg_short_version/ | \ @@ -42,10 +42,10 @@ pkg_file=`grep '^$(PKG)_FILE' $mcedir/src/$pkg.mk | \ # init function init_git { cd $gitsdir - echo $pkg_file | grep "\.tar\.gz" >> /dev/null && tar xf $mcedir/pkg/$pkg_file - echo $pkg_file | grep "\.tar\.bz2" >> /dev/null && tar xf $mcedir/pkg/$pkg_file - echo $pkg_file | grep "\.tar\.xz" >> /dev/null && xz -dc $mcedir/pkg/$pkg_file | tar xf - - echo $pkg_file | grep "\.zip" >> /dev/null && unzip $mcedir/pkg/$pkg_file >> /dev/null + echo $pkg_file | grep "\.tar\.gz" >> /dev/null && tar xf $mxedir/pkg/$pkg_file + echo $pkg_file | grep "\.tar\.bz2" >> /dev/null && tar xf $mxedir/pkg/$pkg_file + echo $pkg_file | grep "\.tar\.xz" >> /dev/null && xz -dc $mxedir/pkg/$pkg_file | tar xf - + echo $pkg_file | grep "\.zip" >> /dev/null && unzip $mxedir/pkg/$pkg_file >> /dev/null cd $gitsdir/$pkg_subdir && \ (git init; git add -A; git commit -m "init") > /dev/null git tag dist @@ -54,19 +54,19 @@ function init_git { function export_patch { cd $gitsdir/$pkg_subdir && \ ( - echo 'This file is part of mingw-cross-env.' + echo 'This file is part of MXE.' echo 'See doc/index.html for further information.' echo '' echo 'Contains ad hoc patches for cross building.' echo '' git format-patch -p --stdout dist..HEAD | \ - sed 's/^From: .*/From: mingw-cross-env/g;' - ) > $mcedir/src/$pkg-1-fixes.patch + sed 's/^From: .*/From: MXE/g;' + ) > $mxedir/src/$pkg-1-fixes.patch } function import_patch { cd $gitsdir/$pkg_subdir && \ - cat $mcedir/src/$pkg-1-fixes.patch | \ + cat $mxedir/src/$pkg-1-fixes.patch | \ sed '/^From/,$ !d' | \ sed s/'^From: .*'/"From: $author"/'g;' | \ git am --keep-cr |