diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-02-27 23:50:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-02-29 21:51:47 +0100 |
| commit | adeab682b76138d7a05bab3943af23cd57e2bc57 (patch) | |
| tree | 4e0aaaf989365b2f907a9be4df8b6d16d02b9ee5 /src/lib | |
| parent | c403e757cf0b029954fe18dc969314bfb179412f (diff) | |
Move swaroop playlist editor stuff into its own swaroop_
files.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/swaroop_spl.cc (renamed from src/lib/spl.cc) | 2 | ||||
| -rw-r--r-- | src/lib/swaroop_spl.h (renamed from src/lib/spl.h) | 2 | ||||
| -rw-r--r-- | src/lib/swaroop_spl_entry.cc (renamed from src/lib/spl_entry.cc) | 2 | ||||
| -rw-r--r-- | src/lib/swaroop_spl_entry.h (renamed from src/lib/spl_entry.h) | 4 | ||||
| -rw-r--r-- | src/lib/wscript | 5 |
5 files changed, 8 insertions, 7 deletions
diff --git a/src/lib/spl.cc b/src/lib/swaroop_spl.cc index e8e86f89c..02ed966a4 100644 --- a/src/lib/spl.cc +++ b/src/lib/swaroop_spl.cc @@ -18,7 +18,7 @@ */ -#include "spl.h" +#include "swaroop_spl.h" #include "content_store.h" #include <libcxml/cxml.h> #include <dcp/raw_convert.h> diff --git a/src/lib/spl.h b/src/lib/swaroop_spl.h index 18892993f..308f5286d 100644 --- a/src/lib/spl.h +++ b/src/lib/swaroop_spl.h @@ -21,7 +21,7 @@ #ifndef DCPOMATIC_SPL_H #define DCPOMATIC_SPL_H -#include "spl_entry.h" +#include "swaroop_spl_entry.h" #include <dcp/util.h> class ContentStore; diff --git a/src/lib/spl_entry.cc b/src/lib/swaroop_spl_entry.cc index a2f36317e..ed5a469ac 100644 --- a/src/lib/spl_entry.cc +++ b/src/lib/swaroop_spl_entry.cc @@ -18,7 +18,7 @@ */ -#include "spl_entry.h" +#include "swaroop_spl_entry.h" #include "dcp_content.h" #include "dcpomatic_assert.h" #include <libxml++/libxml++.h> diff --git a/src/lib/spl_entry.h b/src/lib/swaroop_spl_entry.h index d939ec66a..75e0b5223 100644 --- a/src/lib/spl_entry.h +++ b/src/lib/swaroop_spl_entry.h @@ -18,8 +18,8 @@ */ -#ifndef DCPOMATIC_SPL_ENTRY_H -#define DCPOMATIC_SPL_ENTRY_H +#ifndef DCPOMATIC_SWAROOP_SPL_ENTRY_H +#define DCPOMATIC_SWAROOP_SPL_ENTRY_H #include <libcxml/cxml.h> #include <dcp/types.h> diff --git a/src/lib/wscript b/src/lib/wscript index 31071bf7a..6ef41e91e 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -150,8 +150,6 @@ sources = """ server.cc shuffler.cc state.cc - spl.cc - spl_entry.cc string_log_entry.cc string_text_file.cc string_text_file_content.cc @@ -201,6 +199,9 @@ def build(bld): obj.source = sources + ' version.cc' + if bld.env.VARIANT == 'swaroop-theater' or bld.env.VARIANT == 'swaroop-studio': + obj.source += ' swaroop_spl.cc swaroop_spl_entry.cc' + if bld.env.TARGET_WINDOWS: obj.uselib += ' WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE' if bld.env.STATIC_DCPOMATIC: |