|
|
|
Fix --disable-static.
|
|
|
|
|
|
|
|
Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431
|
|
|
|
|
|
|
|
--- SDL2-2.0.12/configure.ac
|
|
|
|
+++ SDL2-2.0.12/configure.ac
|
|
|
|
@@ -3751,7 +3751,7 @@
|
|
|
|
if test -f /lib/w32api/libuuid.a; then
|
|
|
|
LIBUUID=/lib/w32api/libuuid.a
|
|
|
|
else
|
|
|
|
- LIBUUID=-luuid
|
|
|
|
+ LIBUUID=-Wl,-luuid
|
|
|
|
fi
|
|
|
|
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion $LIBUUID -static-libgcc"
|
|
|
|
# The Windows platform requires special setup
|
|
|
|
@@ -4194,10 +4194,10 @@
|
|
|
|
|
|
|
|
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 \\$(objects)/.created\\\\
|
|
|
|
- \\$(WINDRES) \\$< \\$@,g"`
|
|
|
|
+\\$(objects)/\\2.lo: \\1/\\2.rc \\$(objects)/.created\\\\
|
|
|
|
+ \\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"`
|
|
|
|
|
|
|
|
SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
|
|
|
|
SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
|
|
|
|
--- SDL2-2.0.12/Makefile.in
|
|
|
|
+++ SDL2-2.0.12/Makefile.in
|
|
|
|
@@ -148,13 +148,13 @@
|
|
|
|
.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)
|
|
|
|
+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -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)
|
|
|
|
+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -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)
|
|
|
|
+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
|
|
|
|
|
|
|
|
install: all install-bin install-hdrs install-lib install-data
|
|
|
|
install-bin:
|