diff options
author | David 'Digit' Turner <digit@google.com> | 2015-06-08 16:31:15 +0200 |
---|---|---|
committer | David 'Digit' Turner <digit@google.com> | 2015-06-08 16:31:15 +0200 |
commit | 78b00d810b3f637433e17285fa91cb976fc59b82 (patch) | |
tree | 5fcc272257d83415f6e0712313e5061ba81f1eb1 | |
parent | 1d9f8964bd8a02afcec10856c06c8dc076581670 (diff) | |
download | qemu-android-deps-master.tar.gz |
Fix SDL2 .pc files for qemu-android build.HEADstudio-master-dev_before_26911779studio-1.5studio-1.4gradle_1.5.0gradle_1.3.1gradle_1.3.0-beta4gradle_1.3.0-beta3studio-master-releasestudio-master-devstudio-1.4-devstudio-1.3-releasestudio-1.3-devmastermainemu-1.4-release
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
-rw-r--r-- | linux-x86/lib/pkgconfig/sdl2.pc | 4 | ||||
-rw-r--r-- | linux-x86_64/lib/pkgconfig/sdl2.pc | 4 | ||||
-rw-r--r-- | windows-x86/lib/pkgconfig/sdl2.pc | 4 | ||||
-rw-r--r-- | windows-x86_64/lib/pkgconfig/sdl2.pc | 4 |
4 files changed, 8 insertions, 8 deletions
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 @@ Description: Simple DirectMedia Layer is a cross-platform multimedia library des 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 @@ Description: Simple DirectMedia Layer is a cross-platform multimedia library des 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 @@ Description: Simple DirectMedia Layer is a cross-platform multimedia library des 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 @@ Description: Simple DirectMedia Layer is a cross-platform multimedia library des 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 |