diff options
| author | Tony Theodore <tonyt@logyst.com> | 2013-10-05 07:29:57 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2013-10-05 07:29:57 (GMT) |
| commit | dcb004bcfeb770d460e99c41fdd15e65b06d250f (patch) | |
| tree | 50ff0f2fa89c9e0961265726533b30ea27ec18a3 | |
| parent | 3592008a4f0362ee0aadd1546e0a21750fba7081 (diff) | |
| parent | f44f02b6853da0d1fc0480adf0b673208726d8b8 (diff) | |
| download | mxe-dcb004bcfeb770d460e99c41fdd15e65b06d250f.zip mxe-dcb004bcfeb770d460e99c41fdd15e65b06d250f.tar.gz mxe-dcb004bcfeb770d460e99c41fdd15e65b06d250f.tar.bz2 | |
Merge pull request #247 from robn/sdl2
package sdl2: disable DirectInput because of missing wbemcli.h
| -rw-r--r-- | src/sdl2-1-dinput.patch | 17 | ||||
| -rw-r--r-- | src/sdl2.mk | 4 | ||||
| -rw-r--r-- | src/sdl2_image.mk | 2 |
3 files changed, 18 insertions, 5 deletions
diff --git a/src/sdl2-1-dinput.patch b/src/sdl2-1-dinput.patch new file mode 100644 index 0000000..e01237a --- /dev/null +++ b/src/sdl2-1-dinput.patch @@ -0,0 +1,17 @@ +This file is part of MXE. +See index.html for further information. + +This patch has been taken from: +https://bugzilla.libsdl.org/show_bug.cgi?id=1739 + +--- a/configure.in Sat Sep 14 11:25:52 2013 -0700 ++++ b/configure.in Fri Sep 27 15:03:58 2013 +1000 +@@ -2127,7 +2127,7 @@ + # FIXME: latest Cygwin finds dinput headers, but we die on other win32 headers. + # FIXME: ...so force it off for now. + case "$host" in +- *-*-cygwin*) ++ *-*-cygwin* | *-pc-mingw32*) + have_dinput=false + ;; + esac diff --git a/src/sdl2.mk b/src/sdl2.mk index b637c14..cfa6818 100644 --- a/src/sdl2.mk +++ b/src/sdl2.mk @@ -18,7 +18,7 @@ endef define $(PKG)_BUILD $(SED) -i 's,-mwindows,-lwinmm -mwindows,' '$(1)/configure' - cd '$(1)' && ./configure \ + cd '$(1)' && aclocal -I acinclude && autoconf && ./configure \ --host='$(TARGET)' \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ @@ -31,5 +31,3 @@ define $(PKG)_BUILD $(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 = diff --git a/src/sdl2_image.mk b/src/sdl2_image.mk index d4b19b6..d3e259b 100644 --- a/src/sdl2_image.mk +++ b/src/sdl2_image.mk @@ -31,5 +31,3 @@ define $(PKG)_BUILD LIBS='-lz' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef - -$(PKG)_BUILD_i686-pc-mingw32 = |