47 lines
2.2 KiB
Diff
47 lines
2.2 KiB
Diff
When building use the libtool intermediate .lo files instead of explicitly using
|
|
the .o files. Under libtool foo.lo is the libtool intermediate wrapper, foo.o is
|
|
a static build, and .libs/foo.o is a shared build.
|
|
|
|
If static libraries have been disabled globally then libtool won't generate them
|
|
and explicit references to foo.o won't be satisfied.
|
|
|
|
Upstream-Status: Pending
|
|
RP
|
|
2016/1/16
|
|
|
|
|
|
Index: SDL2-2.0.4/configure.in
|
|
===================================================================
|
|
--- SDL2-2.0.4.orig/configure.in
|
|
+++ SDL2-2.0.4/configure.in
|
|
@@ -3464,23 +3464,23 @@ done
|
|
|
|
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)/\\2.lo: \\1/\\2.rc\\\\
|
|
\\$(WINDRES) \\$< \\$@,g"`
|
|
|
|
SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
|
|
SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
|
|
-SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'`
|
|
+SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
|
|
SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
|
|
-\\$(objects)/\\2.o: \\1/\\2.c\\\\
|
|
+\\$(objects)/\\2.lo: \\1/\\2.c\\\\
|
|
\\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
|
|
|
|
SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`
|
|
SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`
|
|
-SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'`
|
|
+SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
|
|
SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
|
|
-\\$(objects)/\\2.o: \\1/\\2.c\\\\
|
|
+\\$(objects)/\\2.lo: \\1/\\2.c\\\\
|
|
\\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
|
|
|
|
# Set runtime shared library paths as needed
|