summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b5c566d)
"Version 5.0. The user's profile folder. A typical path is C:\Documents and Settings\username. Applications should not create files or folders at this level;"
Should fix also the skins2 location (#1787)
#include <assert.h>
#include <limits.h>
#include <assert.h>
#include <limits.h>
+#if defined( WIN32 )
+# define DIR_SHARE ""
+#else
+# define DIR_SHARE "share"
+#endif
+
/**
* config_GetDataDir: find directory where shared data is installed
*
/**
* config_GetDataDir: find directory where shared data is installed
*
- snprintf( path, sizeof( path ), "%s/share",
+ snprintf( path, sizeof( path ), "%s" DIR_SEP DIR_SHARE,
vlc_global()->psz_vlcpath );
path[sizeof( path ) - 1] = '\0';
}
vlc_global()->psz_vlcpath );
path[sizeof( path ) - 1] = '\0';
}
- snprintf( path, sizeof( path ), "%s"DIR_SEP"share", /* FIXME: Duh? */
+ snprintf( path, sizeof( path ), "%s"DIR_SEP DIR_SHARE, /* FIXME: Duh? */
vlc_global()->psz_vlcpath );
path[sizeof( path ) - 1] = '\0';
}
vlc_global()->psz_vlcpath );
path[sizeof( path ) - 1] = '\0';
}
# else
/* Get the "Application Data" folder for the current user */
if( S_OK == SHGetFolderPathW( NULL,
# else
/* Get the "Application Data" folder for the current user */
if( S_OK == SHGetFolderPathW( NULL,
- (b_appdata ? CSIDL_APPDATA : CSIDL_PROFILE) | CSIDL_FLAG_CREATE,
+ (b_appdata ? CSIDL_APPDATA : CSIDL_PERSONAL) | CSIDL_FLAG_CREATE,
NULL, SHGFP_TYPE_CURRENT, wdir ) )
# endif
{
NULL, SHGFP_TYPE_CURRENT, wdir ) )
# endif
{