at master 48 lines 2.2 kB view raw
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@@ -17,9 +17,10 @@ LDFLAGS += `pkg-config --libs libcurl` -lidn2 13 CXXFLAGS += `pkg-config --cflags libssh2` 14 LDFLAGS += `pkg-config --libs libssh2` 15 16-CXXFLAGS += `pkg-config --cflags gtk+-2.0` 17+CXXFLAGS += `pkg-config --cflags gtk+-3.0` 18+LDFLAGS += `pkg-config --libs gtk+-3.0` 19 #treat as system headers so that warnings are hidden: 20-CXXFLAGS += -isystem/usr/include/gtk-2.0 21+CXXFLAGS += -isystem@gtk3-dev@/include/gtk-3.0 22 23 #support for SELinux (optional) 24 SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES) 25diff --git a/FreeFileSync/Source/RealTimeSync/Makefile b/FreeFileSync/Source/RealTimeSync/Makefile 26index 0be46c9..f510284 100644 27--- a/FreeFileSync/Source/RealTimeSync/Makefile 28+++ b/FreeFileSync/Source/RealTimeSync/Makefile 29@@ -1,5 +1,5 @@ 30 CXX ?= g++ 31-exeName = RealTimeSync_$(shell arch) 32+exeName = RealTimeSync 33 34 CXXFLAGS += -std=c++23 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ 35 -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \ 36@@ -8,9 +8,10 @@ CXXFLAGS += -std=c++23 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zen 37 LDFLAGS += -s `wx-config --libs std, aui, richtext --debug=no` -pthread 38 39 40-CXXFLAGS += `pkg-config --cflags gtk+-2.0` 41+CXXFLAGS += `pkg-config --cflags gtk+-3.0` 42+LDFLAGS += `pkg-config --libs gtk+-3.0` 43 #treat as system headers so that warnings are hidden: 44-CXXFLAGS += -isystem/usr/include/gtk-2.0 45+CXXFLAGS += -isystem@gtk3-dev@/include/gtk-3.0 46 47 cppFiles= 48 cppFiles+=application.cpp