diff --git a/data/libDesktop.pc.in b/data/libDesktop.pc.in index f8f0873..20c8320 100644 --- a/data/libDesktop.pc.in +++ b/data/libDesktop.pc.in @@ -6,6 +6,6 @@ libdir=${exec_prefix}/lib Name: @PACKAGE@ Description: DeforaOS Desktop helper library Version: @VERSION@ -Requires: libSystem gtk+-2.0 +Requires: libSystem gtk+-3.0 Cflags: -I${includedir} Libs: @RPATH@ -L${libdir} -lDesktop diff --git a/src/project.conf b/src/project.conf index 51d799b..9b20126 100644 --- a/src/project.conf +++ b/src/project.conf @@ -3,11 +3,11 @@ cppflags_force=-I ../include cflags=-W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all ldflags=-Wl,-z,relro -Wl,-z,now #for Gtk+ 2 -cflags_force=`pkg-config --cflags libSystem gtk+-2.0` -fPIC -ldflags_force=`pkg-config --libs libSystem gtk+-2.0` +#cflags_force=`pkg-config --cflags libSystem gtk+-2.0` -fPIC +#ldflags_force=`pkg-config --libs libSystem gtk+-2.0` #for Gtk+ 3 -#cflags_force=`pkg-config --cflags libSystem gtk+-3.0` -fPIC -#ldflags_force=`pkg-config --libs libSystem gtk+-3.0` +cflags_force=`pkg-config --cflags libSystem gtk+-3.0` -fPIC +ldflags_force=`pkg-config --libs libSystem gtk+-3.0` dist=Makefile [libDesktop] diff --git a/tests/project.conf b/tests/project.conf index bbc7f30..c53e400 100644 --- a/tests/project.conf +++ b/tests/project.conf @@ -3,11 +3,11 @@ cppflags_force=-I ../include cflags=-W -Wall -g -O2 -pedantic -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector-all ldflags=-pie -Wl,-z,relro -Wl,-z,now #for Gtk+ 2 -cflags_force=`pkg-config --cflags libSystem gtk+-2.0` -ldflags_force=`pkg-config --libs libSystem gtk+-2.0` $(OBJDIR)../src/libDesktop.a +#cflags_force=`pkg-config --cflags libSystem gtk+-2.0` +#ldflags_force=`pkg-config --libs libSystem gtk+-2.0` $(OBJDIR)../src/libDesktop.a #for Gtk+ 3 -#cflags_force=`pkg-config --cflags libSystem gtk+-3.0` -#ldflags_force=`pkg-config --libs libSystem gtk+-3.0` $(OBJDIR)../src/libDesktop.a +cflags_force=`pkg-config --cflags libSystem gtk+-3.0` +ldflags_force=`pkg-config --libs libSystem gtk+-3.0` $(OBJDIR)../src/libDesktop.a dist=Makefile,htmllint.sh,pkgconfig.sh,tests.sh,xmllint.sh [htmllint.log] diff --git a/tools/project.conf b/tools/project.conf index 3fbe0e4..e8b9943 100644 --- a/tools/project.conf +++ b/tools/project.conf @@ -3,11 +3,11 @@ cppflags_force=-I ../include cflags=-W -Wall -g -O2 -pedantic -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector-all ldflags=-pie -Wl,-z,relro -Wl,-z,now #for Gtk+ 2 -cflags_force=`pkg-config --cflags libSystem gtk+-2.0` -ldflags_force=`pkg-config --libs libSystem gtk+-2.0` -L $(OBJDIR)../src -lDesktop +#cflags_force=`pkg-config --cflags libSystem gtk+-2.0` +#ldflags_force=`pkg-config --libs libSystem gtk+-2.0` -L $(OBJDIR)../src -lDesktop #for Gtk+ 3 -#cflags_force=`pkg-config --cflags libSystem gtk+-3.0` -#ldflags_force=`pkg-config --libs libSystem gtk+-3.0` -L $(OBJDIR)../src -lDesktop +cflags_force=`pkg-config --cflags libSystem gtk+-3.0` +ldflags_force=`pkg-config --libs libSystem gtk+-3.0` -L $(OBJDIR)../src -lDesktop dist=Makefile,subst.sh [widget]