* ./src/misc/messages.c: added ^Ms to the WinCE logfile.

* ./bootstrap: fixed a typo that prevented per-object target directories to work. * ./evc/*, ./msvc/*: removed project files; they're becoming a bit large (more than 1MB) and I don't want to spoil the CVS with them.

* ./src/misc/messages.c: added ^Ms to the WinCE logfile.
* ./bootstrap: fixed a typo that prevented per-object target directories to work. * ./evc/*, ./msvc/*: removed project files; they're becoming a bit large (more than 1MB) and I don't want to spoil the CVS with them.
691e4704 · Sam Hocevar · 58b0fe00 · 691e4704 · 691e4704 · 58b0fe00
Commit 691e4704 authored Nov 20, 2002 by Sam Hocevar
10 changed files
--- a/bootstrap
+++ b/bootstrap
 #! /bin/sh

 ##  bootstrap file for vlc, the VideoLAN Client
-##  $Id: bootstrap,v 1.31 2002/11/20 16:43:32 sam Exp $
+##  $Id: bootstrap,v 1.32 2002/11/20 19:07:26 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>

@@ -116,36 +116,36 @@ EOF
 # Begin Source File${M}
 SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M}
 # ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\"plugins\\" /D DATA_PATH=\\"share\\"${M}
-!IF "\$(CFG)" == "vlc - Win32 (WCE MIPS) Release"${M}
-# PROP Intermediate_Dir "MIPSRel\\${subdir}"${M}
+!IF "\$(CFG)" == "libvlc - Win32 (WCE MIPS) Release"${M}
 # PROP Output_Dir "MIPSRel\\${subdir}"${M}
-!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE MIPS) Debug"${M}
-# PROP Intermediate_Dir "MIPSDbg\\${subdir}"${M}
+# PROP Intermediate_Dir "MIPSRel\\${subdir}"${M}
+!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE MIPS) Debug"${M}
 # PROP Output_Dir "MIPSDbg\\${subdir}"${M}
-!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE SH4) Release"${M}
-# PROP Intermediate_Dir "SH4Rel\\${subdir}"${M}
+# PROP Intermediate_Dir "MIPSDbg\\${subdir}"${M}
+!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE SH4) Release"${M}
 # PROP Output_Dir "SH4Rel\\${subdir}"${M}
-!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE SH4) Debug"${M}
-# PROP Intermediate_Dir "SH4Dbg\\${subdir}"${M}
+# PROP Intermediate_Dir "SH4Rel\\${subdir}"${M}
+!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE SH4) Debug"${M}
 # PROP Output_Dir "SH4Dbg\\${subdir}"${M}
-!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE SH3) Release"${M}
-# PROP Intermediate_Dir "SH3Rel\\${subdir}"${M}
+# PROP Intermediate_Dir "SH4Dbg\\${subdir}"${M}
+!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE SH3) Release"${M}
 # PROP Output_Dir "SH3Rel\\${subdir}"${M}
-!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE SH3) Debug"${M}
-# PROP Intermediate_Dir "SH3Dbg\\${subdir}"${M}
+# PROP Intermediate_Dir "SH3Rel\\${subdir}"${M}
+!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE SH3) Debug"${M}
 # PROP Output_Dir "SH3Dbg\\${subdir}"${M}
-!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE ARM) Release"${M}
-# PROP Intermediate_Dir "ARMRel\\${subdir}"${M}
+# PROP Intermediate_Dir "SH3Dbg\\${subdir}"${M}
+!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE ARM) Release"${M}
 # PROP Output_Dir "ARMRel\\${subdir}"${M}
-!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE ARM) Debug"${M}
-# PROP Intermediate_Dir "ARMDbg\\${subdir}"${M}
+# PROP Intermediate_Dir "ARMRel\\${subdir}"${M}
+!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE ARM) Debug"${M}
 # PROP Output_Dir "ARMDbg\\${subdir}"${M}
-!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE x86em) Release"${M}
-# PROP Intermediate_Dir "X86EMRel\\${subdir}"${M}
+# PROP Intermediate_Dir "ARMDbg\\${subdir}"${M}
+!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE x86em) Release"${M}
 # PROP Output_Dir "X86EMRel\\${subdir}"${M}
-!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE x86em) Debug"${M}
-# PROP Intermediate_Dir "X86EMDbg\\${subdir}"${M}
+# PROP Intermediate_Dir "X86EMRel\\${subdir}"${M}
+!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE x86em) Debug"${M}
 # PROP Output_Dir "X86EMDbg\\${subdir}"${M}
+# PROP Intermediate_Dir "X86EMDbg\\${subdir}"${M}
 !ENDIF${M}
 # End Source File${M}
 EOF
@@ -154,12 +154,12 @@ EOF
 # Begin Source File${M}
 SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M}
 # ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\"plugins\\" /D DATA_PATH=\\"share\\"${M}
-!IF "\$(CFG)" == "vlc - Win32 Release"${M}
-# PROP Intermediate_Dir "Release\\${subdir}"${M}
+!IF "\$(CFG)" == "libvlc - Win32 Release"${M}
 # PROP Output_Dir "Release\\${subdir}"${M}
-!ELSEIF "\$(CFG)" == "vlc - Win32 Debug"${M}
-# PROP Intermediate_Dir "Debug\\${subdir}"${M}
+# PROP Intermediate_Dir "Release\\${subdir}"${M}
+!ELSEIF "\$(CFG)" == "libvlc - Win32 Debug"${M}
 # PROP Output_Dir "Debug\\${subdir}"${M}
+# PROP Intermediate_Dir "Debug\\${subdir}"${M}
 !ENDIF${M}
 # End Source File${M}
 EOF

--- a/evc/.cvsignore
+++ b/evc/.cvsignore
@@ -7,3 +7,8 @@ SH3Rel
 SH4Dbg
 SH4Rel
 X86EMDbg
+X86EMRel
+*.vcp
+*.vcl
+*.vcb
+*.vco
--- a/evc/libvlc.vcp
+++ b/evc/libvlc.vcp
--- a/evc/vlc.vcp
+++ b/evc/vlc.vcp
--- a/evc/vlc.vcw
+++ b/evc/vlc.vcw
@@ -347,6 +347,75 @@ Package=<5>

 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name plugin_a52tospdif
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name plugin_access_file
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name plugin_dummy
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name plugin_es
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name plugin_fixed32tofloat32
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name plugin_fixed32tos16
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name plugin_i420_rgb
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name plugin_i420_yuy2
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name plugin_i422_yuy2
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name plugin_idct
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name plugin_idctclassic
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name plugin_linear_resampler
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name plugin_memcpy
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name plugin_motion
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name plugin_mpeg_audio
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name plugin_mpeg_system
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name plugin_mpeg_video
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name plugin_ps
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name plugin_trivial_channel_mixer
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name plugin_trivial_mixer
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name plugin_trivial_resampler
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name plugin_ts
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name plugin_waveout
+    End Project Dependency
    Begin Project Dependency
    Project_Dep_Name libvlc
    End Project Dependency

--- a/msvc/.cvsignore
+++ b/msvc/.cvsignore
 Debug
 Release
-vlc.ncb
-vlc.opt
-vlc.plg
+*.dsp
+*.ncb
+*.opt
+*.plg
--- a/msvc/libvlc.dsp
+++ b/msvc/libvlc.dsp
--- a/msvc/plugins.dsp
+++ b/msvc/plugins.dsp
-# Microsoft Developer Studio Project File - Name="plugins" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=plugins - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "plugins.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "plugins.mak" CFG="plugins - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "plugins - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "plugins - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "plugins - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# 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..\include /c
-# ADD BASE RSC /l 0x414 /d "NDEBUG"
-# ADD RSC /l 0x414 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib netapi32.lib winmm.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "plugins - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# 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" /FR /YX /FD /GZ -I..\include /c
-# ADD BASE RSC /l 0x414 /d "_DEBUG"
-# ADD RSC /l 0x809 /i "../" /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib netapi32.lib winmm.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "plugins - Win32 Release"
-# Name "plugins - Win32 Debug"
-
-# Begin Group "Source Files"
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# End Group
-# Begin Group "Header Files"
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# End Target
-# End Project
--- a/msvc/vlc.dsp
+++ b/msvc/vlc.dsp
-# Microsoft Developer Studio Project File - Name="vlc" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=vlc - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "vlc.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "vlc.mak" CFG="vlc - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "vlc - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "vlc - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# 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 /MD /W3 /GX /O2 /I "." /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x414 /d "NDEBUG"
-# ADD RSC /l 0x414 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib netapi32.lib winmm.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# 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 /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x414 /d "_DEBUG"
-# ADD RSC /l 0x809 /i "../" /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib netapi32.lib winmm.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "vlc - Win32 Release"
-# Name "vlc - Win32 Debug"
-
-# Begin Group "Source Files"
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-SOURCE="..\src\vlc.c"
-# End Source File
-# End Group
-
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=..\share\vlc_win32_rc.rc
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 Debug"
-
-# 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 
-
-# End Source File
-# End Group
-# End Target
-# End Project
--- a/src/misc/messages.c
+++ b/src/misc/messages.c
@@ -4,7 +4,7 @@
 * modules, especially intf modules. See config.h for output configuration.
 *****************************************************************************
 * Copyright (C) 1998-2002 VideoLAN
- * $Id: messages.c,v 1.23 2002/11/13 15:28:24 sam Exp $
+ * $Id: messages.c,v 1.24 2002/11/20 19:07:27 sam Exp $
 *
 * Authors: Vincent Seguin <seguin@via.ecp.fr>
 *          Samuel Hocevar <sam@zoy.org>
@@ -463,7 +463,7 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
    CE_WRITE( ppsz_type[i_type] );
    CE_WRITE( ": " );
    CE_WRITE( p_item->psz_msg );
-    CE_WRITE( "\n" );
+    CE_WRITE( "\r\n" );
    FlushFileBuffers( p_this->p_libvlc->msg_bank.logfile );

 #else