-if HAVE_LIBVALA22
-roobuilder_LIBVALA = --pkg libvala-0.22
-endif
-if HAVE_LIBVALA24
-roobuilder_LIBVALA = --pkg libvala-0.24
-endif
-
-if HAVE_LIBVALA26
-roobuilder_LIBVALA = --pkg libvala-0.26
-endif
-
-if HAVE_LIBVALA28
-roobuilder_LIBVALA = --pkg libvala-0.28
-endif
-
-if HAVE_LIBVALA30
-roobuilder_LIBVALA = --pkg libvala-0.30
-endif
-if HAVE_LIBVALA32
-roobuilder_LIBVALA = --pkg libvala-0.32
-endif
-if HAVE_LIBVALA34
-roobuilder_LIBVALA = --pkg libvala-0.34
-endif
+
-if HAVE_LIBVALA36
-roobuilder_LIBVALA = --pkg libvala-0.36
+if HAVE_LIBVALA56
+roobuilder_LIBVALA = --pkg libvala-0.56
+
+roobuilder_CODEGEN = \
+ codegen/valaccode.vala \
+ codegen/valaccodearraymodule.vala \
+ codegen/valaccodeassignmentmodule.vala \
+ codegen/valaccodeattribute.vala \
+ codegen/valaccodebasemodule.vala \
+ codegen/valaccodecompiler.vala \
+ codegen/valaccodecontrolflowmodule.vala \
+ codegen/valaccodedelegatemodule.vala \
+ codegen/valaccodememberaccessmodule.vala \
+ codegen/valaccodemethodcallmodule.vala \
+ codegen/valaccodemethodmodule.vala \
+ codegen/valaccodestructmodule.vala \
+ codegen/valaclassregisterfunction.vala \
+ codegen/valactype.vala \
+ codegen/valaenumregisterfunction.vala \
+ codegen/valagasyncmodule.vala \
+ codegen/valagdbusclientmodule.vala \
+ codegen/valagdbusmodule.vala \
+ codegen/valagdbusservermodule.vala \
+ codegen/valagerrormodule.vala \
+ codegen/valagirwriter.vala \
+ codegen/valaglibvalue.vala \
+ codegen/valagobjectmodule.vala \
+ codegen/valagtkmodule.vala \
+ codegen/valagsignalmodule.vala \
+ codegen/valagtypemodule.vala \
+ codegen/valagvaluemodule.vala \
+ codegen/valagvariantmodule.vala \
+ codegen/valainterfaceregisterfunction.vala \
+ codegen/valastructregisterfunction.vala \
+ codegen/valatyperegisterfunction.vala \
+ ccode/valaccode.vala \
+ ccode/valaccodeassignment.vala \
+ ccode/valaccodebinaryexpression.vala \
+ ccode/valaccodeblock.vala \
+ ccode/valaccodebreakstatement.vala \
+ ccode/valaccodecasestatement.vala \
+ ccode/valaccodecastexpression.vala \
+ ccode/valaccodecommaexpression.vala \
+ ccode/valaccodecomment.vala \
+ ccode/valaccodeconditionalexpression.vala \
+ ccode/valaccodeconstant.vala \
+ ccode/valaccodeconstantidentifier.vala \
+ ccode/valaccodecontinuestatement.vala \
+ ccode/valaccodedeclaration.vala \
+ ccode/valaccodedeclarator.vala \
+ ccode/valaccodedefine.vala \
+ ccode/valaccodedostatement.vala \
+ ccode/valaccodeemptystatement.vala \
+ ccode/valaccodeenum.vala \
+ ccode/valaccodeenumvalue.vala \
+ ccode/valaccodeexpression.vala \
+ ccode/valaccodeexpressionstatement.vala \
+ ccode/valaccodefile.vala \
+ ccode/valaccodeforstatement.vala \
+ ccode/valaccodefragment.vala \
+ ccode/valaccodefunction.vala \
+ ccode/valaccodefunctioncall.vala \
+ ccode/valaccodefunctiondeclarator.vala \
+ ccode/valaccodeggnucsection.vala \
+ ccode/valaccodegotostatement.vala \
+ ccode/valaccodeidentifier.vala \
+ ccode/valaccodeifstatement.vala \
+ ccode/valaccodeincludedirective.vala \
+ ccode/valaccodeinitializerlist.vala \
+ ccode/valaccodeinvalidexpression.vala \
+ ccode/valaccodelabel.vala \
+ ccode/valaccodelinedirective.vala \
+ ccode/valaccodeifsection.vala \
+ ccode/valaccodemacroreplacement.vala \
+ ccode/valaccodememberaccess.vala \
+ ccode/valaccodemodifiers.vala \
+ ccode/valaccodenewline.vala \
+ ccode/valaccodenode.vala \
+ ccode/valaccodeoncesection.vala \
+ ccode/valaccodeparameter.vala \
+ ccode/valaccodeparenthesizedexpression.vala \
+ ccode/valaccodereturnstatement.vala \
+ ccode/valaccodestatement.vala \
+ ccode/valaccodestruct.vala \
+ ccode/valaccodeswitchstatement.vala \
+ ccode/valaccodetypedefinition.vala \
+ ccode/valaccodeunaryexpression.vala \
+ ccode/valaccodevariabledeclarator.vala \
+ ccode/valaccodewhilestatement.vala \
+ ccode/valaccodewriter.vala \
+ ccode/valaccodeelementaccess.vala
+
endif
-
# gda
roobuilder_GDA = --pkg libgda-5.0
endif
-if HAVE_GDA4
-roobuilder_GDA = --pkg libgda-4.0
-endif
+
# webkit
-if HAVE_WEBKIT4
-roobuilder_WEBKKIT = --pkg webkit2gtk-4.0
+if HAVE_WEBKIT6
+roobuilder_WEBKKIT = --pkg webkitgtk-6.0
endif
-if HAVE_WEBKIT3
-roobuilder_WEBKKIT = --pkg webkit2gtk-3.0
-endif
+
# vte
# - not sure if needed....
-AM_CPPFLAGS = $(ROOBUILDER_CFLAGS) $(WEBKIT_CFLAGS) $(GDA_CFLAGS) $(LIBVALA_CFLAGS) $(JAVASCRIPTCOREGTK_CFLAGS) $(VTE_CFLAGS)
-
+AM_CPPFLAGS = $(ROOBUILDER_CFLAGS) $(WEBKIT_CFLAGS) $(GDA_CFLAGS) $(LIBVALA_CFLAGS) $(JAVASCRIPTCOREGTK_CFLAGS) \
+ -Wno-incompatible-pointer-types \
+ -Wno-discarded-qualifiers \
+ -Wno-deprecated-declarations \
+ -Wno-pointer-to-int-cast
bin_PROGRAMS = roobuilder
-roobuilder_PKGS = \
- --pkg glib-2.0 \
+roobuilder_PKGS = --pkg glib-2.0 \
--pkg gobject-2.0 \
- --pkg gtk+-3.0 \
- --pkg gtksourceview-3.0 \
+ --pkg gtk4 \
+ --pkg gtksourceview-5 \
--pkg libxml-2.0 \
--pkg json-glib-1.0 \
--pkg gee-0.8 \
--pkg gobject-introspection-1.0 \
- --pkg clutter-gtk-1.0 \
- --pkg libsoup-2.4 \
- --pkg javascriptcore \
- --pkg roojspacker-1.1 \
+ --pkg libsoup-3.0 \
+ --pkg roojspacker-1.4 \
$(roobuilder_LIBVALA) \
$(roobuilder_GDA) \
$(roobuilder_WEBKKIT) \
$(roobuilder_JAVASCRIPTCOREGTK) \
- $(roobuilder_VTE) \
- --pkg posix
+ --pkg posix
+#
+# JsRender/Flutter.vala
+# --pkg javascriptcore
-BUIDERJSRENDER = \
- JsRender/Gtk.vala \
+BUIDERJSRENDER = JsRender/Gtk.vala \
JsRender/PlainFile.vala \
+ JsRender/JsonGen.vala \
JsRender/JsRender.vala \
JsRender/Lang.vala \
- JsRender/NodeToGtk.vala \
+ JsRender/NodeProp.vala \
JsRender/NodeToJs.vala \
JsRender/NodeToVala.vala \
+ JsRender/NodeToGlade.vala \
JsRender/Node.vala \
- JsRender/Roo.vala
-
-
+ JsRender/Roo.vala \
+ JsRender/Dir.vala
+
+# JsRender/NodeToGtk.vala
+# Palete/Flutter.vala
-BUIDERPALETE = \
- Palete/Gir.vala \
+BUIDERPALETE = Palete/Gir.vala \
Palete/GirObject.vala \
Palete/VapiParser.vala \
Palete/Gtk.vala \
Palete/RooDatabase.vala \
- c/jscore_object_call_as_function.c \
- Palete/Javascript.vala \
Palete/Palete.vala \
Palete/Roo.vala \
Palete/ValaSource.vala \
Palete/ValaSourceCompiler.vala \
- Palete/CompletionProvider.vala
-
-BUIDERPROJECT = \
- Project/Gtk.vala \
+ Palete/CompletionProvider.vala \
+ Palete/CompileError.vala \
+ Palete/ValaCompileRequest.vala \
+ Palete/ValaCompileQueue.vala \
+ Palete/Javascript.vala \
+ $(roobuilder_CODEGEN)
+
+# c/jscore_object_call_as_function.c \
+# Project/Flutter.vala
+# Palete/Javascript.vala
+
+
+BUIDERPROJECT = Project/Gtk.vala \
Project/Project.vala \
- Project/Roo.vala
+ Project/Roo.vala \
+ Project/VapiSelection.vala \
+ Project/Meson.vala \
+ Project/GtkValaSettings.vala
-BUIDERUI = \
- Builder4/About.vala \
+BUIDERUI = Builder4/About.vala \
Builder4/DialogConfirm.vala \
Builder4/StandardErrorDialog.vala \
Builder4/DialogSaveTemplate.vala \
Builder4/EditProject.vala \
Builder4/Editor.vala \
Builder4/RooProjectSettings.vala \
- Builder4/WindowRightPalete.vala \
+ Builder4/PopoverAddObject.vala \
Builder4/WindowLeftTree.vala \
Builder4/WindowRooView.vala \
Builder4/WindowLeftProps.vala \
- Builder4/ClutterFiles.vala \
- Builder4/WindowLeftProjects.vala \
- Builder4/WindowAddProp.vala \
+ Builder4/PopoverAddProp.vala \
Builder4/GtkView.vala \
Builder4/ValaProjectSettingsPopover.vala \
Builder4/MainWindow.vala \
Builder4/WindowState.vala \
Builder4/FakeServer.vala \
- Builder4/DialogPluginWebkit.vala \
- Builder4/DialogNewComponent.vala \
Builder4/PopoverFileDetails.vala \
Builder4/ValaCompileErrors.vala \
Builder4/ValaCompileResults.vala \
- Builder4/PopoverProperty.vala
+ Builder4/PopoverProperty.vala \
+ Builder4/DialogFiles.vala
-roobuilder_SOURCES = \
- Application.vala \
+roobuilder_SOURCES = Application.vala \
Main.vala \
Spawn.vala \
Resources.vala \
-
+# removed -X -lm
-roobuilder_VALAFLAGS = \
- --thread -X -lm --target-glib=2.32 --vapidir=$(srcdir)/vapi -g $(roobuilder_PKGS)
+roobuilder_VALAFLAGS =--target-glib=2.32 --vapidir=$(srcdir)/vapi -g $(roobuilder_PKGS)
-roobuilder_LDADD = $(ROOBUILDER_LIBS) $(LIBVALA_LIBS) $(GDA_LIBS) $(WEBKIT_LIBS) $(VTE_LIBS) $(JAVASCRIPTCOREGTK_LIBS)
+roobuilder_LDADD = $(ROOBUILDER_LIBS) $(LIBVALA_LIBS) $(GDA_LIBS) $(WEBKIT_LIBS) $(JAVASCRIPTCOREGTK_LIBS)