*BUGFIX*

Used the same pludindir and path separator for native Win32 and CygWin.
Fixed build of the plugins using X11 on CygWin.

CVS patchset: 7833
CVS date: 2006/01/08 12:15:39

4 files changed, 8 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 85d3acdf1..386f39a13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,7 @@ xine-lib (1.0.4)
   * tiny doc update
   * build fixes and cross build improvements
   * fixed an align problem in Win32 DirectX video output plugin
+  * fixed linking of X11 plugins for some platforms
 
 xine-lib (1.0.3)
   * fixed format string vulnerability in audio CD input plugin
diff --git a/configure.ac b/configure.ac
index 20bf71820..8f80b97cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2064,13 +2064,11 @@ eval XINE_REL_PLUGINDIR="$XINE_PLUGINDIR"
 XINE_REL_PLUGINDIR=`eval echo "$XINE_REL_PLUGINDIR" | sed -e "s,^${prefix}/,,"`
 XINE_REL_FONTDIR=`eval echo "$XINE_FONTDIR" | sed -e "s,^${prefix}/,,"`
 XINE_REL_LOCALEDIR=`eval echo "$XINE_LOCALEDIR" | sed -e "s,^${prefix}/,,"`
-if test x"$SYS" = "xmingw32"; then
+if test x"$SYS" = "xmingw32" -o x"$SYS" = "xcygwin"; then
   dnl polish paths (MinGW runtime accepts both \ and / anyway)
   XINE_REL_PLUGINDIR=`echo "$XINE_REL_PLUGINDIR" | sed -e 's/\\//\\\\\\\\/g'`
   XINE_REL_FONTDIR=`echo "$XINE_REL_FONTDIR" | sed -e 's/\\//\\\\\\\\/g'`
   XINE_REL_LOCALEDIR=`echo "$XINE_REL_LOCALEDIR" | sed -e 's/\\//\\\\\\\\/g'`
-fi
-if test x"$SYS" = "xmingw32" -o x"$SYS" = "xcygwin"; then
   dnl prefix in xine-config
   XINE_CONFIG_PREFIX="\`dirname \$0\`/.."
   dnl installation directories (in xine-config)
diff --git a/lib/os_internal.h b/lib/os_internal.h
index ff2e28273..67008c260 100644
--- a/lib/os_internal.h
+++ b/lib/os_internal.h
@@ -17,7 +17,7 @@
 #endif
 
 
-#if defined(WIN32)
+#if defined(WIN32) || defined(__CYGWIN__)
 #  define XINE_PATH_SEPARATOR_STRING ";"
 #  define XINE_PATH_SEPARATOR_CHAR ';'
 #  define XINE_DIRECTORY_SEPARATOR_STRING "\\"
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 7fd141c25..2c25e844a 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -94,26 +94,26 @@ lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(xvmc_module) \
 
 xineplug_vo_out_xshm_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
 	video_out_xshm.c $(X11OSD)
-xineplug_vo_out_xshm_la_LIBADD = $(MLIB_LIBS) $(X_LIBS) -lXext $(XINE_LIB) $(THREAD_LIBS)
+xineplug_vo_out_xshm_la_LIBADD = $(MLIB_LIBS) $(X_LIBS) -lXext $(X_PRE_LIBS) -lX11 $(XINE_LIB) $(THREAD_LIBS)
 xineplug_vo_out_xshm_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_vo_out_xv_la_SOURCES = $(X11OSD) deinterlace.c video_out_xv.c
-xineplug_vo_out_xv_la_LIBADD = $(XV_LIB) $(X_LIBS) -lXext $(XINE_LIB) $(THREAD_LIBS)
+xineplug_vo_out_xv_la_LIBADD = $(XV_LIB) $(X_LIBS) -lXext $(X_PRE_LIBS) -lX11 $(XINE_LIB) $(THREAD_LIBS)
 xineplug_vo_out_xv_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_vo_out_xvmc_la_SOURCES = deinterlace.c video_out_xvmc.c
-xineplug_vo_out_xvmc_la_LIBADD = $(XVMC_LIB) $(XV_LIB) $(X_LIBS) -lXext $(XINE_LIB) $(THREAD_LIBS)
+xineplug_vo_out_xvmc_la_LIBADD = $(XVMC_LIB) $(XV_LIB) $(X_LIBS) -lXext $(X_PRE_LIBS) -lX11 $(XINE_LIB) $(THREAD_LIBS)
 xineplug_vo_out_xvmc_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_vo_out_xxmc_la_SOURCES = $(X11OSD) deinterlace.c video_out_xxmc.c\
 				xvmc_mocomp.c xvmc_vld.c xxmc.h
-xineplug_vo_out_xxmc_la_LIBADD = $(XXMC_LIB) $(XV_LIB) $(X_LIBS) -lXext $(XINE_LIB) $(THREAD_LIBS)
+xineplug_vo_out_xxmc_la_LIBADD = $(XXMC_LIB) $(XV_LIB) $(X_LIBS) -lXext $(X_PRE_LIBS) -lX11 $(XINE_LIB) $(THREAD_LIBS)
 xineplug_vo_out_xxmc_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_vo_out_opengl_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
 	video_out_opengl.c myglext.h $(X11OSD)
 xineplug_vo_out_opengl_la_LIBADD = $(MLIB_LIBS) $(OPENGL_LIBS) $(GLUT_LIBS) \
-	$(GLU_LIBS) $(X_LIBS) -lXext $(XINE_LIB) $(THREAD_LIBS)
+	$(GLU_LIBS) $(X_LIBS) -lXext $(X_PRE_LIBS) -lX11 $(XINE_LIB) $(THREAD_LIBS)
 xineplug_vo_out_opengl_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_vo_out_syncfb_la_SOURCES = video_out_syncfb.c