|
Line
Link Here
|
| 0 |
-- SDL2-2.0.14/configure.ac |
0 |
++ SDL2-2.0.14/configure.ac |
|
Lines 1644-1650
Link Here
|
| 1644 |
RPI_LIBS="-Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lbcm_host" |
1644 |
RPI_LIBS="-Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lbcm_host" |
| 1645 |
else |
1645 |
else |
| 1646 |
RPI_CFLAGS="-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux" |
1646 |
RPI_CFLAGS="-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux" |
| 1647 |
RPI_LIBS="-Wl,-rpath,/opt/vc/lib -L/opt/vc/lib -lbcm_host" |
1647 |
RPI_LIBS="-Wl,-rpath,/opt/vc/lib -L/opt/vc/lib -lbcm_host -lvchostif" |
| 1648 |
fi |
1648 |
fi |
| 1649 |
|
1649 |
|
|
Lines 3863-3869
Link Here
|
| 3863 |
if test -f /lib/w32api/libuuid.a; then |
3863 |
if test -f /lib/w32api/libuuid.a; then |
| 3864 |
LIBUUID=/lib/w32api/libuuid.a |
3864 |
LIBUUID=/lib/w32api/libuuid.a |
| 3865 |
else |
3865 |
else |
| 3866 |
LIBUUID=-luuid |
3866 |
LIBUUID=-Wl,-luuid |
| 3867 |
fi |
3867 |
fi |
| 3868 |
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion $LIBUUID -static-libgcc" |
3868 |
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion $LIBUUID -static-libgcc" |
| 3869 |
# The Windows platform requires special setup |
3869 |
# The Windows platform requires special setup |
| 3870 |
-- SDL2-2.0.14/Makefile.in |
3870 |
++ SDL2-2.0.14/Makefile.in |
|
Lines 151-163
Link Here
|
| 151 |
.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) |
151 |
.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) |
| 152 |
|
152 |
|
| 153 |
$(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS) |
153 |
$(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS) |
| 154 |
$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) |
154 |
$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) |
| 155 |
|
155 |
|
| 156 |
$(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) |
156 |
$(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) |
| 157 |
$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir) |
157 |
$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static |
| 158 |
|
158 |
|
| 159 |
$(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS) |
159 |
$(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS) |
| 160 |
$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(libdir) |
160 |
$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static |
| 161 |
|
161 |
|
| 162 |
install: all install-bin install-hdrs install-lib install-data |
162 |
install: all install-bin install-hdrs install-lib install-data |
| 163 |
install-bin: |
163 |
install-bin: |
