tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/FreeFileSync/Source/Makefile b/FreeFileSync/Source/Makefile
2index 9d81055..aed0f30 100644
3--- a/FreeFileSync/Source/Makefile
4+++ b/FreeFileSync/Source/Makefile
5@@ -1,5 +1,5 @@
6 CXX ?= g++
7-exeName = FreeFileSync_$(shell arch)
8+exeName = FreeFileSync
9
10 CXXFLAGS += -std=c++23 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
11 -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \
12@@ -21,8 +21,9 @@ CXXFLAGS += `pkg-config --cflags libssh2`
13 LDFLAGS += `pkg-config --libs libssh2`
14
15 CXXFLAGS += `pkg-config --cflags gtk+-3.0`
16+LDFLAGS += `pkg-config --libs gtk+-3.0`
17 #treat as system headers so that warnings are hidden:
18-CXXFLAGS += -isystem/usr/include/gtk-3.0
19+CXXFLAGS += -isystem@gtk3-dev@/include/gtk-3.0
20
21 #support for SELinux (optional)
22 SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES)
23diff --git a/FreeFileSync/Source/RealTimeSync/Makefile b/FreeFileSync/Source/RealTimeSync/Makefile
24index 0be46c9..f510284 100644
25--- a/FreeFileSync/Source/RealTimeSync/Makefile
26+++ b/FreeFileSync/Source/RealTimeSync/Makefile
27@@ -1,5 +1,5 @@
28 CXX ?= g++
29-exeName = RealTimeSync_$(shell arch)
30+exeName = RealTimeSync
31
32 CXXFLAGS += -std=c++23 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
33 -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \
34@@ -9,8 +9,9 @@ LDFLAGS += -s `wx-config --libs std, aui, richtext --debug=no` -pthread
35
36
37 CXXFLAGS += `pkg-config --cflags gtk+-3.0`
38+LDFLAGS += `pkg-config --libs gtk+-3.0`
39 #treat as system headers so that warnings are hidden:
40-CXXFLAGS += -isystem/usr/include/gtk-3.0
41+CXXFLAGS += -isystem@gtk3-dev@/include/gtk-3.0
42
43 cppFiles=
44 cppFiles+=application.cpp