Changeset 0d90e5238d42bf1f8e51f99cce6c7688db7def58

Timestamp:

12/04/03 13:33:43 (5 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1070541223 +0000

git-parent:

[c3638c4d8731baea8d505925a41c760afb13ade6]

git-author:

Gildas Bazin <gbazin@videolan.org> 1070541223 +0000

Message:

* 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.

Files:

• modules/access_output/file.c (modified) (2 diffs)
• modules/video_chroma/i420_rgb.c (modified) (2 diffs)
• msvc/config.h.in (modified) (1 diff)
• toolbox (modified) (4 diffs)

modules/access_output/file.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
-9 2003/09/07 20:08:31 fenrir
+10 2003/12/04 12:33:43 gbazin
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -49 +49 @@
-#ifndef S_IROTH
-#   define S_IROTH 0
+#endif
+#ifndef STDOUT_FILENO
+#   define STDOUT_FILENO 1
-#endif
-

modules/video_chroma/i420_rgb.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000, 2001 VideoLAN
-4 2003/08/29 18:58:05 fenrir
+5 2003/12/04 12:33:43 gbazin
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -123 +123 @@
-                    break;
-
-
+
+
+
-                case VLC_FOURCC('R','V','3','2'):
-#if defined (MODULE_NAME_IS_i420_rgb_mmx)

msvc/config.h.in

@@ -94 +94 @@
-#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

toolbox

@@ -2 +2 @@
-
-##  toolbox for the VLC media player
-0 2003/11/27 00:05:51 sam
+1 2003/12/04 12:33:42 gbazin
-##
-##  Authors: Samuel Hocevar <sam@zoy.org>
@@ -160 +160 @@
-
-  # Clean up
-
+ msvc/*.vcproj msvc/*.sln msvc/*.ncb
-
-  # config files
@@ -195 +195 @@
-      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
@@ -306 +307 @@
-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