Fix SDL2 .pc files for qemu-android build. This patch corresponds to the changes in build-qemu-android-deps.sh described here: https://android-review.googlesource.com/#/c/153350/ There is no point to update the rest of the binary files, so the change has been limited to the sdl2.pc files after re-running the script. Change-Id: Ia3e3461aebeb878cb839245bd5a8f12e91e3ad4c
diff --git a/linux-x86/lib/pkgconfig/sdl2.pc b/linux-x86/lib/pkgconfig/sdl2.pc index 27de147..481cb9c 100644 --- a/linux-x86/lib/pkgconfig/sdl2.pc +++ b/linux-x86/lib/pkgconfig/sdl2.pc
@@ -1,6 +1,6 @@ # sdl pkg-config source file -prefix=/tmp/digit-build-temp-464/install-linux-x86 +prefix=/tmp/digit-build-temp-13090/install-linux-x86 exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include @@ -10,6 +10,6 @@ Version: 2.0.3 Requires: Conflicts: -Libs: -L${libdir} -Wl,-rpath,${libdir} -lSDL2 -lpthread +Libs: -L${libdir} -Wl,-rpath,${libdir} -lSDL2 -lpthread -Wl,--no-undefined -lm -ldl -lrt Libs.private: -lSDL2 -lpthread -Wl,--no-undefined -lm -ldl -lpthread -lrt Cflags: -I${includedir}/SDL2 -D_REENTRANT
diff --git a/linux-x86_64/lib/pkgconfig/sdl2.pc b/linux-x86_64/lib/pkgconfig/sdl2.pc index 2a6b379..f5377fa 100644 --- a/linux-x86_64/lib/pkgconfig/sdl2.pc +++ b/linux-x86_64/lib/pkgconfig/sdl2.pc
@@ -1,6 +1,6 @@ # sdl pkg-config source file -prefix=/tmp/digit-build-temp-464/install-linux-x86_64 +prefix=/tmp/digit-build-temp-13090/install-linux-x86_64 exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include @@ -10,6 +10,6 @@ Version: 2.0.3 Requires: Conflicts: -Libs: -L${libdir} -Wl,-rpath,${libdir} -lSDL2 -lpthread +Libs: -L${libdir} -Wl,-rpath,${libdir} -lSDL2 -lpthread -Wl,--no-undefined -lm -ldl -lrt Libs.private: -lSDL2 -lpthread -Wl,--no-undefined -lm -ldl -lpthread -lrt Cflags: -I${includedir}/SDL2 -D_REENTRANT
diff --git a/windows-x86/lib/pkgconfig/sdl2.pc b/windows-x86/lib/pkgconfig/sdl2.pc index 666a357..ce55a53 100644 --- a/windows-x86/lib/pkgconfig/sdl2.pc +++ b/windows-x86/lib/pkgconfig/sdl2.pc
@@ -1,6 +1,6 @@ # sdl pkg-config source file -prefix=/tmp/digit-build-temp-464/install-windows-x86 +prefix=/tmp/digit-build-temp-13090/install-windows-x86 exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include @@ -10,6 +10,6 @@ Version: 2.0.3 Requires: Conflicts: -Libs: -L${libdir} -lmingw32 -lSDL2main -lSDL2 -mwindows +Libs: -L${libdir} -lmingw32 -lSDL2main -lSDL2 -mwindows -Wl,--no-undefined -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -static-libgcc Libs.private: -lmingw32 -lSDL2main -lSDL2 -mwindows -Wl,--no-undefined -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -XCClinker -static-libgcc Cflags: -I${includedir}/SDL2 -Dmain=SDL_main
diff --git a/windows-x86_64/lib/pkgconfig/sdl2.pc b/windows-x86_64/lib/pkgconfig/sdl2.pc index 34c7c54..26652f0 100644 --- a/windows-x86_64/lib/pkgconfig/sdl2.pc +++ b/windows-x86_64/lib/pkgconfig/sdl2.pc
@@ -1,6 +1,6 @@ # sdl pkg-config source file -prefix=/tmp/digit-build-temp-464/install-windows-x86_64 +prefix=/tmp/digit-build-temp-13090/install-windows-x86_64 exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include @@ -10,6 +10,6 @@ Version: 2.0.3 Requires: Conflicts: -Libs: -L${libdir} -lmingw32 -lSDL2main -lSDL2 -mwindows +Libs: -L${libdir} -lmingw32 -lSDL2main -lSDL2 -mwindows -Wl,--no-undefined -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -static-libgcc Libs.private: -lmingw32 -lSDL2main -lSDL2 -mwindows -Wl,--no-undefined -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -XCClinker -static-libgcc Cflags: -I${includedir}/SDL2 -Dmain=SDL_main