diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2005-09-05 17:02:56 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2005-09-05 17:02:56 +0000 |
| commit | 69a1b10dd38c06f34747e7a55d62fdfcec2883cc (patch) | |
| tree | e10fd932e747549b9c88d3af4fa0dd81a8eb17e1 /win32/include/msvc | |
| parent | b8578b7dfbada9cb57940bfec5b844ea0e871970 (diff) | |
| download | xine-lib-69a1b10dd38c06f34747e7a55d62fdfcec2883cc.tar.gz xine-lib-69a1b10dd38c06f34747e7a55d62fdfcec2883cc.tar.bz2 | |
*BUGFIX*
Build improvements and WIN32 port updates:
- add --with-pthread-pefix and --with-zlib-pefix options
- prepare for removing internal zlib and pthreads-win32 relics,
updated documentation for possible WIN32 developers (only for me? :->)
- fixed bug in unimportant part of configure.ac for MinGW due to xine paths
- fixed my bug in cdda (but it compiled fine anyway)
- fixed unimportant bug in planar Makefile.am
- next MSVC update due to external zlib, pthreads and latest changes,
removed relic includes
- checked distcheck
CVS patchset: 7719
CVS date: 2005/09/05 17:02:56
Diffstat (limited to 'win32/include/msvc')
| -rw-r--r-- | win32/include/msvc/config.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/win32/include/msvc/config.h b/win32/include/msvc/config.h index a0d35a972..1429047e0 100644 --- a/win32/include/msvc/config.h +++ b/win32/include/msvc/config.h @@ -17,6 +17,7 @@ * HAVE_WIN32_CDROM 1 * X_DISPLAY_MISSING 1 * HAVE_MEMCPY 1 + * XINE_REL_PLUGINDIR "lib\\xine\\plugins" * Disable: * esd, arts, alsa, gnome_vfs, png, sdl, speex, x11, theora */ @@ -556,10 +557,10 @@ #define XINE_ACFLAGS "-I ${prefix}/share/aclocal" /* Define this to osd fonts dir location */ -#define XINE_FONTDIR exec_path_append_subdir("fonts") +#define XINE_FONTDIR xine_get_fontdir() /* Path where catalog files will be. */ -#define XINE_LOCALEDIR exec_path_append_subdir("locale") +#define XINE_LOCALEDIR xine_get_localedir() /* xine major version number */ #define XINE_MAJOR 1 @@ -568,7 +569,7 @@ #define XINE_MINOR 0 /* Define this to plugins directory location */ -#define XINE_PLUGINDIR exec_path_append_subdir("plugins") +#define XINE_PLUGINDIR xine_get_plugindir() /* xine sub version number */ #define XINE_SUB 0 @@ -610,4 +611,14 @@ /* define ssize_t to __int64 if it's missing in default includes */ #define ssize_t __int64 +/* Define this to font directory relative to prefix */ +#define XINE_REL_FONTDIR "share\\xine\\libxine1\\fonts" + +/* Define this to font directory relative to prefix */ +#define XINE_REL_LOCALEDIR "share\\locale" + +/* Define this to plugin directory relative to execution prefix */ +#define XINE_REL_PLUGINDIR "lib\\xine\\plugins" + + #include "os_internal.h" |