4 files changed, 35 insertions, 5 deletions
diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am
index 1e0acfdff..7bae7c850 100644
--- a/src/audio_out/Makefile.am
+++ b/src/audio_out/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = -DXINE_COMPILE $(ALSA_CFLAGS) $(ESD_CFLAGS) $(IRIXAL_CFLAGS) $(ARTS_CFLAGS) $(DIRECTX_CFLAGS)
+AM_CFLAGS = -DXINE_COMPILE $(ALSA_CFLAGS) $(ESD_CFLAGS) $(IRIXAL_CFLAGS) $(ARTS_CFLAGS)
 
 EXTRA_DIST = audio_irixal_out.c
 
@@ -95,6 +95,7 @@ xineplug_ao_out_arts_la_LIBADD = $(ARTS_LIBS)
 xineplug_ao_out_arts_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_ao_out_directx_la_SOURCES = audio_directx_out.c
+xineplug_ao_out_directx_la_CPPFLAGS = $(DIRECTX_CPPFLAGS)
 xineplug_ao_out_directx_la_LIBADD = $(DIRECTX_AUDIO_LIBS) $(XINE_LIB)
 xineplug_ao_out_directx_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 413888933..9bd16cff7 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -11,7 +11,7 @@ VIDIX_CFLAGS = -I$(top_builddir)/src/video_out/vidix \
 AM_CFLAGS = $(X_CFLAGS) -DXINE_COMPILE \
         $(SUNDGA_CFLAGS) $(SDL_CFLAGS) $(VIDIX_CFLAGS) \
 	$(AALIB_CFLAGS) $(MLIB_CFLAGS) $(LIBSTK_CFLAGS) \
-	$(DIRECTFB_CFLAGS) $(DIRECTX_CFLAGS) $(CACA_CFLAGS)
+	$(DIRECTFB_CFLAGS) $(CACA_CFLAGS)
 
 libdir = $(XINE_PLUGINDIR)
 
@@ -153,6 +153,7 @@ xineplug_vo_out_stk_la_LIBADD = $(LIBSTK_LIBS)
 xineplug_vo_out_stk_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_vo_out_directx_la_SOURCES = alphablend.c yuv2rgb.c yuv2rgb_mmx.c video_out_directx.c 
+xineplug_vo_out_directx_la_CPPFLAGS = $(DIRECTX_CPPFLAGS)
 xineplug_vo_out_directx_la_LIBADD = $(DIRECTX_VIDEO_LIBS) $(XINE_LIB)
 xineplug_vo_out_directx_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index f0f6d8d0b..d34ba80df 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -10,6 +10,7 @@ INTERNAL_ZLIB_LIB = $(top_builddir)/win32/contrib/zlib/libzlib.la
 DIRENT_LIB = $(top_builddir)/win32/contrib/libdirent.la
 INTERNAL_PTHREAD_LIB = $(top_builddir)/win32/contrib/pthreads/libpthread.la
 TIMER_LIB = $(top_builddir)/win32/contrib/libtimer.la
+DEF_FILE = libxine-$(XINE_MAJOR).def
 if !HAVE_ZLIB
 zlib_dep = $(INTERNAL_ZLIB_LIB)
 endif
@@ -17,7 +18,7 @@ if WIN32
 dirent_lib = $(DIRENT_LIB)
 pthread_dep = $(INTERNAL_PTHREAD_LIB)
 timer_lib = $(TIMER_LIB)
-def_ldflags="-Wl,--output-def,libxine.def"
+def_ldflags="-Wl,--output-def,$(DEF_FILE)"
 endif
 
 libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \
@@ -48,6 +49,14 @@ include_HEADERS  = buffer.h metronom.h configfile.h vo_scale.h \
 
 noinst_HEADERS = bswap.h
 
+if WIN32
+install-exec-local:
+	cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
+
+uninstall-local:
+	rm -f $(DEF_FILE) $(DESTDIR)$(libdir)
+endif
+
 @INCLUDED_INTL_TRUE@@INTLLIBS@:
 @INCLUDED_INTL_TRUE@	@cd $(top_builddir)/intl && $(MAKE) libintl.la
 
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h
index fffc2b304..6f5fecdf8 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.91 2004/09/01 18:19:51 valtri Exp $
+ * $Id: xineutils.h,v 1.92 2004/09/06 18:34:39 valtri Exp $
  *
  */
 #ifndef XINEUTILS_H
@@ -27,7 +27,6 @@
 extern "C" {
 #endif
 
-#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
@@ -578,6 +577,26 @@ typedef	union {
 #endif /*ARCH_X86 */
 
 
+#ifndef HAVE_LSTAT
+#  define lstat(FILENAME, BUF) stat((FILENAME), (BUF))
+#endif
+
+
+#ifdef _MSC_VER
+#  define snprintf _snprintf
+#  define vsnprintf _vsnprintf
+#endif
+
+
+#ifdef WIN32
+#  ifndef strcasecmp
+#    define strcasecmp _stricmp
+#  endif
+#  ifndef strncasecmp
+#    define strncasecmp _strnicmp
+#  endif
+#endif
+
 
 		     /* Optimized/fast memcpy */