From: Carl Hetherington <cth@carlh.net>
Date: Sat, 1 Dec 2012 19:00:02 +0000 (+0000)
Subject: Merge branch 'new-env-test'
X-Git-Tag: v2.0.48~1509^2~13
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=42410ff820cf885a4b26c24c6c5c9d759dadbf2f;hp=524e8a3b57652195f78d8bfd1c13233a8ed7b669;p=dcpomatic.git

Merge branch 'new-env-test'
---

diff --git a/builds/windows-32 b/builds/windows-32
index 72fb359d1..2a4d60aa1 100755
--- a/builds/windows-32
+++ b/builds/windows-32
@@ -2,14 +2,18 @@
 
 export MINGW_CXX="i686-w64-mingw32-g++"
 export MINGW_WINDRES="i686-w64-mingw32-windres"
-export MINGW_PREFIX="/usr/i686-w64-mingw32"
-export WINDOWS_PREFIX="/home/carl/Environments/windows"
+export MINGW_PREFIX="/home/carl/mingw/i686-w64-mingw32"
+export MINGW_PATH="/home/carl/mingw/bin"
+export WINDOWS_PREFIX="/home/carl/Environments/windows/32"
 
 export PKG_CONFIG_LIBDIR=$WINDOWS_PREFIX/lib/pkgconfig
 
 ./waf clean
 
-export PATH=$WINDOWS_PREFIX/bin:$PATH
+export PATH=$WINDOWS_PREFIX/bin:$MINGW_PATH:$PATH
+
+echo -n "USING COMPILER "
+which i686-w64-mingw32-g++
 
 CXX=$MINGW_CXX WINRC=$MINGW_WINDRES \
   CXXFLAGS="-I$WINDOWS_PREFIX/include -I$MINGW_PREFIX/include" \
diff --git a/builds/windows-64 b/builds/windows-64
index a9fd56172..b87c5ca4f 100755
--- a/builds/windows-64
+++ b/builds/windows-64
@@ -2,14 +2,18 @@
 
 export MINGW_CXX="x86_64-w64-mingw32-g++"
 export MINGW_WINDRES="x86_64-w64-mingw32-windres"
-export MINGW_PREFIX="/usr/x86_64-w64-mingw32"
-export WINDOWS_PREFIX="/home/carl/Environments/windows-64"
+export MINGW_PREFIX="/home/carl/mingw/x86_64-w64-mingw32"
+export MINGW_PATH="/home/carl/mingw/bin"
+export WINDOWS_PREFIX="/home/carl/Environments/windows/64"
 
 export PKG_CONFIG_LIBDIR=$WINDOWS_PREFIX/lib/pkgconfig
 
 ./waf clean
 
-export PATH=$WINDOWS_PREFIX/bin:$PATH
+export PATH=$WINDOWS_PREFIX/bin:$MINGW_PATH:$PATH
+
+echo -n "USING COMPILER "
+which x86_64-w64-mingw32-g++
 
 CXX=$MINGW_CXX WINRC=$MINGW_WINDRES \
   CXXFLAGS="-I$WINDOWS_PREFIX/include -I$MINGW_PREFIX/include" \
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 2d9780b52..20ec8fb16 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -53,6 +53,7 @@ class Encoder
 {
 public:
 	Encoder (boost::shared_ptr<const Film> f, boost::shared_ptr<const Options> o);
+	virtual ~Encoder () {}
 
 	/** Called to indicate that a processing run is about to begin */
 	virtual void process_begin (int64_t audio_channel_layout) = 0;
diff --git a/src/lib/film.h b/src/lib/film.h
index 049af45e2..32456dfda 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -340,7 +340,7 @@ public:
 	void set_directory (std::string);
 	void set_name (std::string);
 	void set_use_dci_name (bool);
-	virtual void set_content (std::string);
+	void set_content (std::string);
 	void set_dcp_content_type (DCPContentType const *);
 	void set_format (Format const *);
 	void set_crop (Crop);
diff --git a/src/lib/job.h b/src/lib/job.h
index b09964cf9..41cefb9be 100644
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -39,6 +39,7 @@ class Job : public boost::enable_shared_from_this<Job>
 {
 public:
 	Job (boost::shared_ptr<Film> s, boost::shared_ptr<Job> req);
+	virtual ~Job() {}
 
 	/** @return user-readable name of this job */
 	virtual std::string name () const = 0;
diff --git a/windows/installer.nsi.32.in b/windows/installer.nsi.32.in
index 79cd65ae1..dd24e3497 100644
--- a/windows/installer.nsi.32.in
+++ b/windows/installer.nsi.32.in
@@ -33,7 +33,7 @@ File "%deps%/bin/avfilter-3.dll"
 File "%deps%/bin/avformat-54.dll"
 File "%deps%/bin/avutil-51.dll"
 File "%deps%/bin/dcp.dll"
-File "%deps%/bin/intl.dll"
+File "%deps%/bin/libintl-8.dll"
 File "%deps%/bin/kumu-libdcp.dll"
 File "%deps%/bin/libboost_chrono-mt.dll"
 File "%deps%/bin/libboost_filesystem-mt.dll"
@@ -45,12 +45,13 @@ File "%deps%/bin/libgcc_s_sjlj-1.dll"
 File "%deps%/bin/libgio-2.0-0.dll"
 File "%deps%/bin/libglib-2.0-0.dll"
 File "%deps%/bin/libgobject-2.0-0.dll"
-File "%deps%/bin/libjpeg-7.dll"
+File "%deps%/bin/libiconv-2.dll"
+File "%deps%/bin/libjpeg-8.dll"
 File "%deps%/bin/libMagick++-5.dll"
 File "%deps%/bin/libMagickCore-5.dll"
 File "%deps%/bin/libMagickWand-5.dll"
 File "%deps%/bin/libopenjpeg-1.dll"
-File "%deps%/bin/libpng14-14.dll"
+File "%deps%/bin/libpng15-15.dll"
 File "%deps%/bin/libsigc-2.0-0.dll"
 File "%deps%/bin/libsndfile-1.dll"
 File "%deps%/bin/libssh.dll"
@@ -64,17 +65,13 @@ File "%deps%/bin/wxbase28_gcc_custom.dll"
 File "%deps%/bin/wxmsw28_core_gcc_custom.dll"
 File "%deps%/bin/wxmsw28_adv_gcc_custom.dll"
 File "%deps%/bin/libcairo-2.dll"
-File "%deps%/bin/libfontconfig-1.dll"
-File "%deps%/bin/libexpat-1.dll"
-File "%deps%/bin/freetype6.dll"
+File "%deps%/bin/libfreetype-6.dll"
 File "%deps%/bin/libgthread-2.0-0.dll"
 File "%deps%/bin/libpango-1.0-0.dll"
 File "%deps%/bin/libgmodule-2.0-0.dll"
 File "%deps%/bin/libpangocairo-1.0-0.dll"
-File "%deps%/bin/libpangoft2-1.0-0.dll"
 File "%deps%/bin/libpangowin32-1.0-0.dll"
-File "%deps%/bin/libtiff3.dll"
-File "%deps%/bin/jpeg62.dll"
+File "%deps%/bin/libtiff-5.dll"
 File "%deps%/bin/libglibmm-2.4-1.dll"
 File "%deps%/bin/libxml++-2.6-2.dll"
 File "%deps%/bin/libxml2-2.dll"
diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in
index 7820d0078..e0f55202c 100644
--- a/windows/installer.nsi.64.in
+++ b/windows/installer.nsi.64.in
@@ -55,11 +55,13 @@ File "%deps%/bin/libgcc_s_sjlj-1.dll"
 File "%deps%/bin/libgio-2.0-0.dll"
 File "%deps%/bin/libglib-2.0-0.dll"
 File "%deps%/bin/libgobject-2.0-0.dll"
+File "%deps%/bin/libiconv-2.dll"
+File "%deps%/bin/libjpeg-8.dll"
 File "%deps%/bin/libMagick++-5.dll"
 File "%deps%/bin/libMagickCore-5.dll"
 File "%deps%/bin/libMagickWand-5.dll"
 File "%deps%/bin/libopenjpeg-1.dll"
-File "%deps%/bin/libpng14-14.dll"
+File "%deps%/bin/libpng15-15.dll"
 File "%deps%/bin/libsigc-2.0-0.dll"
 File "%deps%/bin/libsndfile-1.dll"
 File "%deps%/bin/libssh.dll"
@@ -73,17 +75,13 @@ File "%deps%/bin/wxbase28_gcc_custom.dll"
 File "%deps%/bin/wxmsw28_core_gcc_custom.dll"
 File "%deps%/bin/wxmsw28_adv_gcc_custom.dll"
 File "%deps%/bin/libcairo-2.dll"
-File "%deps%/bin/libfontconfig-1.dll"
-File "%deps%/bin/libexpat-1.dll"
 File "%deps%/bin/libfreetype-6.dll"
 File "%deps%/bin/libgthread-2.0-0.dll"
 File "%deps%/bin/libpango-1.0-0.dll"
 File "%deps%/bin/libgmodule-2.0-0.dll"
 File "%deps%/bin/libpangocairo-1.0-0.dll"
-File "%deps%/bin/libpangoft2-1.0-0.dll"
 File "%deps%/bin/libpangowin32-1.0-0.dll"
 File "%deps%/bin/libtiff-5.dll"
-File "%deps%/bin/libjpeg-8.dll"
 File "%deps%/bin/libglibmm-2.4-1.dll"
 File "%deps%/bin/libxml++-2.6-2.dll"
 File "%deps%/bin/libxml2-2.dll"