Merge branch 'master' of https://github.com/mgerhardy/mxe into mgerhardy-master

Conflicts:
	index.html
This commit is contained in:
Martin Gerhardy 2013-07-19 20:27:15 +02:00
commit 9c4386e2f7
8 changed files with 265 additions and 0 deletions

View File

@ -2218,11 +2218,41 @@ USE_OSGPLUGIN(<plugin2>)
<td id="sfml-version">2.0</td>
<td id="sfml-website"><a href="http://www.sfml-dev.org/">SFML</a></td>
</tr>
<tr>
<td id="sdl2-package">sdl2</td>
<td id="sdl2-version">2.0.0</td>
<td id="sdl2-website"><a href="http://www.libsdl.org/">SDL2</a></td>
</tr>
<tr>
<td id="sdl2_image-package">sdl2_image</td>
<td id="sdl2_image-version">2.0.0</td>
<td id="sdl2_image-website"><a href="http://www.libsdl.org/">SDL2_image</a></td>
</tr>
<tr>
<td id="sdl2_mixer-package">sdl2_mixer</td>
<td id="sdl2_mixer-version">2.0.0</td>
<td id="sdl2_mixer-website"><a href="http://www.libsdl.org/">SDL2_mixer</a></td>
</tr>
<tr>
<td id="sdl2_net-package">sdl2_net</td>
<td id="sdl2_net-version">2.0.0</td>
<td id="sdl2_net-website"><a href="http://www.libsdl.org/">sdl2_net</a></td>
</tr>
<tr>
<td id="sdl2_ttf-package">sdl2_ttf</td>
<td id="sdl2_ttf-version">2.0.12</td>
<td id="sdl2_ttf-website"><a href="http://www.libsdl.org/">SDL2_ttf</a></td>
</tr>
<tr>
<td id="smpeg-package">smpeg</td>
<td id="smpeg-version">0.4.5+cvs20030824</td>
<td id="smpeg-website"><a href="http://icculus.org/smpeg/">smpeg</a></td>
</tr>
<tr>
<td id="smpeg2-package">smpeg2</td>
<td id="smpeg2-version">2.0.0</td>
<td id="smpeg2-website"><a href="http://icculus.org/smpeg/">smpeg</a></td>
</tr>
<tr>
<td id="sox-package">sox</td>
<td id="sox-version">14.4.1</td>

35
src/sdl2.mk Normal file
View File

@ -0,0 +1,35 @@
# This file is part of MXE.
# See index.html for further information.
PKG := sdl2
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := ff1853d589ad2974e43154e977ed554f71a5a9d2
$(PKG)_SUBDIR := SDL2-$($(PKG)_VERSION)
$(PKG)_FILE := SDL2-$($(PKG)_VERSION).tar.gz
#$(PKG)_URL := http://www.libsdl.org/release/$($(PKG)_FILE)
$(PKG)_URL := http://www.libsdl.org/tmp/release/$($(PKG)_FILE)
$(PKG)_DEPS := gcc libiconv
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://hg.libsdl.org/SDL/tags' | \
$(SED) -n 's,.*release-\([0-9][^<]*\).*,\1,p' | \
head -1
endef
define $(PKG)_BUILD
$(SED) -i 's,-mwindows,-lwinmm -mwindows,' '$(1)/configure'
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
--enable-threads \
--enable-directx
$(SED) -i 's,defined(__MINGW64_VERSION_MAJOR),defined(__MINGW64_VERSION_MAJOR) \&\& defined(_WIN64),' '$(1)/include/SDL_cpuinfo.h'
$(SED) -i 's,-XCClinker,,' '$(1)/sdl2.pc'
$(SED) -i 's,-XCClinker,,' '$(1)/sdl2-config'
$(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
$(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
ln -sf '$(PREFIX)/$(TARGET)/bin/sdl2-config' '$(PREFIX)/bin/$(TARGET)-sdl2-config'
endef
$(PKG)_BUILD_i686-pc-mingw32 =

33
src/sdl2_image.mk Normal file
View File

@ -0,0 +1,33 @@
# This file is part of MXE.
# See index.html for further information.
PKG := sdl2_image
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := 3aed62467168799ed760511dfb3637e012e2dff8
$(PKG)_SUBDIR := SDL2_image-$($(PKG)_VERSION)
$(PKG)_FILE := SDL2_image-$($(PKG)_VERSION).tar.gz
#$(PKG)_URL := http://www.libsdl.org/projects/SDL_image/release/$($(PKG)_FILE)
$(PKG)_URL := http://www.libsdl.org/tmp/SDL_image/release/$($(PKG)_FILE)
$(PKG)_DEPS := gcc sdl2 jpeg libpng tiff
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://hg.libsdl.org/SDL_image/tags' | \
$(SED) -n 's,.*release-\([0-9][^<]*\).*,\1,p' | \
head -1
endef
define $(PKG)_BUILD
$(SED) -i 's,^\(Requires:.*\),\1 libtiff-4 libpng,' '$(1)/SDL2_image.pc.in'
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
--with-sdl-prefix='$(PREFIX)/$(TARGET)' \
--disable-sdltest \
--disable-jpg-shared \
--disable-webp-shared \
--disable-png-shared \
--disable-tif-shared \
LIBS='-lz'
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
endef

48
src/sdl2_mixer.mk Normal file
View File

@ -0,0 +1,48 @@
# This file is part of MXE.
# See index.html for further information.
PKG := sdl2_mixer
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := 7317e033989fee058bf8466ba9a4676f04391870
$(PKG)_SUBDIR := SDL2_mixer-$($(PKG)_VERSION)
$(PKG)_FILE := SDL2_mixer-$($(PKG)_VERSION).tar.gz
#$(PKG)_URL := http://www.libsdl.org/projects/SDL_mixer/release/$($(PKG)_FILE)
$(PKG)_URL := http://www.libsdl.org/tmp/SDL_mixer/release/$($(PKG)_FILE)
$(PKG)_DEPS := gcc sdl2 libmodplug ogg vorbis smpeg2
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://hg.libsdl.org/SDL_mixer/tags' | \
$(SED) -n 's,.*release-\([0-9][^<]*\).*,\1,p' | \
head -1
endef
define $(PKG)_BUILD
$(SED) -i 's,^\(Requires:.*\),\1 vorbisfile,' '$(1)/SDL2_mixer.pc.in'
echo \
'Libs.private:' \
"`$(TARGET)-pkg-config libmodplug --libs`" \
>> '$(1)/SDL2_mixer.pc.in'
$(SED) -i 's,for path in /usr/local; do,for path in; do,' '$(1)/configure'
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
--with-sdl-prefix='$(PREFIX)/$(TARGET)' \
--disable-sdltest \
--disable-music-mod \
--enable-music-mod-modplug \
--enable-music-ogg \
--disable-music-flac \
--enable-music-mp3 \
--disable-music-ogg-shared \
--disable-music-flac-shared \
--disable-smpegtest
WINDRES='$(TARGET)-windres' \
LIBS='-lvorbis -logg'
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
# '$(TARGET)-gcc' \
# -W -Wall -Werror -ansi -pedantic \
# '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl2_mixer.exe' \
# `'$(TARGET)-pkg-config' SDL2_mixer --cflags --libs`
endef

19
src/sdl2_net-test.c Normal file
View File

@ -0,0 +1,19 @@
/*
* This file is part of MXE.
* See index.html for further information.
*/
#include <SDL_net.h>
int main(int argc, char *argv[])
{
(void)argc;
(void)argv;
if (SDL_Init(SDL_INIT_EVERYTHING) < 0) return 1;
if (SDLNet_Init() < 0) return 1;
SDLNet_Quit();
SDL_Quit();
return 0;
}

33
src/sdl2_net.mk Normal file
View File

@ -0,0 +1,33 @@
# This file is part of MXE.
# See index.html for further information.
PKG := sdl2_net
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := 15ba4f41d05cbc05ae26b217965db6bf30cf8c60
$(PKG)_SUBDIR := SDL2_net-$($(PKG)_VERSION)
$(PKG)_FILE := SDL2_net-$($(PKG)_VERSION).tar.gz
#$(PKG)_URL := http://www.libsdl.org/projects/SDL_net/release/$($(PKG)_FILE)
$(PKG)_URL := http://www.libsdl.org/tmp/SDL_net/release/$($(PKG)_FILE)
$(PKG)_DEPS := gcc sdl
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://www.libsdl.org/projects/SDL_net/release/?C=M;O=D' | \
$(SED) -n 's,.*SDL_net-\([0-9][^>]*\)\.tar.*,\1,p' | \
head -1
endef
define $(PKG)_BUILD
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
--with-sdl-prefix='$(PREFIX)/$(TARGET)' \
--disable-sdltest \
--disable-gui
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
'$(TARGET)-gcc' \
-W -Wall -Werror -ansi -pedantic \
'$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl2_net.exe' \
`'$(TARGET)-pkg-config' SDL2_net --cflags --libs`
endef

29
src/sdl2_ttf.mk Normal file
View File

@ -0,0 +1,29 @@
# This file is part of MXE.
# See index.html for further information.
PKG := sdl2_ttf
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := b4067c5bff930ffecdf3f90b45a383621bab4d30
$(PKG)_SUBDIR := SDL2_ttf-$($(PKG)_VERSION)
$(PKG)_FILE := SDL2_ttf-$($(PKG)_VERSION).tar.gz
#$(PKG)_URL := http://www.libsdl.org/projects/SDL_ttf/release/$($(PKG)_FILE)
$(PKG)_URL := http://www.libsdl.org/tmp/SDL_ttf/release/$($(PKG)_FILE)
$(PKG)_DEPS := gcc sdl2 freetype
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://hg.libsdl.org/SDL_ttf/tags' | \
$(SED) -n 's,.*release-\([0-9][^<]*\).*,\1,p' | \
head -1
endef
define $(PKG)_BUILD
echo 'Requires.private: freetype2' >> '$(1)/SDL2_ttf.pc.in'
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
--with-sdl-prefix='$(PREFIX)/$(TARGET)' \
--disable-sdltest \
--with-freetype-prefix='$(PREFIX)/$(TARGET)'
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
endef

38
src/smpeg2.mk Normal file
View File

@ -0,0 +1,38 @@
# This file is part of MXE.
# See index.html for further information.
PKG := smpeg2
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := d0455466f61a8e55f83f4d7fd82f1c305bce6832
$(PKG)_SUBDIR := smpeg2-$($(PKG)_VERSION)
$(PKG)_FILE := smpeg2-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://www.libsdl.org/projects/smpeg/release/smpeg2-2.0.0.tar.gz
$(PKG)_DEPS := gcc sdl2
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://packages.debian.org/unstable/source/smpeg' | \
$(SED) -n 's,.*smpeg2_\([0-9][^>]*\)\.orig\.tar.*,\1,p' | \
head -1
endef
define $(PKG)_BUILD
$(SED) -i 's,\(-lsmpeg2\),\1 -lstdc++,' '$(1)/smpeg2-config.in'
cd '$(1)' && ./configure \
AR='$(TARGET)-ar' \
NM='$(TARGET)-nm' \
--host='$(TARGET)' \
--disable-shared \
--disable-debug \
--prefix='$(PREFIX)/$(TARGET)' \
--with-sdl-prefix='$(PREFIX)/$(TARGET)' \
--disable-sdltest \
--disable-gtk-player \
--disable-opengl-player \
CFLAGS='-ffriend-injection'
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
# '$(TARGET)-gcc' \
# -W -Wall -Werror -std=c99 -pedantic \
# '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-smpeg2.exe' \
# `'$(PREFIX)/$(TARGET)/bin/smpeg2-config' --cflags --libs`
endef