meson.build, SongUpdate: disable db-specific archive code if -Ddatabase=false

Fixes another build failure.

meson.build, SongUpdate: disable db-specific archive code if -Ddatabase=false
bea3b954 · Max Kellermann · 129d8e89 · bea3b954 · bea3b954
Commit bea3b954 authored Nov 04, 2019 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

meson.build meson.build +4 -1

SongUpdate.cxx src/SongUpdate.cxx +2 -2

No files found.
--- a/meson.build
+++ b/meson.build
@@ -385,8 +385,11 @@ endif
 if archive_glue_dep.found()
  sources += [
    'src/TagArchive.cxx',
-    'src/db/update/Archive.cxx',
  ]
+
+  if enable_database
+    sources += ['src/db/update/Archive.cxx']
+  endif
 endif

 if is_windows

--- a/src/SongUpdate.cxx
+++ b/src/SongUpdate.cxx
@@ -98,8 +98,6 @@ Song::UpdateFile(Storage &storage) noexcept
 	return true;
 }

-#endif
-
 #ifdef ENABLE_ARCHIVE

 Song *
@@ -145,6 +143,8 @@ Song::UpdateFileInArchive(ArchiveFile &archive) noexcept

 #endif

+#endif /* ENABLE_DATABASE */
+
 bool
 DetachedSong::LoadFile(Path path) noexcept
 {