Commit 1aa522e7 authored by Vivien Kraus's avatar Vivien Kraus
Browse files

Update the flatpak side to permit Gtk+

parent b1407b4e
Pipeline #97488 passed with stages
in 4 minutes
......@@ -5,4 +5,4 @@ Name = The Amazing Rules Of TAROT
Comment = Play the multi-player tarot game version @VERSION@
Exec = tarot
Icon = eu.planete_kraus.Tarot.png
Terminal = true
\ No newline at end of file
Terminal = false
\ No newline at end of file
......@@ -15,8 +15,15 @@
}
],
"config-opts": [
"--enable-silent-rules=yes",
"--disable-introspection",
"--disable-vapigen"
"--disable-vala"
],
"finish-args": [
"--socket=x11",
"--socket=wayland",
"--socket=fallback-x11",
"--share=ipc"
]
}
]
......
......@@ -85,19 +85,15 @@ dist_man_MANS += %reldir%/tarot.6
%canon_reldir%_tarot_LDADD = \
%reldir%/libtarot.la \
%reldir%/libtarot-gobject.la \
src/gtk/libtarot-application-gui.la \
src/gtk/libtarot-application.la \
lib-program/libgnulibrary.la \
$(LTLIBREADLINE) \
$(LIBOPTS_LDADD) \
$(GOBJECT_LIBS) \
$(GTK_LIBS)
else # not WITH_GOBJECT
EXTRA_DIST += %reldir%/main.c \
%reldir%/tarot-opts.c \
%reldir%/tarot-opts.h \
%reldir%/application.c \
%reldir%/application.h \
%reldir%/application.vala \
%reldir%/tarot.6
endif # not WITH_GOBJECT
......
......@@ -20,8 +20,6 @@ AM_VALAFLAGS += \
--pkg gtk+-3.0 \
--gresources %reldir%/tarot-resources.xml
noinst_LTLIBRARIES += \
%reldir%/libtarot-application-gui.la
EXTRA_DIST += \
%reldir%/main_window.ui \
%reldir%/tarot-resources.xml \
......@@ -33,34 +31,39 @@ EXTRA_DIST += \
--target tarot-resources.c \
tarot-resources.xml)
if WITH_GTK
%canon_reldir%_libtarot_application_gui_la_SOURCES = \
%reldir%/tarot_application_with_gui.vala \
%reldir%/engine.c \
%reldir%/tarot_application_without_gui.c
if WITH_GOBJECT
src_tarot_SOURCES += \
%reldir%/tarot-resources.c
endif # WITH_GOBJECT
%canon_reldir%_libtarot_application_gui_la_CFLAGS = \
$(AM_CFLAGS) \
$(GTK_CFLAGS) \
-include "config.h" \
-w
%canon_reldir%_libtarot_application_gui_la_LIBS = \
$(AM_LIBS) \
$(GTK_LIBS)
else # not WITH_GTK
%canon_reldir%_libtarot_application_gui_la_SOURCES = \
noinst_LTLIBRARIES += \
%reldir%/libtarot-application.la
%canon_reldir%_libtarot_application_la_SOURCES = \
%reldir%/tarot_application_without_gui.vala \
%reldir%/engine.vala \
src/tarot-1.0.vapi
%canon_reldir%_libtarot_application_gui_la_CFLAGS = \
if WITH_GTK
%canon_reldir%_libtarot_application_la_SOURCES += \
%reldir%/tarot_application_with_gui.vala
endif # WITH_GTK
%canon_reldir%_libtarot_application_la_CFLAGS = \
$(AM_CFLAGS) \
$(GOBJECT_CFLAGS) \
-include "config.h" \
-w
%canon_reldir%_libtarot_application_gui_la_LIBS = \
$(GOBJECT_LIBS) \
if WITH_GTK
%canon_reldir%_libtarot_application_la_CFLAGS += \
$(GTK_CFLAGS)
else # not WITH_GTK
%canon_reldir%_libtarot_application_la_CFLAGS += \
$(GOBJECT_CFLAGS)
endif # not WITH_GTK
%canon_reldir%_libtarot_application_la_LIBS = \
$(AM_LIBS)
if WITH_GTK
%canon_reldir%_libtarot_application_la_LIBS += \
$(GTK_LIBS)
else # not WITH_GTK
%canon_reldir%_libtarot_application_la_LIBS += \
$(GOBJECT_LIBS)
endif # not WITH_GTK
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment