This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Robert Norris Date: Sat, 28 Mar 2015 21:47:00 +0100 Subject: [PATCH] disable DirectInput because of missing wbemcli.h This patch has been taken from: https://bugzilla.libsdl.org/show_bug.cgi?id=1739 diff --git a/configure.in b/configure.in index 1111111..2222222 100644 --- a/configure.in +++ b/configure.in @@ -3017,7 +3017,7 @@ XINPUT_STATE_EX s1; # 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 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tobias Gruetzmacher Date: Sat, 28 Mar 2015 21:47:32 +0100 Subject: [PATCH] fix shared build, libtool This patch is a combination of 2 patches from: https://bugzilla.libsdl.org/show_bug.cgi?id=1431 - Use libtool everywhere (by john) - MingW fixes for "Use libtool everywhere" (by Daniel Scharrer) These fix compiles in a strictly shared build (with --disable-static) by always building libSDL2main.a and libSDL2_test.a staticly diff --git a/Makefile.in b/Makefile.in index 1111111..2222222 100644 --- a/Makefile.in +++ b/Makefile.in @@ -143,13 +143,13 @@ update-revision: .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d) $(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS) - $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) + $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) - $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir) + $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS) - $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(libdir) + $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static install: all install-bin install-hdrs install-lib install-data install-bin: diff --git a/configure.in b/configure.in index 1111111..2222222 100644 --- a/configure.in +++ b/configure.in @@ -3956,10 +3956,10 @@ GEN_OBJECTS=`echo "$GEN_SOURCES" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.l VERSION_OBJECTS=`echo $VERSION_SOURCES` VERSION_DEPENDS=`echo $VERSION_SOURCES` -VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'` +VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'` VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\ -\\$(objects)/\\2.o: \\1/\\2.rc\\\\ - \\$(WINDRES) \\$< \\$@,g"` +\\$(objects)/\\2.lo: \\1/\\2.rc\\\\ + \\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"` SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`