From 176fe85277006debe461fa0bdaf53c1aa36b2048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yanis=20Zafir=C3=B3pulos?= <1265028+drkameleon@users.noreply.github.com> Date: Thu, 30 Jan 2025 16:24:20 +0100 Subject: [PATCH] debugging & minor fixes --- config.nims | 5 ++++- src/extras/webview.nim | 4 ++-- src/extras/window.nim | 8 +++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/config.nims b/config.nims index de122dc7a4..84657d86c6 100644 --- a/config.nims +++ b/config.nims @@ -74,7 +74,10 @@ proc configWebkit() = return "" - switch "define", "webkitVersion=\"" & getWebkitVersion() & "\"" + static: + echo "Webkit version found: " & $(getWebkitVersion()) + + switch "define", "webkitVersion=\"" & getWebkitVersion() & '"' proc configWinSSL() = --define:"noOpenSSLHacks" diff --git a/src/extras/webview.nim b/src/extras/webview.nim index df7bf56335..e0b5c8f87d 100644 --- a/src/extras/webview.nim +++ b/src/extras/webview.nim @@ -28,9 +28,9 @@ when defined(linux): webkitVersion {.strdefine.} = "empty" {.compile("webview/webview-unix.cc","-std=c++11").} {.passC: "-DWEBVIEW_GTK=1 -DWEBVIEW_STATIC=1 " & - staticExec"pkg-config --cflags gtk+-3.0 webkit2gtk-" & webkitVersion .} + staticExec("pkg-config --cflags gtk+-3.0 webkit2gtk-" & webkitVersion) .} {.passL: "-lstdc++ " & - staticExec"pkg-config --libs gtk+-3.0 webkit2gtk-" & webkitVersion .} + staticExec("pkg-config --libs gtk+-3.0 webkit2gtk-" & webkitVersion) .} elif defined(freebsd) or defined(netbsd) or defined(openbsd): {.compile("webview/webview-unix.cc","-std=c++11").} {.passC: "-DWEBVIEW_GTK=1 " & diff --git a/src/extras/window.nim b/src/extras/window.nim index 6cbaa5c351..0169336e76 100644 --- a/src/extras/window.nim +++ b/src/extras/window.nim @@ -24,9 +24,11 @@ import os when defined(linux): const webkitVersion {.strdefine.} = "empty" - {.compile("window/window.cc", staticExec"pkg-config --cflags gtk+-3.0 webkit2gtk-" & webkitVersion).} - {.passC: staticExec"pkg-config --cflags gtk+-3.0 webkit2gtk-" & webkitVersion .} - {.passL: staticExec"pkg-config --libs gtk+-3.0 webkit2gtk-" & webkitVersion .} + {.compile("window/window.cc", staticExec("pkg-config --cflags gtk+-3.0 webkit2gtk-" & webkitVersion)).} + static: + echo "FILE: " & "pkg-config --cflags gtk+-3.0 webkit2gtk-" & webkitVersion + {.passC: staticExec("pkg-config --cflags gtk+-3.0 webkit2gtk-" & webkitVersion) .} + {.passL: staticExec("pkg-config --libs gtk+-3.0 webkit2gtk-" & webkitVersion) .} elif defined(freebsd) or defined(netbsd) or defined(openbsd): {.compile("window/window.cc", staticExec"pkg-config --cflags gtk3 webkit2-gtk3").} {.passC: staticExec"pkg-config --cflags gtk3 webkit2-gtk3".}