diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-07-24 21:04:07 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-07-24 21:04:07 +0100 |
| commit | 22a11cdfca0c56a71e26d57b92a109561898bc25 (patch) | |
| tree | e93604a6b5044728f3275c4802281ecd07ea0a55 /src | |
| parent | c3f570d41a1142c5597c16a8677d24a71f61d497 (diff) | |
Save config in the right place cross-platform.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/config.cc | 9 | ||||
| -rw-r--r-- | src/lib/wscript | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 6d31ccd9e..92044d81a 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -20,6 +20,8 @@ #include <sstream> #include <cstdlib> #include <fstream> +#include <glib.h> +#include <boost/filesystem.hpp> #include "config.h" #include "server.h" #include "scaler.h" @@ -93,9 +95,10 @@ Config::Config () string Config::file () const { - stringstream s; - s << getenv ("HOME") << "/.dvdomatic"; - return s.str (); + filesystem::path p; + p /= g_get_user_config_dir (); + p /= ".dvdomatic"; + return p.string (); } /** @return Singleton instance */ diff --git a/src/lib/wscript b/src/lib/wscript index 75f7edded..afc916605 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -7,7 +7,7 @@ def build(bld): obj = bld(features = 'cxx cxxshlib') obj.name = 'libdvdomatic' obj.export_includes = ['.'] - obj.uselib = 'AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE SNDFILE BOOST_FILESYSTEM BOOST_THREAD OPENJPEG POSTPROC TIFF SIGC++ MAGICK SSH DCP' + obj.uselib = 'AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE SNDFILE BOOST_FILESYSTEM BOOST_THREAD OPENJPEG POSTPROC TIFF SIGC++ MAGICK SSH DCP GLIB' if bld.env.TARGET_WINDOWS: obj.uselib += ' WINSOCK2' if bld.env.DEBUG_HASH: |