DeforaOS/libDesktop
DeforaOS/libDesktop
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build with Gtk+ 3 by default

Browse Source
This commit is contained in:
Pierre Pronchery 2015-10-24 02:40:19 +02:00
parent ab18baad92
commit f69a11f971
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/libDesktop.pc.in
View File

@ -6,6 +6,6 @@ libdir=${exec_prefix}/lib
Name: @PACKAGE@ Name: @PACKAGE@
Description: DeforaOS Desktop helper library Description: DeforaOS Desktop helper library
Version: @VERSION@ Version: @VERSION@
Requires: libSystem gtk+-2.0 Requires: libSystem gtk+-3.0
Cflags: -I${includedir} Cflags: -I${includedir}
Libs: @RPATH@ -L${libdir} -lDesktop Libs: @RPATH@ -L${libdir} -lDesktop

8
src/project.conf
View File

@ -3,11 +3,11 @@ cppflags_force=-I ../include
cflags=-W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all cflags=-W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all
ldflags=-Wl,-z,relro -Wl,-z,now ldflags=-Wl,-z,relro -Wl,-z,now
#for Gtk+ 2 #for Gtk+ 2
cflags_force=`pkg-config --cflags libSystem gtk+-2.0` -fPIC #cflags_force=`pkg-config --cflags libSystem gtk+-2.0` -fPIC
ldflags_force=`pkg-config --libs libSystem gtk+-2.0` #ldflags_force=`pkg-config --libs libSystem gtk+-2.0`
#for Gtk+ 3 #for Gtk+ 3
#cflags_force=`pkg-config --cflags libSystem gtk+-3.0` -fPIC cflags_force=`pkg-config --cflags libSystem gtk+-3.0` -fPIC
#ldflags_force=`pkg-config --libs libSystem gtk+-3.0` ldflags_force=`pkg-config --libs libSystem gtk+-3.0`
dist=Makefile dist=Makefile
[libDesktop] [libDesktop]

8
tests/project.conf
View File

@ -3,11 +3,11 @@ cppflags_force=-I ../include
cflags=-W -Wall -g -O2 -pedantic -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector-all cflags=-W -Wall -g -O2 -pedantic -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector-all
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 --cflags libSystem gtk+-2.0` #cflags_force=`pkg-config --cflags libSystem gtk+-2.0`
ldflags_force=`pkg-config --libs libSystem gtk+-2.0` $(OBJDIR)../src/libDesktop.a #ldflags_force=`pkg-config --libs libSystem gtk+-2.0` $(OBJDIR)../src/libDesktop.a
#for Gtk+ 3 #for Gtk+ 3
#cflags_force=`pkg-config --cflags libSystem gtk+-3.0` cflags_force=`pkg-config --cflags libSystem gtk+-3.0`
#ldflags_force=`pkg-config --libs libSystem gtk+-3.0` $(OBJDIR)../src/libDesktop.a ldflags_force=`pkg-config --libs libSystem gtk+-3.0` $(OBJDIR)../src/libDesktop.a
dist=Makefile,htmllint.sh,pkgconfig.sh,tests.sh,xmllint.sh dist=Makefile,htmllint.sh,pkgconfig.sh,tests.sh,xmllint.sh
[htmllint.log] [htmllint.log]

8
tools/project.conf
View File

@ -3,11 +3,11 @@ cppflags_force=-I ../include
cflags=-W -Wall -g -O2 -pedantic -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector-all cflags=-W -Wall -g -O2 -pedantic -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector-all
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 --cflags libSystem gtk+-2.0` #cflags_force=`pkg-config --cflags libSystem gtk+-2.0`
ldflags_force=`pkg-config --libs libSystem gtk+-2.0` -L $(OBJDIR)../src -lDesktop #ldflags_force=`pkg-config --libs libSystem gtk+-2.0` -L $(OBJDIR)../src -lDesktop
#for Gtk+ 3 #for Gtk+ 3
#cflags_force=`pkg-config --cflags libSystem gtk+-3.0` cflags_force=`pkg-config --cflags libSystem gtk+-3.0`
#ldflags_force=`pkg-config --libs libSystem gtk+-3.0` -L $(OBJDIR)../src -lDesktop ldflags_force=`pkg-config --libs libSystem gtk+-3.0` -L $(OBJDIR)../src -lDesktop
dist=Makefile,subst.sh dist=Makefile,subst.sh
[widget] [widget]