From ebdf62cd13f7976890cbf3703571fc55a20df47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Wed, 1 Sep 2004 18:19:49 +0000 Subject: Improvements and implementing Michael's suggestions: - new flags added at the end, so the users can override them properly - removed X11 libs and cflags from xine-config and libxine.pc - removed replacing for setenv (thanks to Robin for the hint) - better way for temporary disabling of w32dll module - data directories will be different on Windows - force installing catalogs with translation into XINE_LOCALEDIR - timer linked in xine-engine (just central place for linking such stuff) - adjusted load_plugins and remove reduntant WIN32 conditionals - removed unused $(lib_thr) CVS patchset: 6927 CVS date: 2004/09/01 18:19:49 --- src/xine-utils/xineutils.h | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'src/xine-utils/xineutils.h') diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h index 77a9c9217..fffc2b304 100644 --- a/src/xine-utils/xineutils.h +++ b/src/xine-utils/xineutils.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xineutils.h,v 1.90 2004/08/27 19:33:37 valtri Exp $ + * $Id: xineutils.h,v 1.91 2004/09/01 18:19:51 valtri Exp $ * */ #ifndef XINEUTILS_H @@ -55,17 +55,6 @@ extern "C" { #include #include -#ifdef WIN32 -/* Ridiculous hack to return valid xine support - * directories. These should be read from - * a registry entry set at install time. - */ - /* -# define XINE_PLUGINDIR exec_path_append_subdir( "plugins" ) -# define XINE_FONTDIR exec_path_append_subdir( "plugins" ) -# define XINE_LOCALEDIR exec_path_append_subdir( "plugins" )*/ -#endif - /* * debugable mutexes */ @@ -1120,7 +1109,7 @@ char *xine_basename (char *name); */ const char *xine_hstrerror(int err); -#ifdef WIN32 +#if defined(__CYGWIN__) || defined(WIN32) char *exec_path_append_subdir(char * string); #endif -- cgit v1.2.3