From 558561f5760d4f02ec830ef78272074ece97f639 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 25 Aug 2019 11:25:24 +1000 Subject: [PATCH] Restore weird paths in the SDL lib configs --- misc/builddeps/win32/sdl/lib/cmake/SDL2/sdl2-config.cmake | 6 +++--- misc/builddeps/win32/sdl/lib/pkgconfig/sdl2.pc | 2 +- misc/builddeps/win64/sdl/lib/cmake/SDL2/sdl2-config.cmake | 6 +++--- misc/builddeps/win64/sdl/lib/pkgconfig/sdl2.pc | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/misc/builddeps/win32/sdl/lib/cmake/SDL2/sdl2-config.cmake b/misc/builddeps/win32/sdl/lib/cmake/SDL2/sdl2-config.cmake index ee347fcb..30617b48 100644 --- a/misc/builddeps/win32/sdl/lib/cmake/SDL2/sdl2-config.cmake +++ b/misc/builddeps/win32/sdl/lib/cmake/SDL2/sdl2-config.cmake @@ -1,10 +1,10 @@ # sdl2 cmake project-config input for ./configure scripts -set(prefix "/opt/local/i686-w64-mingw32") +set(prefix "/var/home/rpolzer/xonotic/misc/buildsrc/tmp/SDL2-2.0.10/../32") set(exec_prefix "${prefix}") set(libdir "${exec_prefix}/lib") -set(SDL2_PREFIX "/opt/local/i686-w64-mingw32") -set(SDL2_EXEC_PREFIX "/opt/local/i686-w64-mingw32") +set(SDL2_PREFIX "/var/home/rpolzer/xonotic/misc/buildsrc/tmp/SDL2-2.0.10/../32") +set(SDL2_EXEC_PREFIX "/var/home/rpolzer/xonotic/misc/buildsrc/tmp/SDL2-2.0.10/../32") set(SDL2_LIBDIR "${exec_prefix}/lib") set(SDL2_INCLUDE_DIRS "${prefix}/include/SDL2") set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} -lmingw32 -lSDL2main -lSDL2 -mwindows") diff --git a/misc/builddeps/win32/sdl/lib/pkgconfig/sdl2.pc b/misc/builddeps/win32/sdl/lib/pkgconfig/sdl2.pc index 4e29497c..980046cf 100644 --- a/misc/builddeps/win32/sdl/lib/pkgconfig/sdl2.pc +++ b/misc/builddeps/win32/sdl/lib/pkgconfig/sdl2.pc @@ -1,6 +1,6 @@ # sdl pkg-config source file -prefix=/opt/local/i686-w64-mingw32 +prefix=/var/home/rpolzer/xonotic/misc/buildsrc/tmp/SDL2-2.0.10/../32 exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include diff --git a/misc/builddeps/win64/sdl/lib/cmake/SDL2/sdl2-config.cmake b/misc/builddeps/win64/sdl/lib/cmake/SDL2/sdl2-config.cmake index 455d8ed5..1a5dd14e 100644 --- a/misc/builddeps/win64/sdl/lib/cmake/SDL2/sdl2-config.cmake +++ b/misc/builddeps/win64/sdl/lib/cmake/SDL2/sdl2-config.cmake @@ -1,10 +1,10 @@ # sdl2 cmake project-config input for ./configure scripts -set(prefix "/opt/local/x86_64-w64-mingw32") +set(prefix "/var/home/rpolzer/xonotic/misc/buildsrc/tmp/SDL2-2.0.10/../64") set(exec_prefix "${prefix}") set(libdir "${exec_prefix}/lib") -set(SDL2_PREFIX "/opt/local/x86_64-w64-mingw32") -set(SDL2_EXEC_PREFIX "/opt/local/x86_64-w64-mingw32") +set(SDL2_PREFIX "/var/home/rpolzer/xonotic/misc/buildsrc/tmp/SDL2-2.0.10/../64") +set(SDL2_EXEC_PREFIX "/var/home/rpolzer/xonotic/misc/buildsrc/tmp/SDL2-2.0.10/../64") set(SDL2_LIBDIR "${exec_prefix}/lib") set(SDL2_INCLUDE_DIRS "${prefix}/include/SDL2") set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} -lmingw32 -lSDL2main -lSDL2 -mwindows") diff --git a/misc/builddeps/win64/sdl/lib/pkgconfig/sdl2.pc b/misc/builddeps/win64/sdl/lib/pkgconfig/sdl2.pc index ceb157f2..967bae60 100644 --- a/misc/builddeps/win64/sdl/lib/pkgconfig/sdl2.pc +++ b/misc/builddeps/win64/sdl/lib/pkgconfig/sdl2.pc @@ -1,6 +1,6 @@ # sdl pkg-config source file -prefix=/opt/local/x86_64-w64-mingw32 +prefix=/var/home/rpolzer/xonotic/misc/buildsrc/tmp/SDL2-2.0.10/../64 exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include -- 2.39.2