Commit 6b30d5c0 authored by Jens Georg's avatar Jens Georg

Integrate map support into meson

parent 0a3e0b0d
......@@ -35,6 +35,15 @@
<file preprocess="xml-stripblanks">ui/tags.ui</file>
<file preprocess="xml-stripblanks">ui/textentrydialog.ui</file>
<file preprocess="xml-stripblanks">ui/trash.ui</file>
<!-- Map icons -->
<file>icons/hicolor/scalable/actions/gps-marker-highlighted.svg</file>
<file>icons/hicolor/scalable/actions/gps-marker-selected.svg</file>
<file>icons/hicolor/scalable/actions/gps-markers-many-highlighted.svg</file>
<file>icons/hicolor/scalable/actions/gps-markers-many-selected.svg</file>
<file>icons/hicolor/scalable/actions/gps-markers-many.svg</file>
<file>icons/hicolor/scalable/actions/gps-marker.svg</file>
<file>icons/hicolor/scalable/actions/map-edit-locked.svg</file>
<file>icons/hicolor/scalable/actions/map-edit-unlocked.svg</file>
<!-- Icons -->
<file>icons/hicolor/scalable/actions/avatar-default-symbolic.svg</file>
<file>icons/image-missing.png</file>
......
......@@ -53,7 +53,11 @@ gexiv2 = dependency('gexiv2', version: '>= 0.11.0')
libraw = dependency('libraw', version : '>= 0.13.2')
libexif = dependency('libexif', version : '>= 0.6.16')
unity = dependency('unity', required : false)
champlain = dependency('champlain-0.12')
champlain_gtk = dependency('champlain-gtk-0.12')
clutter = dependency('clutter-1.0')
clutter_gtk = dependency('clutter-gtk-1.0')
webpdemux = dependency('libwebpdemux')
webp = dependency('libwebp')
......
......@@ -82,14 +82,14 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const int ICON_FILTER_REJECTED_OR_BETTER_FIXED_SIZE = 32;
public const int ICON_FILTER_UNRATED_OR_BETTER_FIXED_SIZE = 16;
public const int ICON_ZOOM_SCALE = 16;
public const string ICON_GPS_MARKER = "gps-marker.svg";
public const string ICON_GPS_MARKER_HIGHLIGHTED = "gps-marker-highlighted.svg";
public const string ICON_GPS_MARKER_SELECTED = "gps-marker-selected.svg";
public const string ICON_GPS_GROUP_MARKER = "gps-markers-many.svg";
public const string ICON_GPS_GROUP_MARKER_HIGHLIGHTED = "gps-markers-many-highlighted.svg";
public const string ICON_GPS_GROUP_MARKER_SELECTED = "gps-markers-many-selected.svg";
public const string ICON_MAP_EDIT_LOCKED = "map-edit-locked.svg";
public const string ICON_MAP_EDIT_UNLOCKED = "map-edit-unlocked.svg";
public const string ICON_GPS_MARKER = "gps-marker";
public const string ICON_GPS_MARKER_HIGHLIGHTED = "gps-marker-highlighted";
public const string ICON_GPS_MARKER_SELECTED = "gps-marker-selected";
public const string ICON_GPS_GROUP_MARKER = "gps-markers-many";
public const string ICON_GPS_GROUP_MARKER_HIGHLIGHTED = "gps-markers-many-highlighted";
public const string ICON_GPS_GROUP_MARKER_SELECTED = "gps-markers-many-selected";
public const string ICON_MAP_EDIT_LOCKED = "map-edit-locked";
public const string ICON_MAP_EDIT_UNLOCKED = "map-edit-unlocked";
public const string ICON_CAMERAS = "camera-photo-symbolic";
public const string ICON_EVENTS = "multiple-events-symbolic";
......
......@@ -41,7 +41,9 @@ endif
shotwell_deps = [gio, gee, sqlite, gtk, sqlite, posix, gphoto2,
gstreamer_pbu, gio_unix, gudev, gexiv2, gmodule,
libraw, libexif, sw_plugin, webpdemux, webp, version]
libraw, libexif, sw_plugin, webpdemux, webp, version,
clutter, clutter_gtk, champlain, champlain_gtk]
if unity_available
shotwell_deps += [unity]
endif
......@@ -185,6 +187,7 @@ executable('shotwell',
'Box.vala',
'Photo.vala',
'Orientation.vala',
'MapWidget.vala',
'BatchImport.vala',
'Dialogs.vala',
'Resources.vala',
......
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