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

Really default to Gtk+ 4

Browse Source
This commit is contained in:
Pierre Pronchery 2021-09-29 08:26:56 +02:00
parent ef57d933d1
commit 9ecac417e4
5 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/gtk4/libDesktop.pc.in
View File

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

2
data/project.conf
View File

@ -1,6 +1,6 @@
subdirs=gtk3
dist=Makefile,pkgconfig.sh
mode=gtk3-debug
mode=gtk4-debug
#modes
[mode::gtk2-debug]

20
src/project.conf
View File

@ -1,11 +1,11 @@
targets=libDesktop
cppflags_force=-I ../include
cflags_force=`pkg-config --cflags libSystem gtk+-3.0 x11` -fPIC
cflags_force=`pkg-config --cflags libSystem gtk4-x11` -fPIC
cflags=-W -Wall -g -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
ldflags_force=`pkg-config --libs libSystem gtk+-3.0 x11`
ldflags_force=`pkg-config --libs libSystem gtk4-x11`
ldflags=-Wl,-z,relro -Wl,-z,now
dist=Makefile,mimehandler.h
mode=gtk3-debug
mode=gtk4-debug
#modes
[mode::gtk2-debug]
@ -18,19 +18,21 @@ cflags_force=`pkg-config --cflags libSystem gtk+-2.0` -fPIC
cflags=-W -Wall -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
ldflags_force=`pkg-config --libs libSystem gtk+-2.0`
[mode::gtk3-debug]
cflags_force=`pkg-config --cflags libSystem gtk+-3.0 x11` -fPIC
ldflags_force=`pkg-config --libs libSystem gtk+-3.0 x11`
[mode::gtk3-release]
cppflags_force=-I ../include -DNDEBUG
cflags_force=`pkg-config --cflags libSystem gtk+-3.0 x11` -fPIC
cflags=-W -Wall -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
[mode::gtk4-debug]
cflags_force=`pkg-config --cflags libSystem gtk4` -fPIC
ldflags_force=`pkg-config --libs libSystem gtk4`
ldflags_force=`pkg-config --libs libSystem gtk+-3.0 x11`
[mode::gtk4-release]
cppflags_force=-I ../include -DNDEBUG
cflags_force=`pkg-config --cflags libSystem gtk4` -fPIC
cflags_force=`pkg-config --cflags libSystem gtk4-x11` -fPIC
cflags=-W -Wall -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
ldflags_force=`pkg-config --libs libSystem gtk4`
ldflags_force=`pkg-config --libs libSystem gtk4-x11`
#targets
[libDesktop]

2
tests/project.conf
View File

@ -5,7 +5,7 @@ ldflags=-pie -Wl,-z,relro -Wl,-z,now
cflags_force=`pkg-config --cflags libSystem gtk+-3.0 x11`
ldflags_force=`pkg-config --libs libSystem gtk+-3.0 x11` $(OBJDIR)../src/libDesktop.a
dist=Makefile,applications/Root.desktop,applications/Widget.desktop,clint.sh,fixme.sh,htmllint.sh,pkgconfig.sh,tests.sh,xmllint.sh
mode=gtk3-debug
mode=gtk4-debug
#modes
[mode::gtk2-debug]

18
tools/project.conf
View File

@ -1,11 +1,11 @@
targets=widget
cppflags_force=-I ../include
cflags_force=`pkg-config --cflags libSystem gtk+-3.0 x11`
cflags_force=`pkg-config --cflags libSystem gtk4-x11`
cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
ldflags_force=`pkg-config --libs libSystem gtk+-3.0 x11` -L $(OBJDIR)../src -lDesktop
ldflags_force=`pkg-config --libs libSystem gtk4-x11` -L $(OBJDIR)../src -lDesktop
ldflags=-pie -Wl,-z,relro -Wl,-z,now
dist=Makefile,subst.sh
mode=gtk3-debug
mode=gtk4-debug
#modes
[mode::gtk2-debug]
@ -18,19 +18,19 @@ cflags_force=`pkg-config --cflags libSystem gtk+-2.0`
cflags=-W -Wall -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
ldflags_force=`pkg-config --libs libSystem gtk+-2.0` -L $(OBJDIR)../src -lDesktop
[mode::gtk3-debug]
cflags_force=`pkg-config --cflags libSystem gtk+-3.0 x11`
ldflags_force=`pkg-config --libs libSystem gtk+-3.0 x11` -L $(OBJDIR)../src -lDesktop
[mode::gtk3-release]
cppflags_force=-I ../include -DNDEBUG
cflags_force=`pkg-config --cflags libSystem gtk+-3.0 x11`
cflags=-W -Wall -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
[mode::gtk4-debug]
cflags_force=`pkg-config --cflags libSystem gtk4`
ldflags_force=`pkg-config --libs libSystem gtk4` -L $(OBJDIR)../src -lDesktop
ldflags_force=`pkg-config --libs libSystem gtk+-3.0 x11` -L $(OBJDIR)../src -lDesktop
[mode::gtk4-release]
cppflags_force=-I ../include -DNDEBUG
cflags_force=`pkg-config --cflags libSystem gtk4`
cflags=-W -Wall -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
ldflags_force=`pkg-config --libs libSystem gtk4` -L $(OBJDIR)../src -lDesktop
#targets
[widget]