Skip to content

Commit

Permalink
debugging & minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
drkameleon committed Jan 30, 2025
1 parent 4c3f627 commit 176fe85
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
5 changes: 4 additions & 1 deletion config.nims
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/extras/webview.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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 " &
Expand Down
8 changes: 5 additions & 3 deletions src/extras/window.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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".}
Expand Down

0 comments on commit 176fe85

Please sign in to comment.