diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-07-22 18:39:25 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-07-22 18:39:25 +0100 |
| commit | 29166b5a777134922e8ed1bcaec7124b2b16b6d0 (patch) | |
| tree | c95f57ba4987c1178aecbc32071bb95f698c9112 /src | |
| parent | d6f7c7288c8d3cd612236b1f4041cc4959554d2f (diff) | |
Add cross header.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/fixlengths.cc | 1 | ||||
| -rw-r--r-- | src/tools/makedcp.cc | 11 | ||||
| -rw-r--r-- | src/tools/servomatic.cc | 2 | ||||
| -rw-r--r-- | src/tools/wscript | 4 |
4 files changed, 15 insertions, 3 deletions
diff --git a/src/tools/fixlengths.cc b/src/tools/fixlengths.cc index 52696cd8b..16c5de805 100644 --- a/src/tools/fixlengths.cc +++ b/src/tools/fixlengths.cc @@ -24,6 +24,7 @@ #include <sndfile.h> #include <boost/filesystem.hpp> #include "lib/film.h" +#include "lib/cross.h" using namespace std; using namespace boost; diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc index fef0dd016..9d2088ca3 100644 --- a/src/tools/makedcp.cc +++ b/src/tools/makedcp.cc @@ -22,6 +22,9 @@ #include <getopt.h> #include <libdcp/test_mode.h> #include <libdcp/version.h> +#ifdef DVDOMATIC_WINDOWS +#include "winsock2.h" +#endif #include "format.h" #include "film.h" #include "filter.h" @@ -133,8 +136,14 @@ main (int argc, char* argv[]) bool all_done = false; bool first = true; while (!all_done) { - + +#ifdef DVDOMATIC_POSIX sleep (5); +#endif + +#ifdef DVDOMATIC_WINDOWS + /* XXX */ +#endif if (!first && progress) { cout << "\033[" << jobs.size() << "A"; diff --git a/src/tools/servomatic.cc b/src/tools/servomatic.cc index b312af352..74be41e39 100644 --- a/src/tools/servomatic.cc +++ b/src/tools/servomatic.cc @@ -24,9 +24,11 @@ #include <vector> #include <unistd.h> #include <errno.h> +#ifdef DVDOMATIC_POSIX #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> +#endif #include <boost/algorithm/string.hpp> #include <boost/thread.hpp> #include <boost/thread/mutex.hpp> diff --git a/src/tools/wscript b/src/tools/wscript index 919c98e3f..95af35aa2 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -1,5 +1,5 @@ def build(bld): - for t in ['makedcp', 'servomatic', 'servomatictest', 'fixlengths']: + for t in ['makedcp', 'fixlengths']: obj = bld(features = 'cxx cxxprogram') obj.uselib = 'BOOST_THREAD' obj.includes = ['..'] @@ -8,7 +8,7 @@ def build(bld): obj.target = t if not bld.env.DISABLE_GUI: - for t in ['dvdomatic', 'playomatic', 'alignomatic']: + for t in ['dvdomatic', 'alignomatic']: obj = bld(features = 'cxx cxxprogram') obj.uselib = 'BOOST_THREAD GTKMM' obj.includes = ['..'] |