4 files changed, 31 insertions, 10 deletions
diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am
index 412817b6b..d2d9699ed 100644
--- a/src/xine-utils/Makefile.am
+++ b/src/xine-utils/Makefile.am
@@ -9,7 +9,13 @@ if PPC_ARCH
 pppc_files = ppcasm_string.S 
 endif
 
-AM_CFLAGS = $(THREAD_CFLAGS) $(X_CFLAGS)
+if WIN32
+TIMER_LIB = $(top_builddir)/win32/contrib/libtimer.la
+else
+#lib_thr = $(THREAD_LIBS)
+endif
+
+AM_CFLAGS = $(X_CFLAGS)
 
 libxineutils_la_SOURCES = $(pppc_files) \
 	cpu_accel.c \
@@ -25,7 +31,8 @@ libxineutils_la_SOURCES = $(pppc_files) \
 	xmlparser.c \
 	xine_buffer.c 
 
-libxineutils_la_LIBADD = $(THREAD_LIBS)
+libxineutils_la_DEPENDENCIES = $(TIMER_LIB)
+libxineutils_la_LIBADD = $(lib_thr) $(TIMER_LIB)
 
 include_HEADERS = \
 	attributes.h \
@@ -36,3 +43,6 @@ include_HEADERS = \
 	xmlparser.h
 
 noinst_HEADERS = ppcasm_string.h xine_check.h
+
+$(TIMER_LIB):
+	$(MAKE) -C $(top_builddir)/win32/contrib libtimer.la
diff --git a/src/xine-utils/memcpy.c b/src/xine-utils/memcpy.c
index e49398f48..79a74c9d5 100644
--- a/src/xine-utils/memcpy.c
+++ b/src/xine-utils/memcpy.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2003 the xine project
+ * Copyright (C) 2001-2004 the xine project
  *
  * This file is part of xine, a free video player.
  *
@@ -37,7 +37,7 @@
 #include "ppcasm_string.h"
 #endif
 
-#ifndef _MSC_VER
+#ifdef HAVE_SYS_TIMES_H
 #include <sys/times.h>
 #endif
 
@@ -408,7 +408,7 @@ static struct {
   { NULL, NULL, 0, 0 }
 };
 
-#if defined(ARCH_X86) && !defined(_MSC_VER)
+#if defined(ARCH_X86) && defined(HAVE_SYS_TIMES_H)
 static unsigned long long int rdtsc(int config_flags)
 {
   unsigned long long int x;
@@ -427,12 +427,12 @@ static uint64_t rdtsc(int config_flags)
 {
   /* FIXME: implement an equivalent for using optimized memcpy on other
             architectures */
-#ifndef _MSC_VER
+#ifdef HAVE_SYS_TIMES_H
   struct tms tp;
   return times(&tp);
 #else
 	return ((uint64_t)0);
-#endif /* _MSC_VER */
+#endif /* HAVE_SYS_TIMES_H */
 }
 #endif
 
diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c
index 59fb8a4a1..70bb406fa 100644
--- a/src/xine-utils/utils.c
+++ b/src/xine-utils/utils.c
@@ -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: utils.c,v 1.29 2004/07/25 17:47:01 mroi Exp $
+ * $Id: utils.c,v 1.30 2004/08/27 19:33:37 valtri Exp $
  *
  */
 #define	_POSIX_PTHREAD_SEMANTICS 1	/* for 5-arg getpwuid_r on solaris */
@@ -349,7 +349,7 @@ char *exec_path_append_subdir(char *string) {
 const char *xine_get_homedir(void) {
 
 #ifdef WIN32
-	return XINE_HOMEDIR;
+  return exec_path_append_subdir(NULL);
 #else
 
   struct passwd pwd, *pw = NULL;
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h
index 91d02d480..77a9c9217 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.89 2004/07/14 18:51:29 valtri Exp $
+ * $Id: xineutils.h,v 1.90 2004/08/27 19:33:37 valtri Exp $
  *
  */
 #ifndef XINEUTILS_H
@@ -55,6 +55,17 @@ extern "C" {
 #include <stdio.h>
 #include <string.h>
 
+#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
    */