From c807fca8cbb08ba45ac2a4260ee2c4adac7d4cd5 Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Tue, 12 Jun 2018 18:13:27 -0400 Subject: [PATCH] Fix Fedora samples build. --- samples/gitchurn/src/main/c_interop/libgit2.def | 2 +- samples/gtk/src/main/c_interop/gtk3.def | 2 +- samples/libcurl/src/main/c_interop/libcurl.def | 2 +- samples/tetris/build.gradle | 4 ++-- samples/videoplayer/build.gradle | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/samples/gitchurn/src/main/c_interop/libgit2.def b/samples/gitchurn/src/main/c_interop/libgit2.def index c8b7558d6b3..334202a3f08 100644 --- a/samples/gitchurn/src/main/c_interop/libgit2.def +++ b/samples/gitchurn/src/main/c_interop/libgit2.def @@ -1,4 +1,4 @@ headers = git2.h linkerOpts.osx = -L/opt/local/lib -L/usr/local/lib -lgit2 -linkerOpts.linux = -L/usr/lib/x86_64-linux-gnu -lgit2 +linkerOpts.linux = -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu -lgit2 headerFilter = git2/** git2.h diff --git a/samples/gtk/src/main/c_interop/gtk3.def b/samples/gtk/src/main/c_interop/gtk3.def index c42bb542fff..fd5c45fc82b 100644 --- a/samples/gtk/src/main/c_interop/gtk3.def +++ b/samples/gtk/src/main/c_interop/gtk3.def @@ -5,4 +5,4 @@ compilerOpts.osx = -I/usr/local/include/gtk-3.0 -I/usr/local/include/glib-2.0 -I -I/usr/local/include/atk-1.0 compilerOpts.linux = -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/local/lib/glib-2.0/include -I/usr/lib64/glib-2.0/include linkerOpts.osx = -L/opt/local/lib -L/usr/local/lib -lglib-2.0 -lgdk-3.0 -lgtk-3 -lgio-2.0 -lgobject-2.0 -linkerOpts.linux = -L/usr/lib/x86_64-linux-gnu -lglib-2.0 -lgdk-3 -lgtk-3 -lgio-2.0 -lgobject-2.0 +linkerOpts.linux = -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu -lglib-2.0 -lgdk-3 -lgtk-3 -lgio-2.0 -lgobject-2.0 diff --git a/samples/libcurl/src/main/c_interop/libcurl.def b/samples/libcurl/src/main/c_interop/libcurl.def index 6d469e2f8b0..5ab60ecb81b 100644 --- a/samples/libcurl/src/main/c_interop/libcurl.def +++ b/samples/libcurl/src/main/c_interop/libcurl.def @@ -1,4 +1,4 @@ headers = curl/curl.h headerFilter = curl/* linkerOpts.osx = -L/opt/local/lib -L/usr/local/opt/curl/lib -lcurl -linkerOpts.linux = -L/usr/lib/x86_64-linux-gnu -lcurl +linkerOpts.linux = -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu -lcurl diff --git a/samples/tetris/build.gradle b/samples/tetris/build.gradle index 2f3355c0d41..f6e5d39d43d 100644 --- a/samples/tetris/build.gradle +++ b/samples/tetris/build.gradle @@ -43,7 +43,7 @@ konanArtifacts { } target 'linux', { - linkerOpts '-L/usr/lib/x86_64-linux-gnu -lSDL2' + linkerOpts '-L/usr/lib64 -L/usr/lib/x86_64-linux-gnu -lSDL2' } target 'raspberrypi', { @@ -86,4 +86,4 @@ compileKonan { } } } -} \ No newline at end of file +} diff --git a/samples/videoplayer/build.gradle b/samples/videoplayer/build.gradle index f29ab9e5304..5124800871a 100644 --- a/samples/videoplayer/build.gradle +++ b/samples/videoplayer/build.gradle @@ -7,7 +7,7 @@ konanArtifacts { defFile 'src/main/c_interop/ffmpeg.def' target 'linux', { - includeDirs.headerFilterOnly '/usr/include', '/usr/include/x86_64-linux-gnu' + includeDirs.headerFilterOnly '/usr/include', '/usr/include/x86_64-linux-gnu', '/usr/include/ffmpeg' } target 'macbook', { @@ -50,7 +50,7 @@ konanArtifacts { } target 'linux', { - linkerOpts '-L/usr/lib/x86_64-linux-gnu' + linkerOpts '-L/usr/lib/x86_64-linux-gnu', '-L/usr/lib64' } target 'mingw', {