summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac46
-rw-r--r--include/xine.h.in3
-rw-r--r--m4/Makefile.am4
-rw-r--r--m4/directx.m472
-rw-r--r--src/audio_out/Makefile.am3
-rw-r--r--src/video_out/Makefile.am3
-rw-r--r--src/xine-engine/Makefile.am11
-rw-r--r--src/xine-utils/xineutils.h23
-rw-r--r--win32/Makefile.am16
-rw-r--r--win32/include/Makefile.am24
-rw-r--r--win32/include/msvc/config.h113
-rw-r--r--win32/include/msvc/sys/time.h (renamed from win32/include/sys/time.h)0
-rw-r--r--win32/include/unistd.h16
-rwxr-xr-xwin32/include/xinesuppt.h20
-rw-r--r--win32/libxine.def2
-rw-r--r--win32/libxinesupport.def4
-rw-r--r--win32/libxinesuppt.dsp4
-rw-r--r--win32/xineplug_ao_out_directx.dsp4
-rw-r--r--win32/xineplug_vo_out_directx.dsp4
19 files changed, 214 insertions, 158 deletions
diff --git a/configure.ac b/configure.ac
index 58f051e3c..c843141f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -771,47 +771,8 @@ AM_CONDITIONAL(HAVE_STK, [test x"$have_stk" = x"yes"])
dnl ---------------------------------------------
dnl check for DirectX
dnl ---------------------------------------------
-AC_MSG_CHECKING(for DirectX)
-DIRECTX_VIDEO_LIBS="$DIRECTX_LIBS -lgdi32 -lddraw"
-DIRECTX_AUDIO_LIBS="$DIRECTX_LIBS -ldsound"
-AC_LANG_SAVE()
-AC_LANG_C()
-ac_save_CFLAGS="$CFLAGS"
-ac_save_LIBS="$LIBS"
-CFLAGS="$CFLAGS $DIRECTX_CFLAGS"
-LIBS="$LIBS $DIRECTX_VIDEO_LIBS $DIRECTX_AUDIO_LIBS"
-AC_COMPILE_IFELSE(
- [
-#include <stddef.h>
-
-#include <windows.h>
-#include <ddraw.h>
-#include <dsound.h>
-
-int main() {
- DirectDrawCreate(0, NULL, 0);
- DirectsoundCreate(0, NULL, 0);
-
- return 0;
-}
- ],
- [have_directx=yes
- AC_DEFINE(HAVE_DIRECTX,1,[Define this if you have DirectX])],,)
-CFLAGS=$ac_save_CFLAGS
-LIBS=$ac_save_LIBS
-AC_LANG_RESTORE()
-
-if test x$have_directx = xyes ; then
- AC_MSG_RESULT(yes)
-else
- AC_MSG_RESULT(no)
- AC_MSG_RESULT(*** All DirectX dependent parts will be disabled ***)
-fi
-AC_SUBST(DIRECTX_CFLAGS)
-AC_SUBST(DIRECTX_AUDIO_LIBS)
-AC_SUBST(DIRECTX_VIDEO_LIBS)
-AM_CONDITIONAL(HAVE_DIRECTX, test x$have_directx = "xyes" )
+AM_PATH_DIRECTX()
dnl ---------------------------------------------
@@ -1420,7 +1381,7 @@ dnl Some extra checks.
dnl ---------------------------------------------
AC_CHECK_LIB(posix4, sched_get_priority_min)
-AC_CHECK_FUNCS([vsscanf sigaction sigset getpwuid_r nanosleep strsep strpbrk basename hstrerror memset setenv])
+AC_CHECK_FUNCS([vsscanf sigaction sigset getpwuid_r nanosleep strsep strpbrk basename hstrerror lstat memset setenv])
AC_FUNC_FSEEKO
AC_CHECK_HEADERS(byteswap.h malloc.h execinfo.h ucontext.h sys/mman.h sys/mixer.h libgen.h sys/times.h sys/ioctl.h)
@@ -2131,7 +2092,8 @@ src/xine-engine/xineintl.h
win32/Makefile
win32/contrib/Makefile
win32/contrib/pthreads/Makefile
-win32/contrib/zlib/Makefile])
+win32/contrib/zlib/Makefile
+win32/include/Makefile])
AC_CONFIG_COMMANDS([default],[[chmod +x ./misc/SlackBuild ./misc/build_rpms.sh ./misc/relchk.sh]],[[]])
AC_OUTPUT
diff --git a/include/xine.h.in b/include/xine.h.in
index d88516d6d..0ef399e7f 100644
--- a/include/xine.h.in
+++ b/include/xine.h.in
@@ -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: xine.h.in,v 1.127 2004/08/02 12:51:08 miguelfreitas Exp $
+ * $Id: xine.h.in,v 1.128 2004/09/06 18:34:38 valtri Exp $
*
* public xine-lib (libxine) interface and documentation
*
@@ -48,7 +48,6 @@ extern "C" {
#endif
#include <sys/types.h>
-#include <unistd.h>
#include <inttypes.h>
#include <sys/time.h>
#include <time.h>
diff --git a/m4/Makefile.am b/m4/Makefile.am
index a3d8c3000..5274e73b0 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -15,6 +15,7 @@ EXTRA_DIST = \
as.m4 \
caca.m4 \
codeset.m4 \
+ directx.m4 \
dl.m4 \
dvdnav.m4 \
esd.m4 \
@@ -38,5 +39,4 @@ EXTRA_DIST = \
theora.m4 \
xine.m4 \
_xine.m4 \
- xvid.m4 \
- vcd.m4
+ xvid.m4
diff --git a/m4/directx.m4 b/m4/directx.m4
new file mode 100644
index 000000000..11725123f
--- /dev/null
+++ b/m4/directx.m4
@@ -0,0 +1,72 @@
+dnl
+dnl autoconf script for DirectX
+dnl
+dnl written by Frantisek Dvorak <valtri@users.sourceforge.net>
+dnl
+dnl
+dnl AM_PATH_DIRECTX([ACTION IF FOUND [, ACTION IF NOT FOUND]]))
+dnl
+dnl It looks for DirectX, defines DIRECTX_CPPFLAGS, DIRECTX_AUDIO_LIBS and
+dnl DIRECTX_VIDEO_LIBS.
+dnl
+AC_DEFUN([AM_PATH_DIRECTX], [
+
+AC_ARG_WITH(dxheaders, AC_HELP_STRING([--with-dxheaders], [specify location of DirectX headers]),
+ [dxheaders_prefix="$withval"],
+ [dxheaders_prefix="no"]
+)
+
+if test x"$dxheaders_prefix" != "xno"; then
+ DIRECTX_CPPFLAGS="-I${dxheaders_prefix} ${DIRECTX_CPPFLAGS}"
+fi
+
+AC_MSG_CHECKING(for DirectX)
+DIRECTX_VIDEO_LIBS="$DIRECTX_LIBS -lgdi32 -lddraw"
+DIRECTX_AUDIO_LIBS="$DIRECTX_LIBS -ldsound"
+AC_LANG_SAVE()
+AC_LANG_C()
+ac_save_CPPFLAGS="$CPPFLAGS"
+ac_save_LIBS="$LIBS"
+CPPFLAGS="$CPPFLAGS $DIRECTX_CPPFLAGS"
+LIBS="$LIBS $DIRECTX_VIDEO_LIBS $DIRECTX_AUDIO_LIBS"
+AC_COMPILE_IFELSE(
+ [
+#include <stddef.h>
+
+#include <windows.h>
+#include <ddraw.h>
+#include <dsound.h>
+
+int main() {
+ DirectDrawCreate(0, NULL, 0);
+ DirectsoundCreate(0, NULL, 0);
+
+ return 0;
+}
+ ],
+ [have_directx=yes
+ AC_DEFINE(HAVE_DIRECTX,1,[Define this if you have DirectX])],,)
+CPPFLAGS=$ac_save_CPPFLAGS
+LIBS=$ac_save_LIBS
+AC_LANG_RESTORE()
+
+if test x$have_directx = xyes ; then
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+ AC_MSG_RESULT(*** All DirectX dependent parts will be disabled ***)
+fi
+
+AC_SUBST(DIRECTX_CPPFLAGS)
+AC_SUBST(DIRECTX_AUDIO_LIBS)
+AC_SUBST(DIRECTX_VIDEO_LIBS)
+AM_CONDITIONAL(HAVE_DIRECTX, test x$have_directx = "xyes")
+
+dnl result
+if test x"$have_directx" = "xyes"; then
+ ifelse([$1], , :, [$1])
+else
+ ifelse([$2], , :, [$2])
+fi
+
+])
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 */
diff --git a/win32/Makefile.am b/win32/Makefile.am
index 277d516ad..8d6a8552d 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -1,19 +1,8 @@
include $(top_srcdir)/misc/Makefile.common
-SUBDIRS = contrib
+SUBDIRS = contrib include
EXTRA_DIST = \
- include/msvc/config.h \
- include/msvc/inttypes.h \
- include/msvc/stdint.h \
- include/netinet/in.h \
- include/sys/time.h \
- include/sys/socket.h \
- include/dlfcn.h \
- include/netdb.h \
- include/pwd.h \
- include/unistd.h \
- include/xinesuppt.h \
scripts/move_xine_fonts.bat \
README \
libdvdnav.def \
@@ -23,8 +12,7 @@ EXTRA_DIST = \
xineplug_decode_spu.def \
xine_plugin.def \
libxine.dsw \
- xine.dsw \
- config.h
+ xine.dsw
dist-hook:
diff --git a/win32/include/Makefile.am b/win32/include/Makefile.am
new file mode 100644
index 000000000..1b13e092b
--- /dev/null
+++ b/win32/include/Makefile.am
@@ -0,0 +1,24 @@
+include $(top_srcdir)/misc/Makefile.common
+
+msvc_headers = \
+ msvc/inttypes.h \
+ msvc/stdint.h \
+ msvc/sys/time.h
+
+if WIN32
+ install_h = $(msvc_headers)
+else
+ dist_h = $(msvc_headers)
+endif
+
+EXTRA_DIST = $(dist_h) \
+ sys/socket.h \
+ msvc/config.h \
+ netinet/in.h \
+ sys/socket.h \
+ dlfcn.h \
+ netdb.h \
+ pwd.h \
+ unistd.h
+
+nobase_include_HEADERS = $(install_h)
diff --git a/win32/include/msvc/config.h b/win32/include/msvc/config.h
index 886cf4762..2b44ff85c 100644
--- a/win32/include/msvc/config.h
+++ b/win32/include/msvc/config.h
@@ -1,34 +1,26 @@
/* config.h. Generated by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
-/* Adjusting for MSVS:
+/* Adjusting for MSVC from MinGW:
* NLS disabled
* x86 disabled
* inline defined to __inline
* HAVE_SYS_PARAM_H disabled
- * XINE_PLUGINDIR
- * XINE_FONTDIR
- * XINE_LOCALEDIR
* HAVE_DLFCN_H 1
- * HAVE_SETENV 1 (FIXME: into utils.c)
- * define ssize_t as __int64
+ * HAVE_ERRNO_H 1
+ * HAVE_FCNTL_H 1
+ * HAVE_ISOC99_PRAGMA 1
+ * HAVE_MEMCPY 1
+ * HAVE_STDBOOL_H
+ * HAVE_STDIO_H 1
+ * HAVE_VSNPRINTF 1
+ * HAVE_WIN32_CDROM 1
+ * X_DISPLAY_MISSING 1
+ * HAVE_MEMCPY 1
+ * Disable:
+ * esd, arts, alsa, gnome_vfs, png, sdl, speex, x11, theora
*/
-#if defined(WIN32)
-
-#include <windows.h>
-#include <stdio.h>
-#include <string.h>
-
-#define ssize_t __int64
-
-#ifndef PATH_MAX
-#define PATH_MAX MAX_PATH
-#endif
-
-#endif
-
-
#ifdef inline
/* the strange formatting below is needed to prevent config.status from rewriting it */
@@ -40,8 +32,11 @@
/* Define this if you're running PowerPC architecture */
/* #undef ARCH_PPC */
+/* Define this if you're running SPARC architecture */
+/* #undef ARCH_SPARC */
+
/* Define this if you're running x86 architecture */
-/* #define ARCH_X86 */
+/* #undef ARCH_X86 */
/* Define this if you're running x86 architecture */
/* #undef ARCH_X86_64 */
@@ -50,7 +45,7 @@
#define ATTRIBUTE_ALIGNED_MAX 64
/* compiler does lsbf in struct bitfields */
-#define BITFIELD_LSBF
+/* #undef BITFIELD_LSBF */
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
systems. This function is required for `alloca.c' support on those systems.
@@ -64,19 +59,19 @@
/* #undef C_ALLOCA */
/* what to put between the brackets for empty arrays */
-#define EMPTY_ARRAY_SIZE
+/* #undef EMPTY_ARRAY_SIZE */
/* Define this if you have a Motorola 74xx CPU */
/* #undef ENABLE_ALTIVEC */
/* Define to 1 if translation of program messages to the user's native
language is requested. */
-/* #define ENABLE_NLS 1 */
+/* #undef ENABLE_NLS */
/* Define this if you have Sun UltraSPARC CPU */
/* #undef ENABLE_VIS */
-/* Define to select libmad fixed pointarithmetic implementation */
+/* Define to select libmad fixed point arithmetic implementation */
/* #undef FPM_64BIT */
/* Define to select libmad fixed point arithmetic implementation */
@@ -119,6 +114,9 @@
/* Define this if you have ARTS (libartsc) installed */
/* #undef HAVE_ARTS */
+/* Define to 1 if you have the <avcodec.h> header file. */
+/* #undef HAVE_AVCODEC_H */
+
/* Define to 1 if you have the `basename' function. */
/* #undef HAVE_BASENAME */
@@ -173,6 +171,9 @@
/* Define to 1 if you have the `feof_unlocked' function. */
/* #undef HAVE_FEOF_UNLOCKED */
+/* Define this if you have ffmpeg library */
+/* #undef HAVE_FFMPEG */
+
/* Define to 1 if you have the `fgets_unlocked' function. */
/* #undef HAVE_FGETS_UNLOCKED */
@@ -221,6 +222,9 @@
/* Define this if you have gnome-vfs installed */
/* #undef HAVE_GNOME_VFS */
+/* Define to 1 if you have the `hstrerror' function. */
+/* #undef HAVE_HSTRERROR */
+
/* Define if you have the iconv() function. */
/* #undef HAVE_ICONV */
@@ -240,7 +244,7 @@
/* #undef HAVE_IRIXAL */
/* Supports ISO _Pragma() macro */
-#define HAVE_ISOC99_PRAGMA
+#define HAVE_ISOC99_PRAGMA 1
/* Define this if you have kernel statistics available via kstat interface */
/* #undef HAVE_KSTAT */
@@ -300,7 +304,7 @@
#define HAVE_MEMORY_H 1
/* Define to 1 if you have the `mempcpy' function. */
-/* #undef HAVE_MEMPCPY */
+#define HAVE_MEMPCPY 1
/* Define to 1 if you have the `memset' function. */
#define HAVE_MEMSET 1
@@ -329,6 +333,9 @@
/* Define this if you have OpenGL support available */
/* #undef HAVE_OPENGL */
+/* Define to 1 if you have the <postprocess.h> header file. */
+/* #undef HAVE_POSTPROCESS_H */
+
/* Define to 1 if you have the `putenv' function. */
#define HAVE_PUTENV 1
@@ -336,7 +343,7 @@
/* #undef HAVE_SDL */
/* Define to 1 if you have the `setenv' function. */
-#define HAVE_SETENV
+/* #undef HAVE_SETENV */
/* Define to 1 if you have the `setlocale' function. */
#define HAVE_SETLOCALE 1
@@ -348,7 +355,7 @@
/* #undef HAVE_SIGSET */
/* Define to 1 if you have the `snprintf' function. */
-#define HAVE_SNPRINTF 1
+/* #undef HAVE_SNPRINTF */
/* Define 1 if you have Solaris CD-ROM support */
/* #undef HAVE_SOLARIS_CDROM */
@@ -356,6 +363,9 @@
/* Define this if you have speex */
/* #undef HAVE_SPEEX */
+/* Define to 1 if speex headers are eg. <speex/speex.h> */
+/* #undef HAVE_SPEEX_SUBDIR */
+
/* Define to 1 if you have the <stdbool.h> header file. */
#define HAVE_STDBOOL_H 1
@@ -404,6 +414,9 @@
/* Define to 1 if you have the <sys/cdio.h> header file. */
/* #undef HAVE_SYS_CDIO_H */
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+/* #undef HAVE_SYS_IOCTL_H */
+
/* Define to 1 if you have the <sys/mixer.h> header file. */
/* #undef HAVE_SYS_MIXER_H */
@@ -477,7 +490,10 @@
/* #undef HAVE___ARGZ_STRINGIFY */
/* host os/cpu identifier */
-#define HOST_ARCH "mingw32/i686"
+/* #undef HOST_ARCH */
+
+/* Define this if built on Mac OS X/Darwin */
+/* #undef HOST_OS_DARWIN */
/* Define as const if the declaration of iconv() needs const. */
/* #undef ICONV_CONST */
@@ -486,7 +502,7 @@
/* #undef LIBMPEG2_MLIB */
/* Define 1 if you are compiling using MinGW */
-#define MINGW32 1
+/* #undef MINGW32 */
/* Define this if you want to load mlib lazily */
/* #undef MLIB_LAZYLOAD */
@@ -513,7 +529,7 @@
/* #undef SIZEOF_INT */
/* The size of a `long', as computed by sizeof. */
-/* #undef SIZEOF_LONG */
+#define SIZEOF_LONG 4
/* The size of a `long long', as computed by sizeof. */
/* #undef SIZEOF_LONG_LONG */
@@ -521,16 +537,16 @@
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown */
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown */
/* #undef STACK_DIRECTION */
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1-rc3b"
+#define VERSION "1-rc6"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
@@ -540,10 +556,10 @@
#define XINE_ACFLAGS "-I ${prefix}/share/aclocal"
/* Define this to osd fonts dir location */
-/* #define XINE_FONTDIR "/usr/local/share/xine/libxine1/fonts" */
+#define XINE_FONTDIR exec_path_append_subdir("fonts")
/* Path where catalog files will be. */
-/* #define XINE_LOCALEDIR "/usr/local/share/locale"*/
+#define XINE_LOCALEDIR exec_path_append_subdir("locale")
/* xine major version number */
#define XINE_MAJOR 1
@@ -552,7 +568,7 @@
#define XINE_MINOR 0
/* Define this to plugins directory location */
-/* #define XINE_PLUGINDIR "/usr/local/lib/xine/plugins/1.0.0" */
+#define XINE_PLUGINDIR exec_path_append_subdir("plugins")
/* xine sub version number */
#define XINE_SUB 0
@@ -561,10 +577,13 @@
#define X_DISPLAY_MISSING 1
/* enable warnings about being development release */
-#define _DEVELOPMENT_
+/* #undef _DEVELOPMENT_ */
/* enable GNU libc extension */
-#define _GNU_SOURCE
+/* #undef _GNU_SOURCE */
+
+/* Define this if you are ISO C9X compliant */
+#define _ISOC9X_SOURCE 1
/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
/* #undef _LARGEFILE_SOURCE */
@@ -575,8 +594,8 @@
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
- if it is not supported. */
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+ calls it, or to nothing if 'inline' is not supported under any name. */
#define inline __inline
/* Define to `long' if <sys/types.h> does not define. */
@@ -584,3 +603,9 @@
/* Define to `unsigned' if <sys/types.h> does not define. */
/* #undef size_t */
+
+/* Define the real type of socklen_t */
+#define socklen_t size_t
+
+/* define ssize_t to __int64 if it's missing in default includes */
+#define ssize_t __int64
diff --git a/win32/include/sys/time.h b/win32/include/msvc/sys/time.h
index 074a8a1e6..074a8a1e6 100644
--- a/win32/include/sys/time.h
+++ b/win32/include/msvc/sys/time.h
diff --git a/win32/include/unistd.h b/win32/include/unistd.h
index ae2cc4fcb..b08706535 100644
--- a/win32/include/unistd.h
+++ b/win32/include/unistd.h
@@ -37,12 +37,7 @@
#ifndef _SYS_UNISTD_H_
#define _SYS_UNISTD_H_
-#ifndef inline
-# define inline __inline
-#endif
-
#define mkdir( A, B ) _mkdir( A )
-#define lstat stat
#ifndef S_ISDIR
# define S_ISDIR(m) ((m) & _S_IFDIR)
@@ -76,17 +71,6 @@
#define bzero( A, B ) memset( A, 0, B )
-#ifndef strcasecmp
-# define strcasecmp _stricmp
-#endif
-
-#ifndef strncasecmp
-# define strncasecmp _strnicmp
-#endif
-
-#define snprintf _snprintf
-#define vsnprintf _vsnprintf
-
#define readlink(PATH, BUF, BUFSIZ) 0
#endif
diff --git a/win32/include/xinesuppt.h b/win32/include/xinesuppt.h
deleted file mode 100755
index bb61cdddb..000000000
--- a/win32/include/xinesuppt.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-#ifndef XINESUPPT_H
-#define XINESUPPT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-
-void setenv(const char *name, const char *val, int _xx);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* XINESUPPT_H */
diff --git a/win32/libxine.def b/win32/libxine.def
index 8727f87f3..f4bb6a5ad 100644
--- a/win32/libxine.def
+++ b/win32/libxine.def
@@ -35,7 +35,7 @@ xine_list_append_content
xine_list_insert_content
xine_list_delete_current
-basename
+xine_basename
xine_buffer_init
_xine_buffer_free
diff --git a/win32/libxinesupport.def b/win32/libxinesupport.def
index 09e83398e..8a5bca041 100644
--- a/win32/libxinesupport.def
+++ b/win32/libxinesupport.def
@@ -219,7 +219,3 @@ sleep
nanosleep
alarm
-;------------------------------------------------------------
-; other exports
-setenv
-
diff --git a/win32/libxinesuppt.dsp b/win32/libxinesuppt.dsp
index cbbfd7f65..2b2ecde05 100644
--- a/win32/libxinesuppt.dsp
+++ b/win32/libxinesuppt.dsp
@@ -257,10 +257,6 @@ SOURCE=.\contrib\zlib\zutil.c
# Begin Group "Source Files ( other )"
# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\contrib\setenv.c
-# End Source File
# End Group
# Begin Group "Source Files ( timer )"
diff --git a/win32/xineplug_ao_out_directx.dsp b/win32/xineplug_ao_out_directx.dsp
index 2004f27f2..564b528cc 100644
--- a/win32/xineplug_ao_out_directx.dsp
+++ b/win32/xineplug_ao_out_directx.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
# PROP Target_Dir ""
LIB32=link.exe
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_AO_OUT_DIRECTX_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_AO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_AO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
# PROP Target_Dir ""
LIB32=link.exe
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_AO_OUT_DIRECTX_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_AO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_AO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /FR /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_vo_out_directx.dsp b/win32/xineplug_vo_out_directx.dsp
index 1e21424f3..045812e15 100644
--- a/win32/xineplug_vo_out_directx.dsp
+++ b/win32/xineplug_vo_out_directx.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
# PROP Target_Dir ""
LIB32=link.exe
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_DIRECTX_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../.." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../.." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
# PROP Target_Dir ""
LIB32=link.exe
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_DIRECTX_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../.." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../.." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /FR /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 18:28:20 +0000