Skip to content

V
vlc-gpu
Commit 7adf5042 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* updated the MSVC++ project files and added support for dirent (vlc compiled
   with msvc can now load plugins - even compiled with mingw).
* small portability fixes.
parent 80b9aa2b
Show whitespace changes
Inline Side-by-side
Showing with 672 additions and 476 deletions
extras/Win32_msvc/defs.h
View file @ 7adf5042
/* include/defs.h. Generated automatically by configure. */
/* include/defs.h.in. Generated automatically from configure.in by autoheader 2.13. */
/* Define if using alloca.c. */
/* #undef C_ALLOCA */
/* Define to empty if the keyword does not work. */
/* #undef const */
/* 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. */
/* #undef CRAY_STACKSEG_END */
/* Define if you have alloca, as a function or macro. */
#define HAVE_ALLOCA 1
/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
/* #undef HAVE_ALLOCA_H */
/* Define if you have a working `mmap' system call. */
/* #undef HAVE_MMAP */
/* Define as __inline if that's what the C compiler calls it. */
/* #undef inline */
#define PLUGIN_PATH "."
/* Define to `long' if <sys/types.h> doesn't define. */
/* #undef off_t */
......@@ -32,100 +12,18 @@
/* Define to `unsigned' if <sys/types.h> doesn't define. */
/* #undef size_t */
/* 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
*/
/* #undef STACK_DIRECTION */
/* Define if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Define if you can safely include both <sys/time.h> and <time.h>. */
/* #undef TIME_WITH_SYS_TIME */
#define PACKAGE "vlc"
#define VERSION "0.2.92-dev"
#define COPYRIGHT_MESSAGE "VideoLAN Client - version 0.2.92-dev_2002-03-22 Ourumov - (c) 1996-2002 VideoLAN"
#define MODULE_SUFFIX "__MODULE_0_2_92_dev_2002_03_22"
#define MODULE_SYMBOL 0_2_92_dev_2002_03_22
#define VERSION_MESSAGE "vlc 0.2.92-dev_2002-03-22 Ourumov Copyright 1996-2001 VideoLAN\n"
/* Define if you have the __argz_count function. */
/* #undef HAVE___ARGZ_COUNT */
/* Define if you have the __argz_next function. */
/* #undef HAVE___ARGZ_NEXT */
/* Define if you have the __argz_stringify function. */
/* #undef HAVE___ARGZ_STRINGIFY */
/* Define if you have the dcgettext function. */
/* #undef HAVE_DCGETTEXT */
/* Define if you have the feof_unlocked function. */
/* #undef HAVE_FEOF_UNLOCKED */
/* Define if you have the fgets_unlocked function. */
/* #undef HAVE_FGETS_UNLOCKED */
/* Define if you have the getcwd function. */
#define HAVE_GETCWD 1
/* Define if you have the getegid function. */
/* #undef HAVE_GETEGID */
/* Define if you have the geteuid function. */
/* #undef HAVE_GETEUID */
/* Define if you have the getgid function. */
/* #undef HAVE_GETGID */
/* Define if you have the getpagesize function. */
#define HAVE_GETPAGESIZE 1
/* Define if you have the getpwuid function. */
/* #undef HAVE_GETPWUID */
/* Define if you have the gettimeofday function. */
/* #undef HAVE_GETTIMEOFDAY */
/* Define if you have the getuid function. */
/* #undef HAVE_GETUID */
/* Define if you have the isatty function. */
#define HAVE_ISATTY 1
/* Define if you have the memalign function. */
/* #undef HAVE_MEMALIGN */
/* Define if you have the mempcpy function. */
/* #undef HAVE_MEMPCPY */
/* Define if you have the munmap function. */
/* #undef HAVE_MUNMAP */
/* Define if you have the putenv function. */
#define HAVE_PUTENV 1
/* Define if you have the select function. */
/* #undef HAVE_SELECT */
/* Define if you have the setenv function. */
/* #undef HAVE_SETENV */
/* Define if you have the setlocale function. */
#define HAVE_SETLOCALE 1
/* Define if you have the sigrelse function. */
/* #undef HAVE_SIGRELSE */
/* Define if you have the stpcpy function. */
/* #undef HAVE_STPCPY */
/* Define if you have the strcasecmp function. */
#define HAVE_STRCASECMP 1
......@@ -150,123 +48,15 @@
/* Define if you have the swab function. */
#define HAVE_SWAB 1
/* Define if you have the tsearch function. */
/* #undef HAVE_TSEARCH */
/* Define if you have the usleep function. */
/* #undef HAVE_USLEEP */
/* Define if you have the valloc function. */
/* #undef HAVE_VALLOC */
/* Define if you have the vasprintf function. */
/* #undef HAVE_VASPRINTF */
/* Define if you have the </sys/dev/scsi/scsi_ioctl.h> header file. */
/* #undef HAVE__SYS_DEV_SCSI_SCSI_IOCTL_H */
/* Define if you have the <Cocoa/Cocoa.h> header file. */
/* #undef HAVE_COCOA_COCOA_H */
/* Define if you have the <Ph.h> header file. */
/* #undef HAVE_PH_H */
/* Define if you have the <X11/Xlib.h> header file. */
/* #undef HAVE_X11_XLIB_H */
/* Define if you have the <X11/extensions/Xv.h> header file. */
/* #undef HAVE_X11_EXTENSIONS_XV_H */
/* Define if you have the <X11/extensions/dpms.h> header file. */
/* #undef HAVE_X11_EXTENSIONS_DPMS_H */
/* Define if you have the <a52dec/a52.h> header file. */
/* #undef HAVE_A52DEC_A52_H */
/* Define if you have the <argz.h> header file. */
/* #undef HAVE_ARGZ_H */
/* Define if you have the <arpa/inet.h> header file. */
/* #undef HAVE_ARPA_INET_H */
/* Define if you have the <cthreads.h> header file. */
/* #undef HAVE_CTHREADS_H */
/* Define if you have the <ddraw.h> header file. */
/* #undef HAVE_DDRAW_H */
/* Define if you have the <dlfcn.h> header file. */
/* #undef HAVE_DLFCN_H */
/* Define if you have the <dvd.h> header file. */
/* #undef HAVE_DVD_H */
/* Define if you have the <fcntl.h> header file. */
#define HAVE_FCNTL_H 1
/* Define if you have the <gdk/gdk.h> header file. */
#define HAVE_GDK_GDK_H 1
/* Define if you have the <getopt.h> header file. */
/* #undef HAVE_GETOPT_H */
/* Define if you have the <glib.h> header file. */
#define HAVE_GLIB_H 1
/* Define if you have the <gnome.h> header file. */
/* #undef HAVE_GNOME_H */
/* Define if you have the <gtk/gtk.h> header file. */
#define HAVE_GTK_GTK_H 1
/* Define if you have the <image.h> header file. */
/* #undef HAVE_IMAGE_H */
/* Define if you have the <kernel/OS.h> header file. */
/* #undef HAVE_KERNEL_OS_H */
/* Define if you have the <kernel/scheduler.h> header file. */
/* #undef HAVE_KERNEL_SCHEDULER_H */
/* Define if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1
/* Define if you have the <linux/cdrom.h> header file. */
/* #undef HAVE_LINUX_CDROM_H */
/* Define if you have the <linux/fb.h> header file. */
/* #undef HAVE_LINUX_FB_H */
/* Define if you have the <locale.h> header file. */
#define HAVE_LOCALE_H 1
/* Define if you have the <machine/param.h> header file. */
/* #undef HAVE_MACHINE_PARAM_H */
/* Define if you have the <machine/soundcard.h> header file. */
/* #undef HAVE_MACHINE_SOUNDCARD_H */
/* Define if you have the <mad.h> header file. */
/* #undef HAVE_MAD_H */
/* Define if you have the <malloc.h> header file. */
#define HAVE_MALLOC_H 1
/* Define if you have the <net/if.h> header file. */
/* #undef HAVE_NET_IF_H */
/* Define if you have the <netinet/in.h> header file. */
/* #undef HAVE_NETINET_IN_H */
/* Define if you have the <nl_types.h> header file. */
/* #undef HAVE_NL_TYPES_H */
/* Define if you have the <pthread.h> header file. */
/* #undef HAVE_PTHREAD_H */
/* Define if you have the <soundcard.h> header file. */
/* #undef HAVE_SOUNDCARD_H */
/* Define if you have the <stddef.h> header file. */
#define HAVE_STDDEF_H 1
......@@ -276,56 +66,14 @@
/* Define if you have the <string.h> header file. */
#define HAVE_STRING_H 1
/* Define if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1
/* Define if you have the <sys/cdio.h> header file. */
/* #undef HAVE_SYS_CDIO_H */
/* Define if you have the <sys/dvdio.h> header file. */
/* #undef HAVE_SYS_DVDIO_H */
/* Define if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1
/* Define if you have the <sys/ioctl.h> header file. */
/* #undef HAVE_SYS_IOCTL_H */
/* Package name */
#define VLC_PACKAGE "vlc"
/* Define if you have the <sys/param.h> header file. */
/* #undef HAVE_SYS_PARAM_H */
/* Define if you have the <sys/shm.h> header file. */
/* #undef HAVE_SYS_SHM_H */
/* Define if you have the <sys/socket.h> header file. */
/* #undef HAVE_SYS_SOCKET_H */
/* Define if you have the <sys/sockio.h> header file. */
/* #undef HAVE_SYS_SOCKIO_H */
/* Define if you have the <sys/soundcard.h> header file. */
/* #undef HAVE_SYS_SOUNDCARD_H */
/* Define if you have the <sys/time.h> header file. */
#define HAVE_SYS_TIME_H 1
/* Define if you have the <sys/times.h> header file. */
/* #undef HAVE_SYS_TIMES_H */
/* Define if you have the <unistd.h> header file. */
/* #undef HAVE_UNISTD_H */
/* Define if you have the <winioctl.h> header file. */
#define HAVE_WINIOCTL_H 1
/* Define if you have the mad library (-lmad). */
/* #undef HAVE_LIBMAD */
/* Define if you have the pth library (-lpth). */
/* #undef HAVE_LIBPTH */
/* Define if you have the st library (-lst). */
/* #undef HAVE_LIBST */
/* css decryption with player keys */
/* #undef HAVE_CSSKEYS */
/* Package version */
#define VLC_VERSION "0.3.1"
/* Define if you have the iconv() function. */
/* #undef HAVE_ICONV */
......@@ -333,9 +81,6 @@
/* Define as const if the declaration of iconv() needs const. */
/* #undef ICONV_CONST */
/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
/* #undef HAVE_LANGINFO_CODESET */
/* Define if your <locale.h> file defines LC_MESSAGES. */
/* #undef HAVE_LC_MESSAGES */
......@@ -343,93 +88,17 @@
is requested. */
#define ENABLE_NLS 1
/* Define if the GNU gettext() function is already present or preinstalled. */
/* #undef HAVE_GETTEXT */
/* long getopt support */
/* #undef HAVE_GETOPT_LONG */
/* getopt support */
/* #undef HAVE_GETOPT_LONG */
/* Define if <pthread.h> defines pthread_cond_t. */
/* #undef PTHREAD_COND_T_IN_PTHREAD_H */
/* Define if <strings.h> defines strncasecmp. */
/* #undef STRNCASECMP_IN_STRINGS_H */
/* Define if <X11/extensions/dpms.h> defines DPMSInfo. */
/* #undef DPMSINFO_IN_DPMS_H */
/* Define if <sys/param.h> defines ntohl. */
/* #undef NTOHL_IN_SYS_PARAM_H */
/* Maximum supported data alignment */
#define ATTRIBUTE_ALIGNED_MAX 16
/* Define if <sys/types.h> defines boolean_t. */
/* #undef BOOLEAN_T_IN_SYS_TYPES_H */
/* Define if <pthread.h> defines boolean_t. */
/* #undef BOOLEAN_T_IN_PTHREAD_H */
/* Define if <cthreads.h> defines boolean_t. */
/* #undef BOOLEAN_T_IN_CTHREADS_H */
/* Define if $CC groks 3D Now! inline assembly. */
#define CAN_COMPILE_3DNOW 1
/* Define if $CC groks SSE inline assembly. */
#define CAN_COMPILE_SSE 1
/* Define if $CC groks ALTIVEC inline assembly. */
/* #undef CAN_COMPILE_ALTIVEC */
/* Define if your compiler groks C altivec extensions. */
/* #undef CAN_COMPILE_C_ALTIVEC */
/* Define if <sys/cdio.h> defines dvd_struct. */
/* #undef DVD_STRUCT_IN_SYS_CDIO_H */
/* Define if <sys/dvdio.h> defines dvd_struct. */
/* #undef DVD_STRUCT_IN_SYS_DVDIO_H */
/* Define if <linux/cdrom.h> defines DVD_STRUCT. */
/* #undef DVD_STRUCT_IN_LINUX_CDROM_H */
/* Define if <dvd.h> defines DVD_STRUCT. */
/* #undef DVD_STRUCT_IN_DVD_H */
/* Define if <extras/BSDI_dvdioctl/dvd.h> defines DVD_STRUCT. */
/* #undef DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H */
/* Have userspace SCSI headers. */
/* #undef SOLARIS_USCSI */
/* Define if <sys/scsi.h> defines sctl_io. */
/* #undef HPUX_SCTL_IO */
/* Define if Linux-like dvd_struct is defined. */
/* #undef HAVE_LINUX_DVD_STRUCT */
/* Define if OpenBSD-like dvd_struct is defined. */
/* #undef HAVE_OPENBSD_DVD_STRUCT */
/* Define if FreeBSD-like dvd_struct is defined. */
/* #undef HAVE_BSD_DVD_STRUCT */
/* define if compiling with satellite card support */
/* #undef HAVE_SATELLITE */
/* Indicate whether we should use SDL/SDL.h or SDL11/SDL.h */
#define SDL_INCLUDE_FILE <SDL/SDL.h>
/* big endian system */
/* #undef WORDS_BIGENDIAN */
/* Simple version string */
#define VERSION_MESSAGE "vlc 0.3.1_2002-05-17 Ourumov Copyright 1996-2002 VideoLAN"
/* Define if <pth.h> defines pth_init */
/* #undef PTH_INIT_IN_PTH_H */
/* Copyright string */
#define COPYRIGHT_MESSAGE "VideoLAN Client - version 0.3.1_2002-05-03 Ourumov - (c) 1996-2002 VideoLAN"
/* Define if <st.h> defines st_init */
/* #undef ST_INIT_IN_ST_H */
/* String suffix for module functions */
#define MODULE_SUFFIX "__MODULE_0_3_1_2002_05_17"
/* Symbol suffix for module functions */
#define MODULE_SYMBOL 0_3_1_2002_05_17
extras/Win32_msvc/dirent.c 0 → 100644
View file @ 7adf5042
/*
* dirent.c
*
* Derived from DIRLIB.C by Matt J. Weinstein
* This note appears in the DIRLIB.H
* DIRLIB.H by M. J. Weinstein Released to public domain 1-Jan-89
*
* Updated by Jeremy Bettis <jeremy@hksys.com>
* Significantly revised and rewinddir, seekdir and telldir added by Colin
* Peters <colin@fu.is.saga-u.ac.jp>
*
* $Revision: 1.1 $
* $Author: gbazin $
* $Date: 2002/05/18 14:03:13 $
*
*/
#include <stdlib.h>
#include <errno.h>
#include <string.h>
#include <io.h>
#include <direct.h>
#include <dirent.h>
#define WIN32_LEAN_AND_MEAN
#include <windows.h> /* for GetFileAttributes */
#define SUFFIX "*"
#define SLASH "\\"
/*
* opendir
*
* Returns a pointer to a DIR structure appropriately filled in to begin
* searching a directory.
*/
DIR *
opendir (const CHAR *szPath)
{
DIR *nd;
unsigned int rc;
CHAR szFullPath[MAX_PATH];
errno = 0;
if (!szPath)
{
errno = EFAULT;
return (DIR *) 0;
}
if (szPath[0] == '\0')
{
errno = ENOTDIR;
return (DIR *) 0;
}
/* Attempt to determine if the given path really is a directory. */
rc = GetFileAttributes (szPath);
if (rc == -1)
{
/* call GetLastError for more error info */
errno = ENOENT;
return (DIR *) 0;
}
if (!(rc & FILE_ATTRIBUTE_DIRECTORY))
{
/* Error, entry exists but not a directory. */
errno = ENOTDIR;
return (DIR *) 0;
}
/* Make an absolute pathname. */
_fullpath (szFullPath, szPath, MAX_PATH);
/* Allocate enough space to store DIR structure and the complete
* directory path given. */
nd = (DIR *) malloc (sizeof (DIR) + strlen (szFullPath) + strlen (SLASH) +
strlen (SUFFIX));
if (!nd)
{
/* Error, out of memory. */
errno = ENOMEM;
return (DIR *) 0;
}
/* Create the search expression. */
strcpy (nd->dd_name, szFullPath);
/* Add on a slash if the path does not end with one. */
if (nd->dd_name[0] != '\0' &&
nd->dd_name[strlen (nd->dd_name) - 1] != '/' &&
nd->dd_name[strlen (nd->dd_name) - 1] != '\\')
{
strcat (nd->dd_name, SLASH);
}
/* Add on the search pattern */
strcat (nd->dd_name, SUFFIX);
/* Initialize handle to -1 so that a premature closedir doesn't try
* to call _findclose on it. */
nd->dd_handle = -1;
/* Initialize the status. */
nd->dd_stat = 0;
/* Initialize the dirent structure. ino and reclen are invalid under
* Win32, and name simply points at the appropriate part of the
* findfirst_t structure. */
nd->dd_dir.d_ino = 0;
nd->dd_dir.d_reclen = 0;
nd->dd_dir.d_namlen = 0;
nd->dd_dir.d_name = nd->dd_dta.name;
return nd;
}
/*
* readdir
*
* Return a pointer to a dirent structure filled with the information on the
* next entry in the directory.
*/
struct dirent *
readdir (DIR * dirp)
{
errno = 0;
/* Check for valid DIR struct. */
if (!dirp)
{
errno = EFAULT;
return (struct dirent *) 0;
}
if (dirp->dd_dir.d_name != dirp->dd_dta.name)
{
/* The structure does not seem to be set up correctly. */
errno = EINVAL;
return (struct dirent *) 0;
}
if (dirp->dd_stat < 0)
{
/* We have already returned all files in the directory
* (or the structure has an invalid dd_stat). */
return (struct dirent *) 0;
}
else if (dirp->dd_stat == 0)
{
/* We haven't started the search yet. */
/* Start the search */
dirp->dd_handle = _findfirst (dirp->dd_name, &(dirp->dd_dta));
if (dirp->dd_handle == -1)
{
/* Whoops! Seems there are no files in that
* directory. */
dirp->dd_stat = -1;
}
else
{
dirp->dd_stat = 1;
}
}
else
{
/* Get the next search entry. */
if (_findnext (dirp->dd_handle, &(dirp->dd_dta)))
{
/* We are off the end or otherwise error. */
_findclose (dirp->dd_handle);
dirp->dd_handle = -1;
dirp->dd_stat = -1;
}
else
{
/* Update the status to indicate the correct
* number. */
dirp->dd_stat++;
}
}
if (dirp->dd_stat > 0)
{
/* Successfully got an entry. Everything about the file is
* already appropriately filled in except the length of the
* file name. */
dirp->dd_dir.d_namlen = strlen (dirp->dd_dir.d_name);
return &dirp->dd_dir;
}
return (struct dirent *) 0;
}
/*
* closedir
*
* Frees up resources allocated by opendir.
*/
int
closedir (DIR * dirp)
{
int rc;
errno = 0;
rc = 0;
if (!dirp)
{
errno = EFAULT;
return -1;
}
if (dirp->dd_handle != -1)
{
rc = _findclose (dirp->dd_handle);
}
/* Delete the dir structure. */
free (dirp);
return rc;
}
/*
* rewinddir
*
* Return to the beginning of the directory "stream". We simply call findclose
* and then reset things like an opendir.
*/
void
rewinddir (DIR * dirp)
{
errno = 0;
if (!dirp)
{
errno = EFAULT;
return;
}
if (dirp->dd_handle != -1)
{
_findclose (dirp->dd_handle);
}
dirp->dd_handle = -1;
dirp->dd_stat = 0;
}
/*
* telldir
*
* Returns the "position" in the "directory stream" which can be used with
* seekdir to go back to an old entry. We simply return the value in stat.
*/
long
telldir (DIR * dirp)
{
errno = 0;
if (!dirp)
{
errno = EFAULT;
return -1;
}
return dirp->dd_stat;
}
/*
* seekdir
*
* Seek to an entry previously returned by telldir. We rewind the directory
* and call readdir repeatedly until either dd_stat is the position number
* or -1 (off the end). This is not perfect, in that the directory may
* have changed while we weren't looking. But that is probably the case with
* any such system.
*/
void
seekdir (DIR * dirp, long lPos)
{
errno = 0;
if (!dirp)
{
errno = EFAULT;
return;
}
if (lPos < -1)
{
/* Seeking to an invalid position. */
errno = EINVAL;
return;
}
else if (lPos == -1)
{
/* Seek past end. */
if (dirp->dd_handle != -1)
{
_findclose (dirp->dd_handle);
}
dirp->dd_handle = -1;
dirp->dd_stat = -1;
}
else
{
/* Rewind and read forward to the appropriate index. */
rewinddir (dirp);
while ((dirp->dd_stat < lPos) && readdir (dirp))
;
}
}
extras/Win32_msvc/dirent.h 0 → 100644
View file @ 7adf5042
/*
* DIRENT.H (formerly DIRLIB.H)
*
* by M. J. Weinstein Released to public domain 1-Jan-89
*
* Because I have heard that this feature (opendir, readdir, closedir)
* it so useful for programmers coming from UNIX or attempting to port
* UNIX code, and because it is reasonably light weight, I have included
* it in the Mingw32 package. I have also added an implementation of
* rewinddir, seekdir and telldir.
* - Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
*
* This code is distributed in the hope that is will be useful but
* WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
* DISCLAIMED. This includeds but is not limited to warranties of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* $Revision: 1.1 $
* $Author: gbazin $
* $Date: 2002/05/18 14:03:13 $
*
*/
#ifndef __STRICT_ANSI__
#ifndef _DIRENT_H_
#define _DIRENT_H_
#include <io.h>
#ifndef RC_INVOKED
#ifdef __cplusplus
extern "C" {
#endif
struct dirent
{
long d_ino; /* Always zero. */
unsigned short d_reclen; /* Always zero. */
unsigned short d_namlen; /* Length of name in d_name. */
char* d_name; /* File name. */
/* NOTE: The name in the dirent structure points to the name in the
* finddata_t structure in the DIR. */
};
/*
* This is an internal data structure. Good programmers will not use it
* except as an argument to one of the functions below.
*/
typedef struct
{
/* disk transfer area for this dir */
struct _finddata_t dd_dta;
/* dirent struct to return from dir (NOTE: this makes this thread
* safe as long as only one thread uses a particular DIR struct at
* a time) */
struct dirent dd_dir;
/* _findnext handle */
long dd_handle;
/*
* Status of search:
* 0 = not started yet (next entry to read is first entry)
* -1 = off the end
* positive = 0 based index of next entry
*/
short dd_stat;
/* given path for dir with search pattern (struct is extended) */
char dd_name[1];
} DIR;
DIR* opendir (const char*);
struct dirent* readdir (DIR*);
int closedir (DIR*);
void rewinddir (DIR*);
long telldir (DIR*);
void seekdir (DIR*, long);
/* wide char versions */
struct _wdirent
{
long d_ino; /* Always zero. */
unsigned short d_reclen; /* Always zero. */
unsigned short d_namlen; /* Length of name in d_name. */
wchar_t* d_name; /* File name. */
/* NOTE: The name in the dirent structure points to the name in the
* wfinddata_t structure in the _WDIR. */
};
/*
* This is an internal data structure. Good programmers will not use it
* except as an argument to one of the functions below.
*/
typedef struct
{
/* disk transfer area for this dir */
struct _wfinddata_t dd_dta;
/* dirent struct to return from dir (NOTE: this makes this thread
* safe as long as only one thread uses a particular DIR struct at
* a time) */
struct _wdirent dd_dir;
/* _findnext handle */
long dd_handle;
/*
* Status of search:
* 0 = not started yet (next entry to read is first entry)
* -1 = off the end
* positive = 0 based index of next entry
*/
short dd_stat;
/* given path for dir with search pattern (struct is extended) */
wchar_t dd_name[1];
} _WDIR;
_WDIR* _wopendir (const wchar_t*);
struct _wdirent* _wreaddir (_WDIR*);
int _wclosedir (_WDIR*);
void _wrewinddir (_WDIR*);
long _wtelldir (_WDIR*);
void _wseekdir (_WDIR*, long);
#ifdef __cplusplus
}
#endif
#endif /* Not RC_INVOKED */
#endif /* Not _DIRENT_H_ */
#endif /* Not __STRICT_ANSI__ */
extras/Win32_msvc/vlc.dsp
View file @ 7adf5042
......@@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /I . /I../../include /c
# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "__VLC__" /YX /FD /I../../include /c
# ADD BASE RSC /l 0x414 /d "NDEBUG"
# ADD RSC /l 0x414 /d "NDEBUG"
BSC32=bscmake.exe
......@@ -66,7 +66,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /I . /I../../include /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "__VLC__" /YX /FD /GZ /I../../include /c
# ADD BASE RSC /l 0x414 /d "_DEBUG"
# ADD RSC /l 0x809 /i "../" /d "_DEBUG"
BSC32=bscmake.exe
......@@ -105,49 +105,102 @@ SOURCE=..\..\extras\GNUgetopt\getopt.h
SOURCE=..\..\extras\GNUgetopt\getopt1.c
# End Source File
# End Group
# Begin Group "dirent"
# PROP Default_Filter ""
# Begin Source File
SOURCE=.\dirent.c
# End Source File
# End Group
# Begin Group "libdvdcss"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\extras\libdvdcss\css.c
SOURCE=..\..\..\libdvdcss\src\common.h
# End Source File
# Begin Source File
SOURCE=..\..\..\libdvdcss\src\config.h
# End Source File
# Begin Source File
SOURCE=..\..\..\libdvdcss\src\css.c
# End Source File
# Begin Source File
SOURCE=..\..\..\libdvdcss\src\css.h
# End Source File
# Begin Source File
SOURCE=..\..\extras\libdvdcss\css.h
SOURCE=..\..\..\libdvdcss\src\csstables.h
# End Source File
# Begin Source File
SOURCE=..\..\extras\libdvdcss\csstables.h
SOURCE=..\..\..\libdvdcss\src\dvdcss\dvdcss.h
# End Source File
# Begin Source File
SOURCE=..\..\extras\libdvdcss\ioctl.c
SOURCE=..\..\..\libdvdcss\src\ioctl.c
# End Source File
# Begin Source File
SOURCE=..\..\extras\libdvdcss\ioctl.h
SOURCE=..\..\..\libdvdcss\src\ioctl.h
# End Source File
# Begin Source File
SOURCE=..\..\extras\libdvdcss\libdvdcss.c
SOURCE=..\..\..\libdvdcss\src\libdvdcss.c
# End Source File
# Begin Source File
SOURCE=..\..\extras\libdvdcss\libdvdcss.h
SOURCE=..\..\..\libdvdcss\src\libdvdcss.h
# End Source File
# End Group
# End Group
# Begin Group "plugins"
# PROP Default_Filter ""
# Begin Group "a52"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\plugins\a52\a52.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=a52 /D "USE_A52DEC_TREE" /I../a52dec
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=a52 /D "USE_A52DEC_TREE" /I../a52dec
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\plugins\a52\a52.h
!IF "$(CFG)" == "vlc - Win32 Release"
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# End Group
# Begin Group "ac3_adec"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\plugins\ac3_adec\ac3_adec.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=ac3_adec
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=ac3_adec
# End Source File
# Begin Source File
......@@ -156,12 +209,12 @@ SOURCE=..\..\plugins\ac3_adec\ac3_adec.h
# Begin Source File
SOURCE=..\..\plugins\ac3_adec\ac3_bit_allocate.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=ac3_adec
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=ac3_adec
# End Source File
# Begin Source File
SOURCE=..\..\plugins\ac3_adec\ac3_decoder.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=ac3_adec
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=ac3_adec
# End Source File
# Begin Source File
......@@ -170,7 +223,7 @@ SOURCE=..\..\plugins\ac3_adec\ac3_decoder.h
# Begin Source File
SOURCE=..\..\plugins\ac3_adec\ac3_exponent.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=ac3_adec
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=ac3_adec
# End Source File
# Begin Source File
......@@ -179,7 +232,7 @@ SOURCE=..\..\plugins\ac3_adec\ac3_exponent.h
# Begin Source File
SOURCE=..\..\plugins\ac3_adec\ac3_imdct.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=ac3_adec
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=ac3_adec
# End Source File
# Begin Source File
......@@ -188,7 +241,7 @@ SOURCE=..\..\plugins\ac3_adec\ac3_internal.h
# Begin Source File
SOURCE=..\..\plugins\ac3_adec\ac3_mantissa.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=ac3_adec
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=ac3_adec
# End Source File
# Begin Source File
......@@ -197,12 +250,12 @@ SOURCE=..\..\plugins\ac3_adec\ac3_mantissa.h
# Begin Source File
SOURCE=..\..\plugins\ac3_adec\ac3_parse.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=ac3_adec
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=ac3_adec
# End Source File
# Begin Source File
SOURCE=..\..\plugins\ac3_adec\ac3_rematrix.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=ac3_adec
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=ac3_adec
# End Source File
# End Group
# Begin Group "access"
......@@ -211,17 +264,17 @@ SOURCE=..\..\plugins\ac3_adec\ac3_rematrix.c
# Begin Source File
SOURCE=..\..\plugins\access\file.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=file
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=file
# End Source File
# Begin Source File
SOURCE=..\..\plugins\access\http.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=http
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=http
# End Source File
# Begin Source File
SOURCE=..\..\plugins\access\udp.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=udp
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=udp
# End Source File
# End Group
# Begin Group "chroma"
......@@ -230,7 +283,7 @@ SOURCE=..\..\plugins\access\udp.c
# Begin Source File
SOURCE=..\..\plugins\chroma\i420_rgb.c
# ADD CPP /D "BUILTIN" /D "MODULE_NAME_IS_chroma_i420_rgb" /D MODULE_NAME=chroma_i420_rgb
# ADD CPP /D "__BUILTIN__" /D "MODULE_NAME_IS_chroma_i420_rgb" /D MODULE_NAME=chroma_i420_rgb
# End Source File
# Begin Source File
......@@ -239,12 +292,12 @@ SOURCE=..\..\plugins\chroma\i420_rgb.h
# Begin Source File
SOURCE=..\..\plugins\chroma\i420_rgb16.c
# ADD CPP /D "BUILTIN" /D "MODULE_NAME_IS_chroma_i420_rgb" /D MODULE_NAME=chroma_i420_rgb
# ADD CPP /D "__BUILTIN__" /D "MODULE_NAME_IS_chroma_i420_rgb" /D MODULE_NAME=chroma_i420_rgb
# End Source File
# Begin Source File
SOURCE=..\..\plugins\chroma\i420_rgb8.c
# ADD CPP /D "BUILTIN" /D "MODULE_NAME_IS_chroma_i420_rgb" /D MODULE_NAME=chroma_i420_rgb
# ADD CPP /D "__BUILTIN__" /D "MODULE_NAME_IS_chroma_i420_rgb" /D MODULE_NAME=chroma_i420_rgb
# End Source File
# Begin Source File
......@@ -253,7 +306,7 @@ SOURCE=..\..\plugins\chroma\i420_rgb_c.h
# Begin Source File
SOURCE=..\..\plugins\chroma\i420_yuy2.c
# ADD CPP /D "BUILTIN" /D "MODULE_NAME_IS_chroma_i420_yuy2" /D MODULE_NAME=chroma_i420_yuy2
# ADD CPP /D "__BUILTIN__" /D "MODULE_NAME_IS_chroma_i420_yuy2" /D MODULE_NAME=chroma_i420_yuy2
# End Source File
# Begin Source File
......@@ -262,7 +315,7 @@ SOURCE=..\..\plugins\chroma\i420_yuy2.h
# Begin Source File
SOURCE=..\..\plugins\chroma\i422_yuy2.c
# ADD CPP /D "BUILTIN" /D "MODULE_NAME_IS_chroma_i422_yuy2" /D MODULE_NAME=chroma_i422_yuy2
# ADD CPP /D "__BUILTIN__" /D "MODULE_NAME_IS_chroma_i422_yuy2" /D MODULE_NAME=chroma_i422_yuy2
# End Source File
# Begin Source File
......@@ -275,17 +328,17 @@ SOURCE=..\..\plugins\chroma\i422_yuy2.h
# Begin Source File
SOURCE=..\..\plugins\directx\aout_directx.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=directx
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=directx
# End Source File
# Begin Source File
SOURCE=..\..\plugins\directx\directx.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=directx
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=directx
# End Source File
# Begin Source File
SOURCE=..\..\plugins\directx\vout_directx.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=directx
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=directx
# End Source File
# Begin Source File
......@@ -294,7 +347,7 @@ SOURCE=..\..\plugins\directx\vout_directx.h
# Begin Source File
SOURCE=..\..\plugins\directx\vout_events.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=directx
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=directx
# End Source File
# End Group
# Begin Group "downmix"
......@@ -303,7 +356,7 @@ SOURCE=..\..\plugins\directx\vout_events.c
# Begin Source File
SOURCE=..\..\plugins\downmix\ac3_downmix_c.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=downmix
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=downmix
# End Source File
# Begin Source File
......@@ -312,7 +365,7 @@ SOURCE=..\..\plugins\downmix\ac3_downmix_common.h
# Begin Source File
SOURCE=..\..\plugins\downmix\downmix.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=downmix
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=downmix
# End Source File
# End Group
# Begin Group "dummy"
......@@ -321,32 +374,32 @@ SOURCE=..\..\plugins\downmix\downmix.c
# Begin Source File
SOURCE=..\..\plugins\dummy\aout_dummy.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=dummy
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=dummy
# End Source File
# Begin Source File
SOURCE=..\..\plugins\dummy\dummy.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=dummy
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=dummy
# End Source File
# Begin Source File
SOURCE=..\..\plugins\dummy\input_dummy.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=dummy
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=dummy
# End Source File
# Begin Source File
SOURCE=..\..\plugins\dummy\intf_dummy.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=dummy
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=dummy
# End Source File
# Begin Source File
SOURCE=..\..\plugins\dummy\null.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=null
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=null
# End Source File
# Begin Source File
SOURCE=..\..\plugins\dummy\vout_dummy.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=dummy
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=dummy
# End Source File
# End Group
# Begin Group "dvd"
......@@ -355,7 +408,7 @@ SOURCE=..\..\plugins\dummy\vout_dummy.c
# Begin Source File
SOURCE=..\..\plugins\dvd\dvd.c
# ADD CPP /I "../libdvdcss" /D "BUILTIN" /D MODULE_NAME=dvd
# ADD CPP /I "../../include" /I "../../../libdvdcss/src" /D "__BUILTIN__" /D MODULE_NAME=dvd
# End Source File
# Begin Source File
......@@ -364,17 +417,17 @@ SOURCE=..\..\plugins\dvd\dvd.h
# Begin Source File
SOURCE=..\..\plugins\dvd\dvd_access.c
# ADD CPP /I "../libdvdcss" /D "BUILTIN" /D MODULE_NAME=dvd
# ADD CPP /I "../../include" /I "../../../libdvdcss/src" /D "__BUILTIN__" /D MODULE_NAME=dvd
# End Source File
# Begin Source File
SOURCE=..\..\plugins\dvd\dvd_demux.c
# ADD CPP /I "../libdvdcss" /D "BUILTIN" /D MODULE_NAME=dvd
# ADD CPP /I "../../include" /I "../../../libdvdcss/src" /D "__BUILTIN__" /D MODULE_NAME=dvd
# End Source File
# Begin Source File
SOURCE=..\..\plugins\dvd\dvd_es.c
# ADD CPP /I "../libdvdcss" /D "BUILTIN" /D MODULE_NAME=dvd
# ADD CPP /I "../../include" /I "../../../libdvdcss/src" /D "__BUILTIN__" /D MODULE_NAME=dvd
# End Source File
# Begin Source File
......@@ -383,7 +436,7 @@ SOURCE=..\..\plugins\dvd\dvd_es.h
# Begin Source File
SOURCE=..\..\plugins\dvd\dvd_ifo.c
# ADD CPP /I "../libdvdcss" /D "BUILTIN" /D MODULE_NAME=dvd
# ADD CPP /I "../../include" /I "../../../libdvdcss/src" /D "__BUILTIN__" /D MODULE_NAME=dvd
# End Source File
# Begin Source File
......@@ -392,7 +445,7 @@ SOURCE=..\..\plugins\dvd\dvd_ifo.h
# Begin Source File
SOURCE=..\..\plugins\dvd\dvd_seek.c
# ADD CPP /I "../libdvdcss" /D "BUILTIN" /D MODULE_NAME=dvd
# ADD CPP /I "../../include" /I "../../../libdvdcss/src" /D "__BUILTIN__" /D MODULE_NAME=dvd
# End Source File
# Begin Source File
......@@ -401,7 +454,7 @@ SOURCE=..\..\plugins\dvd\dvd_seek.h
# Begin Source File
SOURCE=..\..\plugins\dvd\dvd_summary.c
# ADD CPP /I "../libdvdcss" /D "BUILTIN" /D MODULE_NAME=dvd
# ADD CPP /I "../../include" /I "../../../libdvdcss/src" /D "__BUILTIN__" /D MODULE_NAME=dvd
# End Source File
# Begin Source File
......@@ -410,7 +463,7 @@ SOURCE=..\..\plugins\dvd\dvd_summary.h
# Begin Source File
SOURCE=..\..\plugins\dvd\dvd_udf.c
# ADD CPP /I "../libdvdcss" /D "BUILTIN" /D MODULE_NAME=dvd
# ADD CPP /I "../../include" /I "../../../libdvdcss/src" /D "__BUILTIN__" /D MODULE_NAME=dvd
# End Source File
# Begin Source File
......@@ -426,12 +479,12 @@ SOURCE=..\..\plugins\filter\deinterlace.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=deinterlace
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=deinterlace
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=deinterlace
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=deinterlace
!ENDIF
......@@ -442,12 +495,12 @@ SOURCE=..\..\plugins\filter\distort.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=distort
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=distort
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=distort
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=distort
!ENDIF
......@@ -471,12 +524,12 @@ SOURCE=..\..\plugins\filter\invert.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=insert
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=insert
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=insert
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=insert
!ENDIF
......@@ -487,12 +540,12 @@ SOURCE=..\..\plugins\filter\transform.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=transform
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=transform
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=transform
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=transform
!ENDIF
......@@ -503,12 +556,12 @@ SOURCE=..\..\plugins\filter\wall.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=wall
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=wall
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=wall
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=wall
!ENDIF
......@@ -520,7 +573,7 @@ SOURCE=..\..\plugins\filter\wall.c
# Begin Source File
SOURCE=..\..\plugins\fx\scope.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=scope
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=scope
# End Source File
# End Group
# Begin Group "gtk"
......@@ -532,12 +585,12 @@ SOURCE=..\..\plugins\gtk\gtk.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk
!ENDIF
......@@ -548,12 +601,12 @@ SOURCE=..\..\plugins\gtk\gtk_callbacks.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk
!ENDIF
......@@ -590,12 +643,12 @@ SOURCE=..\..\plugins\gtk\gtk_control.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk
!ENDIF
......@@ -619,12 +672,12 @@ SOURCE=..\..\plugins\gtk\gtk_display.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk
!ENDIF
......@@ -648,12 +701,12 @@ SOURCE=..\..\plugins\gtk\gtk_interface.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk
!ENDIF
......@@ -677,12 +730,12 @@ SOURCE=..\..\plugins\gtk\gtk_menu.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk
!ENDIF
......@@ -706,12 +759,12 @@ SOURCE=..\..\plugins\gtk\gtk_modules.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk
!ENDIF
......@@ -735,12 +788,12 @@ SOURCE=..\..\plugins\gtk\gtk_open.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk
!ENDIF
......@@ -764,12 +817,12 @@ SOURCE=..\..\plugins\gtk\gtk_playlist.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk
!ENDIF
......@@ -793,12 +846,12 @@ SOURCE=..\..\plugins\gtk\gtk_preferences.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk
!ENDIF
......@@ -822,12 +875,12 @@ SOURCE=..\..\plugins\gtk\gtk_support.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk
!ENDIF
......@@ -856,7 +909,7 @@ SOURCE=..\..\plugins\idct\block_c.h
# Begin Source File
SOURCE=..\..\plugins\idct\idct.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=idct
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=idct
# End Source File
# Begin Source File
......@@ -873,7 +926,7 @@ SOURCE=..\..\plugins\idct\idct_sparse.h
# Begin Source File
SOURCE=..\..\plugins\idct\idctclassic.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=idctclassic
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=idctclassic
# End Source File
# End Group
# Begin Group "imdct"
......@@ -882,12 +935,12 @@ SOURCE=..\..\plugins\idct\idctclassic.c
# Begin Source File
SOURCE=..\..\plugins\imdct\ac3_imdct_c.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=imdct
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=imdct
# End Source File
# Begin Source File
SOURCE=..\..\plugins\imdct\ac3_imdct_common.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=imdct
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=imdct
# End Source File
# Begin Source File
......@@ -904,12 +957,12 @@ SOURCE=..\..\plugins\imdct\ac3_srfft.h
# Begin Source File
SOURCE=..\..\plugins\imdct\ac3_srfft_c.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=imdct
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=imdct
# End Source File
# Begin Source File
SOURCE=..\..\plugins\imdct\imdct.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=imdct
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=imdct
# End Source File
# End Group
# Begin Group "lpcm_adec"
......@@ -918,7 +971,7 @@ SOURCE=..\..\plugins\imdct\imdct.c
# Begin Source File
SOURCE=..\..\plugins\lpcm_adec\lpcm_adec.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=lpcm_adec
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=lpcm_adec
# End Source File
# Begin Source File
......@@ -938,11 +991,11 @@ SOURCE=..\..\plugins\memcpy\memcpy.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=memcpy
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=memcpy
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=memcpy /D "MODULE_NAME_IS_memcpy"
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=memcpy /D "MODULE_NAME_IS_memcpy"
!ENDIF
......@@ -954,7 +1007,7 @@ SOURCE=..\..\plugins\memcpy\memcpy.c
# Begin Source File
SOURCE=..\..\plugins\motion\motion.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=motion
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=motion
# End Source File
# End Group
# Begin Group "mpeg_adec"
......@@ -963,7 +1016,7 @@ SOURCE=..\..\plugins\motion\motion.c
# Begin Source File
SOURCE=..\..\plugins\mpeg_adec\adec_layer1.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_adec
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_adec
# End Source File
# Begin Source File
......@@ -972,7 +1025,7 @@ SOURCE=..\..\plugins\mpeg_adec\adec_layer1.h
# Begin Source File
SOURCE=..\..\plugins\mpeg_adec\adec_layer2.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_adec
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_adec
# End Source File
# Begin Source File
......@@ -981,7 +1034,7 @@ SOURCE=..\..\plugins\mpeg_adec\adec_layer2.h
# Begin Source File
SOURCE=..\..\plugins\mpeg_adec\adec_math.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_adec
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_adec
# End Source File
# Begin Source File
......@@ -990,7 +1043,7 @@ SOURCE=..\..\plugins\mpeg_adec\adec_math.h
# Begin Source File
SOURCE=..\..\plugins\mpeg_adec\mpeg_adec.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_adec
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_adec
# End Source File
# Begin Source File
......@@ -999,7 +1052,7 @@ SOURCE=..\..\plugins\mpeg_adec\mpeg_adec.h
# Begin Source File
SOURCE=..\..\plugins\mpeg_adec\mpeg_adec_generic.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_adec
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_adec
# End Source File
# Begin Source File
......@@ -1012,17 +1065,27 @@ SOURCE=..\..\plugins\mpeg_adec\mpeg_adec_generic.h
# Begin Source File
SOURCE=..\..\plugins\mpeg_system\mpeg_es.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_es
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_es
# End Source File
# Begin Source File
SOURCE=..\..\plugins\mpeg_system\mpeg_ps.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_ps
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_ps
# End Source File
# Begin Source File
SOURCE=..\..\plugins\mpeg_system\mpeg_ts.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_ts
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_ts
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_ts /D "MODULE_NAME_IS_mpeg_ts"
!ENDIF
# End Source File
# End Group
# Begin Group "mpeg_vdec"
......@@ -1031,7 +1094,7 @@ SOURCE=..\..\plugins\mpeg_system\mpeg_ts.c
# Begin Source File
SOURCE=..\..\plugins\mpeg_vdec\video_decoder.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_vdec
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_vdec
# End Source File
# Begin Source File
......@@ -1040,7 +1103,7 @@ SOURCE=..\..\plugins\mpeg_vdec\video_decoder.h
# Begin Source File
SOURCE=..\..\plugins\mpeg_vdec\video_parser.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_vdec
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_vdec
# End Source File
# Begin Source File
......@@ -1049,7 +1112,7 @@ SOURCE=..\..\plugins\mpeg_vdec\video_parser.h
# Begin Source File
SOURCE=..\..\plugins\mpeg_vdec\vpar_blocks.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_vdec
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_vdec
# End Source File
# Begin Source File
......@@ -1058,12 +1121,12 @@ SOURCE=..\..\plugins\mpeg_vdec\vpar_blocks.h
# Begin Source File
SOURCE=..\..\plugins\mpeg_vdec\vpar_headers.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_vdec
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_vdec
# End Source File
# Begin Source File
SOURCE=..\..\plugins\mpeg_vdec\vpar_pool.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_vdec
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_vdec
# End Source File
# Begin Source File
......@@ -1072,7 +1135,7 @@ SOURCE=..\..\plugins\mpeg_vdec\vpar_pool.h
# Begin Source File
SOURCE=..\..\plugins\mpeg_vdec\vpar_synchro.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_vdec
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_vdec
# End Source File
# End Group
# Begin Group "network"
......@@ -1081,7 +1144,7 @@ SOURCE=..\..\plugins\mpeg_vdec\vpar_synchro.c
# Begin Source File
SOURCE=..\..\plugins\network\ipv4.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=ipv4
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=ipv4
# End Source File
# End Group
# Begin Group "sdl"
......@@ -1093,12 +1156,12 @@ SOURCE=..\..\plugins\sdl\aout_sdl.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=sdl
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=sdl
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=sdl
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=sdl
!ENDIF
......@@ -1109,12 +1172,12 @@ SOURCE=..\..\plugins\sdl\sdl.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=sdl
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=sdl
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=sdl
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=sdl
!ENDIF
......@@ -1125,12 +1188,12 @@ SOURCE=..\..\plugins\sdl\vout_sdl.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=sdl
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=sdl
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=sdl
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=sdl
!ENDIF
......@@ -1142,7 +1205,7 @@ SOURCE=..\..\plugins\sdl\vout_sdl.c
# Begin Source File
SOURCE=..\..\plugins\spudec\spu_decoder.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=spudec
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=spudec
# End Source File
# Begin Source File
......@@ -1155,7 +1218,7 @@ SOURCE=..\..\plugins\spudec\spu_decoder.h
# Begin Source File
SOURCE=..\..\plugins\text\logger.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=logger
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=logger
# End Source File
# Begin Source File
......@@ -1163,12 +1226,12 @@ SOURCE=..\..\plugins\text\rc.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=rc
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=rc
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=rc
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=rc
!ENDIF
......@@ -1183,12 +1246,12 @@ SOURCE=..\..\plugins\vcd\cdrom_tools.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=vcd
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=vcd
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=vcd
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=vcd
!ENDIF
......@@ -1212,12 +1275,12 @@ SOURCE=..\..\plugins\vcd\input_vcd.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=vcd
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=vcd
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=vcd
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=vcd
!ENDIF
......@@ -1241,12 +1304,12 @@ SOURCE=..\..\plugins\vcd\vcd.c
!IF "$(CFG)" == "vlc - Win32 Release"
# ADD CPP /D "BUILTIN" /D MODULE_NAME=vcd
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=vcd
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "BUILTIN" /D MODULE_NAME=vcd
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=vcd
!ENDIF
......@@ -1258,7 +1321,7 @@ SOURCE=..\..\plugins\vcd\vcd.c
# Begin Source File
SOURCE=..\..\plugins\win32\waveout.c
# ADD CPP /D "BUILTIN" /D MODULE_NAME=waveout
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=waveout
# End Source File
# End Group
# End Group
......@@ -1565,8 +1628,9 @@ SOURCE=..\..\share\vlc_win32_rc.rc
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# ADD BASE RSC /l 0x40c /i "\vlc-win\share"
# ADD RSC /l 0x40c /i "../../" /i "\vlc-win\share"
# ADD BASE RSC /l 0x40c /i "\vlc-win32\share" /i "\vlc-win\share"
# SUBTRACT BASE RSC /i "../"
# ADD RSC /l 0x40c /i "\vlc-win32\share" /i "\vlc-win\share" /i "../../"
# SUBTRACT RSC /i "../"
!ENDIF
......
plugins/dvd/dvd_es.c
View file @ 7adf5042
/* dvd_es.c: functions to find and select ES
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: dvd_es.c,v 1.10 2002/05/14 19:33:54 bozo Exp $
* $Id: dvd_es.c,v 1.11 2002/05/18 14:03:13 gbazin Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -231,7 +231,7 @@ void DVDReadSPU( input_thread_t * p_input )
vts.manager_inf.p_spu_attr[i-1].i_lang_code,
sizeof(int) + 16*sizeof(u32) );
*(int*)p_es->p_demux_data = 0xBeeF;
memcpy( (void*)p_es->p_demux_data + sizeof(int),
memcpy( (char*)p_es->p_demux_data + sizeof(int),
palette, 16*sizeof(u32) );
}
else
......
plugins/spudec/spu_decoder.c
View file @ 7adf5042
......@@ -2,7 +2,7 @@
* spu_decoder.c : spu decoder thread
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: spu_decoder.c,v 1.20 2002/05/15 00:40:26 sam Exp $
* $Id: spu_decoder.c,v 1.21 2002/05/18 14:03:13 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Rudolf Cornelissen <rag.cornelissen@inter.nl.net>
......@@ -436,7 +436,7 @@ static int ParseControlSequences( spudec_thread_t *p_spudec,
p_spu->p_sys->b_palette = 1;
for( i = 0; i < 4 ; i++ )
{
i_color = ((u32*)((void*)p_spudec->p_config->
i_color = ((u32*)((char*)p_spudec->p_config->
p_demux_data + sizeof(int)))[
GetBits(&p_spudec->bit_stream, 4) ];
......
src/misc/modules.c
View file @ 7adf5042
......@@ -2,7 +2,7 @@
* modules.c : Built-in and plugin modules management functions
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules.c,v 1.59 2002/05/14 19:47:25 sam Exp $
* $Id: modules.c,v 1.60 2002/05/18 14:03:13 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Ethan C. Baldridge <BaldridgeE@cadmus.com>
......@@ -35,9 +35,7 @@
#include <videolan/vlc.h>
#if !defined( _MSC_VER )
#include <dirent.h>
#endif
#if defined(HAVE_DLFCN_H) /* Linux, BSD, Hurd */
# include <dlfcn.h> /* dlopen(), dlsym(), dlclose() */
......@@ -45,7 +43,7 @@
#elif defined(HAVE_IMAGE_H) /* BeOS */
# include <image.h>
# define HAVE_DYNAMIC_PLUGINS
#elif defined(WIN32) && defined( __MINGW32__ )
#elif defined(WIN32)
# define HAVE_DYNAMIC_PLUGINS
#else
# undef HAVE_DYNAMIC_PLUGINS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment