Merge branch 'khorben/gtk3'

This commit is contained in:
Pierre Pronchery 2019-12-18 04:16:57 +01:00
commit 86a540d448

View File

@ -2,11 +2,11 @@ targets=compare,fontsel,progress
cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
ldflags=-pie -Wl,-z,relro -Wl,-z,now ldflags=-pie -Wl,-z,relro -Wl,-z,now
#for Gtk+ 2 #for Gtk+ 2
cflags_force=`pkg-config gtk+-2.0 --cflags` #cflags_force=`pkg-config gtk+-2.0 --cflags`
ldflags_force=`pkg-config gtk+-2.0 --libs` #ldflags_force=`pkg-config gtk+-2.0 --libs`
#for Gtk+ 3 #for Gtk+ 3
#cflags_force=-W `pkg-config gtk+-3.0 --cflags` cflags_force=-W `pkg-config gtk+-3.0 --cflags`
#ldflags_force=`pkg-config gtk+-3.0 --libs` ldflags_force=`pkg-config gtk+-3.0 --libs`
dist=Makefile dist=Makefile
[compare] [compare]