Commit 0d90e523 authored by gbazin's avatar gbazin
Browse files

* toolbox: use the "Output_Dir" property when generating the msvc project...

* toolbox: use the "Output_Dir" property when generating the msvc project files so we don't end-up with name conflicts when compiling.
* msvc/config.h.in, modules/access_output/file.c: MSVC fixes.
* modules/video_chroma/i420_rgb.c: don't use our RV24 conversion routine on win32 because it assumes 32 bits per pixel.
parent c3638c4d
......@@ -2,7 +2,7 @@
* file.c
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: file.c,v 1.9 2003/09/07 20:08:31 fenrir Exp $
* $Id: file.c,v 1.10 2003/12/04 12:33:43 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
......@@ -49,6 +49,9 @@
#ifndef S_IROTH
# define S_IROTH 0
#endif
#ifndef STDOUT_FILENO
# define STDOUT_FILENO 1
#endif
/*****************************************************************************
* Exported prototypes
......
......@@ -2,7 +2,7 @@
* i420_rgb.c : YUV to bitmap RGB conversion module for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: i420_rgb.c,v 1.4 2003/08/29 18:58:05 fenrir Exp $
* $Id: i420_rgb.c,v 1.5 2003/12/04 12:33:43 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -122,7 +122,9 @@ static int Activate( vlc_object_t *p_this )
p_vout->chroma.pf_convert = E_(I420_RGB16);
break;
case VLC_FOURCC('R','V','2','4'):
#ifndef WIN32 /* Hmmm, is there only X11 using 32bits per pixel for RV24 ? */
case VLC_FOURCC('R','V','2','4'):
#endif
case VLC_FOURCC('R','V','3','2'):
#if defined (MODULE_NAME_IS_i420_rgb_mmx)
/* If we don't have support for the bitmasks, bail out */
......
......@@ -93,9 +93,6 @@
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
/* Define to 1 if you have the <sys/time.h> header file. */
#define HAVE_SYS_TIME_H 1
/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1
......
#! /bin/sh
## toolbox for the VLC media player
## $Id: toolbox,v 1.50 2003/11/27 00:05:51 sam Exp $
## $Id: toolbox,v 1.51 2003/12/04 12:33:42 gbazin Exp $
##
## Authors: Samuel Hocevar <sam@zoy.org>
......@@ -158,7 +158,7 @@ then
LIBVLC_PKG_HEADERS=`getfiles dist_pkginclude_HEADERS`
# Clean up
rm -f evc/*.vcp msvc/*.dsp
rm -f evc/*.vcp msvc/*.dsp msvc/*.vcproj msvc/*.sln msvc/*.ncb
# config files
for target in evc/config.h msvc/config.h
......@@ -193,6 +193,7 @@ EOF
EOF
for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep "/${subdir}/"`
do
subdir="`echo ${file} | sed -e 's%/[^/]*$%/%' | sed -e 's%/%\\\\%g'`"
if test "${target}" = "evc/libvlc.vcp"
then
cat >> ${target} << EOF
......@@ -304,6 +305,12 @@ EOF
# Begin Source File${M}
SOURCE="..\\modules\\`echo ${dir}/${cfile} | sed 's,/,\\\\,g'`"${M}
# ADD CPP /D "__VLC__" /D "__PLUGIN__" /D "MODULE_NAME=${mod}" /D "MODULE_NAME_IS_${mod}" ${M}
!IF "\$(CFG)" == "plugin_${mod} - Win32 Release"${M}
# PROP Output_Dir "Release\\modules\\`echo ${dir} | sed 's,/,\\\\,g'`"${M}
# PROP Intermediate_Dir "Release\\modules\\`echo ${dir} | sed 's,/,\\\\,g'`"${M}
!ELSEIF "\$(CFG)" == "plugin_${mod} - Win32 Debug"${M}
# PROP Output_Dir "Debug\\modules\\`echo ${dir} | sed 's,/,\\\\,g'`"${M}
# PROP Intermediate_Dir "Debug\\modules\\`echo ${dir} | sed 's,/,\\\\,g'`"${M}
# End Source File${M}
EOF
done
......
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