diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-07-27 21:30:14 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-07-27 21:30:14 +0100 |
| commit | da69de105291b480992ff628ea9a6a004fd1487c (patch) | |
| tree | c90a1b90a7dd39ef43f8d4d66e446448b3f28a6e | |
| parent | 129f044a0a5d4ca4d9964839efde6ab4f26e6dd0 (diff) | |
Tweak for windows.
| -rw-r--r-- | src/lib/film.cc | 3 | ||||
| -rw-r--r-- | src/tools/makedcp.cc | 3 | ||||
| -rw-r--r-- | wscript | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 9442d746c..a9d6e8f99 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -26,9 +26,6 @@ #include <unistd.h> #include <boost/filesystem.hpp> #include <boost/algorithm/string.hpp> -#ifdef DVDOMATIC_WINDOWS -#include <winsock2.h> -#endif #include "film.h" #include "format.h" #include "tiff_encoder.h" diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc index 772a12eca..f4296f41c 100644 --- a/src/tools/makedcp.cc +++ b/src/tools/makedcp.cc @@ -22,9 +22,6 @@ #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" @@ -25,7 +25,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_VERSION="%s"' % VERSION]) if conf.options.target_windows: - conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS']) + conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN']) conf.options.disable_player = True conf.check(lib = 'ws2_32', uselib_store = 'WINSOCK2', msg = "Checking for library winsock2") boost_lib_suffix = '-mt' |