vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Tue Mar 6 20:48:57 2018 +0200| [a5069565c29edfb2a19f32122ce951acf4f2d35d] | committer: Rémi Denis-Courmont
config: add localedir > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a5069565c29edfb2a19f32122ce951acf4f2d35d --- include/vlc_configuration.h | 1 + src/darwin/dirs.c | 3 +++ src/os2/dirs.c | 3 +++ src/posix/dirs.c | 1 + src/win32/dirs.c | 3 +++ 5 files changed, 11 insertions(+) diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h index cfcd393921..91a38d79b0 100644 --- a/include/vlc_configuration.h +++ b/include/vlc_configuration.h @@ -289,6 +289,7 @@ typedef enum vlc_system_dir VLC_LIBEXEC_DIR, /**< Global executable read-only directory (e.g. /usr/local/libexec). */ VLC_INCLUDE_DIR_RESERVED, + VLC_LOCALE_DIR, /**< Base directory for package read-only locale data. */ } vlc_sysdir_t; /** diff --git a/src/darwin/dirs.c b/src/darwin/dirs.c index afe406a87a..c514e45582 100644 --- a/src/darwin/dirs.c +++ b/src/darwin/dirs.c @@ -122,6 +122,9 @@ char *config_GetSysPath(vlc_sysdir_t type, const char *filename) break; case VLC_SYSDATA_DIR: break; + case VLC_LOCALE_DIR: + dir = config_GetSysPath(VLC_PKG_DATA_DIR, "locale"); + break; default: vlc_assert_unreachable(); } diff --git a/src/os2/dirs.c b/src/os2/dirs.c index e649731a1d..aa364ed23e 100644 --- a/src/os2/dirs.c +++ b/src/os2/dirs.c @@ -78,6 +78,9 @@ char *config_GetSysPath(vlc_sysdir_t type, const char *filename) break; case VLC_SYSDATA_DIR: break; + case VLC_LOCALE_DIR: + dir = config_GetSysPath(VLC_PKG_DATA_DIR, "locale"); + break; default: vlc_assert_unreachable(); } diff --git a/src/posix/dirs.c b/src/posix/dirs.c index 9ecec2dc0e..280a37b2a7 100644 --- a/src/posix/dirs.c +++ b/src/posix/dirs.c @@ -73,6 +73,7 @@ char *config_GetSysPath(vlc_sysdir_t type, const char *filename) [VLC_SYSDATA_DIR] = SYSDATADIR, [VLC_LIB_DIR] = LIBDIR, [VLC_LIBEXEC_DIR] = LIBEXECDIR, + [VLC_LOCALE_DIR] = LOCALEDIR, }; assert(type < ARRAY_SIZE(dirs)); diff --git a/src/win32/dirs.c b/src/win32/dirs.c index 3444384bfe..5489da6286 100644 --- a/src/win32/dirs.c +++ b/src/win32/dirs.c @@ -226,6 +226,9 @@ char *config_GetSysPath(vlc_sysdir_t type, const char *filename) break; case VLC_SYSDATA_DIR: break; + case VLC_LOCALE_DIR: + dir = config_GetSysPath(VLC_PKG_DATA_DIR, "locale"); + break; default: vlc_assert_unreachable(); } _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits