diff options
| -rw-r--r-- | src/tools/dvdomatic.cc | 3 | ||||
| -rw-r--r-- | windows/installer.nsi.32.in | 2 | ||||
| -rw-r--r-- | windows/installer.nsi.64.in | 2 | ||||
| -rw-r--r-- | wscript | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index 230e02c88..084e0fff7 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -456,9 +456,6 @@ setup_i18n () #ifdef __WXGTK__ locale->AddCatalogLookupPathPrefix (wxT (LOCALE_PREFIX "/locale")); #endif -#ifdef __WXMSW__ - locale->AddCatalogLookupPathPrefix (wxT ("../locale")); -#endif locale->AddCatalog (wxT ("libdvdomatic-wx")); locale->AddCatalog (wxT ("dvdomatic")); diff --git a/windows/installer.nsi.32.in b/windows/installer.nsi.32.in index c90c97e71..5383907d5 100644 --- a/windows/installer.nsi.32.in +++ b/windows/installer.nsi.32.in @@ -93,7 +93,7 @@ File "%deps%/etc/ImageMagick/delegates.xml" SetOutPath "$PROFILE\.magick" File "%deps%/etc/ImageMagick/delegates.xml" -SetOutPath "$INSTDIR\locale\fr_FR" +SetOutPath "$INSTDIR\bin\fr_FR" File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo" File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo" diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in index 6f7bc5830..5b3f48546 100644 --- a/windows/installer.nsi.64.in +++ b/windows/installer.nsi.64.in @@ -103,7 +103,7 @@ File "%deps%/etc/ImageMagick/delegates.xml" SetOutPath "$PROFILE\.magick" File "%deps%/etc/ImageMagick/delegates.xml" -SetOutPath "$INSTDIR\locale\fr_FR" +SetOutPath "$INSTDIR\bin\fr_FR" File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo" File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo" @@ -54,7 +54,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-O2') if not conf.options.static: - conf.check_cfg(package = 'libdcp', atleast_version = '0.40', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) + conf.check_cfg(package = 'libdcp', atleast_version = '0.41', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) conf.check_cfg(package = 'libavformat', args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = True) conf.check_cfg(package = 'libavfilter', args = '--cflags --libs', uselib_store = 'AVFILTER', mandatory = True) conf.check_cfg(package = 'libavcodec', args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = True) |