From 4a8ce8ac45b0463314cc32076ab89e12d0f07bfd Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@videolan.org>
Date: Tue, 19 Nov 2002 17:38:07 +0000
Subject: [PATCH]   * ./src/misc/modules.c: p_module->psz_filename is now
 filled with a real     8 bit string under WinCE.   * ./extras/Win32_msvc:
 scrapped this directory.   * ./bootstrap: we now parse plugin makefiles to
 guess what to put in     the MSVC project files. Only the dummy plugin has
 been tested yet.

---
 bootstrap                                |   95 +-
 evc/.cvsignore                           |    9 +
 evc/libvlc.vcp.in                        |   10 +
 evc/plugins.vcp                          |  394 ------
 evc/plugins.vcp.in                       |  270 ++--
 evc/vlc.vcp                              |  249 +---
 evc/vlc.vcp.in                           |   38 +
 evc/vlc.vcp.out                          |   34 -
 extras/Win32_msvc/defs.h                 |  107 --
 extras/Win32_msvc/modules_builtin_msvc.h |  140 --
 extras/Win32_msvc/readme.txt             |   10 -
 extras/Win32_msvc/vlc.dsp                | 1631 ----------------------
 extras/Win32_msvc/vlc.dsw                |   29 -
 msvc/libvlc.dsp.in                       |   10 +
 msvc/vlc.dsp.in                          |   27 +
 msvc/vlc.dsp.out                         |   23 -
 src/misc/modules.c                       |   17 +-
 17 files changed, 299 insertions(+), 2794 deletions(-)
 create mode 100644 evc/.cvsignore
 delete mode 100644 evc/plugins.vcp
 delete mode 100644 evc/vlc.vcp.out
 delete mode 100755 extras/Win32_msvc/defs.h
 delete mode 100755 extras/Win32_msvc/modules_builtin_msvc.h
 delete mode 100755 extras/Win32_msvc/readme.txt
 delete mode 100755 extras/Win32_msvc/vlc.dsp
 delete mode 100755 extras/Win32_msvc/vlc.dsw
 delete mode 100644 msvc/vlc.dsp.out

diff --git a/bootstrap b/bootstrap
index 951d69c885..7af99ad4a3 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,15 +1,17 @@
 #! /bin/sh
 
 ##  bootstrap file for vlc, the VideoLAN Client
-##  $Id: bootstrap,v 1.28 2002/11/18 11:50:42 sam Exp $
+##  $Id: bootstrap,v 1.29 2002/11/19 17:38:06 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
 ###
-###  get a sane environment
+###  Get a sane environment, just in case
 ###
 LANG=C
 export LANG
+CYGWIN=binmode
+export CYGWIN
 
 ##
 ##  Give help
@@ -72,6 +74,8 @@ then
     exit 1
   fi
 
+  echo "generating Visual Studio files..."
+
   #  The evil ^M
   M='
'
 
@@ -83,14 +87,11 @@ then
   # libvlc files
   for target in evc/libvlc.vcp msvc/libvlc.dsp
   do
+    echo "${target}"
     rm -f ${target}
     #  Top of the project file
-    cat ${target}.in > ${target}
+    perl -pe 'if(/�SOURCES�/){last;}' < ${target}.in > ${target}
     #  The source files
-    cat >> ${target} << EOF
-# Begin Group "Source Files"${M}
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"${M}
-EOF
     for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep -v "/.*/"`
     do
       cat >> ${target} << EOF
@@ -166,14 +167,8 @@ EOF
 # End Group${M}
 EOF
     done
-    cat >> ${target} << EOF
-# End Group${M}
-EOF
     #  The headers
-    cat >> ${target} << EOF
-# Begin Group "Header Files"${M}
-# PROP Default_Filter "h;hpp;hxx;hm;inl"${M}
-EOF
+    perl -e 'while(<>){if(/�SOURCES�/){last;}}while(<>){if(/�HEADERS�/){last;}print $_}' < ${target}.in >> ${target}
     for file in ${LIBVLC_HEADERS}
     do
       cat >> ${target} << EOF
@@ -195,64 +190,72 @@ EOF
     done
     cat >> ${target} << EOF
 # End Group${M}
-# End Group${M}
-# End Target${M}
-# End Project${M}
 EOF
+    perl -e 'while(<>){if(/�HEADERS�/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
   done
 
   # plugins files
-  for target in evc/plugins.vcp msvc/plugins.dsp
+  for dir in evc msvc
   do
-    rm -f ${target}
-    #  Top of the project file
-    cat ${target}.in > ${target}
-    #  The source files
-    cat >> ${target} << EOF
-# Begin Group "Source Files"${M}
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"${M}
-# End Group${M}
-EOF
-    #  The headers
-    cat >> ${target} << EOF
-# Begin Group "Header Files"${M}
-# PROP Default_Filter "h;hpp;hxx;hm;inl"${M}
-# End Group${M}
-# End Target${M}
-# End Project${M}
+    test "${dir}" = "evc" && suf="vcp" || suf="dsp"
+    for plugin in dummy
+    do
+      makefile="`grep '^L_'${plugin}'_pic =' Modules.am | sed -e 's@.* modules@modules@' -e 's@/[^/]*$@/Modules.am@'`"
+      source="${dir}/plugins.${suf}.in"
+      target="${dir}/plugin_${plugin}.${suf}"
+      echo "${target}"
+      rm -f ${target}
+      perl -pe 'if(/�SOURCES�/){last;} s/�PLUGIN�/'${plugin}'/g' < ${source} > ${target}
+      # this is an attempt at getting a list of plugin sources
+      sed -ne 's/^SOURCES_'${plugin}'.*=//; t foo; /^[a-zA-Z]/q; :foo p' < ${makefile} | tr '\\ ' '\n\n' | sed -ne 's,/,\\\\,g; s/.*modules/modules/p' | while read source
+      do
+        cat >> ${target} << EOF
+# Begin Source File${M}
+SOURCE="..\\${source}"${M}
+# End Source File${M}
 EOF
+      done
+      # sed is really nicer for this... unfortunately it's broken under cygwin
+      # sed -ne '1,/�SOURCES�/d; /�HEADERS�/,$d; p' < ${source} >> ${target}
+      perl -e 'while(<>){if(/�SOURCES�/){last;}}while(<>){if(/�HEADERS�/){last;}print $_}' < ${source} >> ${target}
+### header generation disabled
+##      cat >> ${target} << EOF
+### Begin Source File${M}
+##SOURCE="..\\test.h"${M}
+### End Source File${M}
+##EOF
+      # sed -ne '1,/�HEADERS�/d; p' < ${source} >> ${target}
+      perl -e 'while(<>){if(/�HEADERS�/){last;}}while(<>){print $_}' < ${source} >> ${target}
+    done
   done
 
   # vlc files
   for target in evc/vlc.vcp msvc/vlc.dsp
   do
+    echo "${target}"
     rm -f ${target}
     #  Top of the project file
-    cat ${target}.in > ${target}
+    perl -pe 'if(/�SOURCES�/){last;}' < ${target}.in > ${target}
     #  The source files
-    cat >> ${target} << EOF
-# Begin Group "Source Files"${M}
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"${M}
-# Begin Source File${M}
-EOF
     if test "${target}" = "evc/vlc.vcp"
     then
       cat >> ${target} << EOF
+# Begin Source File${M}
 SOURCE="..\\evc\\vlc.c"${M}
+# End Source File${M}
 EOF
     else
       cat >> ${target} << EOF
+# Begin Source File${M}
 SOURCE="..\\src\\vlc.c"${M}
-EOF
-    fi
-    cat >> ${target} << EOF
 # End Source File${M}
-# End Group${M}
 EOF
+    fi
     #  Bottom of the project file - handles resource files too
-    cat ${target}.out >> ${target}
+    perl -e 'while(<>){if(/�SOURCES�/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
   done
 
+  echo "done."
   exit 0
 fi
 
@@ -262,7 +265,7 @@ fi
 if test "$do_po" = "yes"
 then
   cd po
-  make update-po 2>&1 | grep '^[^:]*:$' | cut -f1 -d: | tr '\n' ' ' | sed 's/ $//'
+  make update-po #2>&1 | grep '^[^:]*:$' | cut -f1 -d: | tr '\n' ' ' | sed 's/ $//'
   cd ..
 
   exit 0
diff --git a/evc/.cvsignore b/evc/.cvsignore
new file mode 100644
index 0000000000..216e03d5fb
--- /dev/null
+++ b/evc/.cvsignore
@@ -0,0 +1,9 @@
+ARMDbg
+ARMRel
+MIPSDbg
+MIPSRel
+SH3Dbg
+SH3Rel
+SH4Dbg
+SH4Rel
+X86EMDbg
diff --git a/evc/libvlc.vcp.in b/evc/libvlc.vcp.in
index 0f132845f0..37afd3e428 100644
--- a/evc/libvlc.vcp.in
+++ b/evc/libvlc.vcp.in
@@ -314,3 +314,13 @@ BSC32=bscmake.exe
 # Name "libvlc - Win32 (WCE x86em) Release"
 # Name "libvlc - Win32 (WCE x86em) Debug"
 
+# Begin Group "Source Files"
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+�SOURCES�
+# End Group
+# Begin Group "Header Files"
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+�HEADERS�
+# End Group
+# End Target
+# End Project
diff --git a/evc/plugins.vcp b/evc/plugins.vcp
deleted file mode 100644
index a780bf0a9c..0000000000
--- a/evc/plugins.vcp
+++ /dev/null
@@ -1,394 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="plugins" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARM) Application" 0x8501
-# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01
-# TARGTYPE "Win32 (WCE SH3) Application" 0x8101
-# TARGTYPE "Win32 (WCE SH4) Application" 0x8601
-# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201
-
-CFG=plugins - Win32 (WCE MIPS) 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.vcn".
-!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.vcn" CFG="plugins - Win32 (WCE MIPS) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "plugins - Win32 (WCE MIPS) Release" (based on "Win32 (WCE MIPS) Application")
-!MESSAGE "plugins - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")
-!MESSAGE "plugins - Win32 (WCE SH4) Release" (based on "Win32 (WCE SH4) Application")
-!MESSAGE "plugins - Win32 (WCE SH4) Debug" (based on "Win32 (WCE SH4) Application")
-!MESSAGE "plugins - Win32 (WCE SH3) Release" (based on "Win32 (WCE SH3) Application")
-!MESSAGE "plugins - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")
-!MESSAGE "plugins - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Application")
-!MESSAGE "plugins - Win32 (WCE ARM) Debug" (based on "Win32 (WCE ARM) Application")
-!MESSAGE "plugins - Win32 (WCE x86em) Release" (based on "Win32 (WCE x86em) Application")
-!MESSAGE "plugins - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-
-!IF  "$(CFG)" == "plugins - Win32 (WCE MIPS) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "MIPSRel"
-# PROP BASE Intermediate_Dir "MIPSRel"
-# PROP BASE CPU_ID "{D6519010-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "MIPSRel"
-# PROP Intermediate_Dir "MIPSRel"
-# PROP CPU_ID "{D6519010-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r
-CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "." /I "..\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Oxs /M$(CECrtMT) /c
-# SUBTRACT CPP /YX /Yc /Yu
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS
-
-!ELSEIF  "$(CFG)" == "plugins - Win32 (WCE MIPS) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "MIPSDbg"
-# PROP BASE Intermediate_Dir "MIPSDbg"
-# PROP BASE CPU_ID "{D6519010-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "MIPSDbg"
-# PROP Intermediate_Dir "MIPSDbg"
-# PROP CPU_ID "{D6519010-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r
-CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX /Yc /Yu
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS
-
-!ELSEIF  "$(CFG)" == "plugins - Win32 (WCE SH4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "SH4Rel"
-# PROP BASE Intermediate_Dir "SH4Rel"
-# PROP BASE CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "SH4Rel"
-# PROP Intermediate_Dir "SH4Rel"
-# PROP CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r
-CPP=shcl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /Qsh4 /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "." /I "..\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Qsh4 /Oxs /M$(CECrtMT) /c
-# SUBTRACT CPP /YX /Yc /Yu
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4
-
-!ELSEIF  "$(CFG)" == "plugins - Win32 (WCE SH4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SH4Dbg"
-# PROP BASE Intermediate_Dir "SH4Dbg"
-# PROP BASE CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "SH4Dbg"
-# PROP Intermediate_Dir "SH4Dbg"
-# PROP CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r
-CPP=shcl.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /Qsh4 /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Qsh4 /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX /Yc /Yu
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4
-
-!ELSEIF  "$(CFG)" == "plugins - Win32 (WCE SH3) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "SH3Rel"
-# PROP BASE Intermediate_Dir "SH3Rel"
-# PROP BASE CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "SH3Rel"
-# PROP Intermediate_Dir "SH3Rel"
-# PROP CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r
-CPP=shcl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "." /I "..\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Oxs /M$(CECrtMT) /c
-# SUBTRACT CPP /YX /Yc /Yu
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3
-
-!ELSEIF  "$(CFG)" == "plugins - Win32 (WCE SH3) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SH3Dbg"
-# PROP BASE Intermediate_Dir "SH3Dbg"
-# PROP BASE CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "SH3Dbg"
-# PROP Intermediate_Dir "SH3Dbg"
-# PROP CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r
-CPP=shcl.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX /Yc /Yu
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3
-
-!ELSEIF  "$(CFG)" == "plugins - Win32 (WCE ARM) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMRel"
-# PROP BASE Intermediate_Dir "ARMRel"
-# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ARMRel"
-# PROP Intermediate_Dir "ARMRel"
-# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "." /I "..\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Oxs /M$(CECrtMT) /c
-# SUBTRACT CPP /YX /Yc /Yu
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF  "$(CFG)" == "plugins - Win32 (WCE ARM) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMDbg"
-# PROP BASE Intermediate_Dir "ARMDbg"
-# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "ARMDbg"
-# PROP Intermediate_Dir "ARMDbg"
-# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX /Yc /Yu
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF  "$(CFG)" == "plugins - Win32 (WCE x86em) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "X86EMRel"
-# PROP BASE Intermediate_Dir "X86EMRel"
-# PROP BASE CPU_ID "{D6518FF4-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "X86EMRel"
-# PROP Intermediate_Dir "X86EMRel"
-# PROP CPU_ID "{D6518FF4-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Yu"stdafx.h" /Gz /Oxs /c
-# ADD CPP /nologo /W3 /I "." /I "..\include" /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Gz /Oxs /c
-# SUBTRACT CPP /YX /Yc /Yu
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /stack:0x10000,0x1000 /subsystem:windows /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86
-# ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /stack:0x10000,0x1000 /subsystem:windows /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86
-
-!ELSEIF  "$(CFG)" == "plugins - Win32 (WCE x86em) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "X86EMDbg"
-# PROP BASE Intermediate_Dir "X86EMDbg"
-# PROP BASE CPU_ID "{D6518FF4-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "X86EMDbg"
-# PROP Intermediate_Dir "X86EMDbg"
-# PROP CPU_ID "{D6518FF4-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "i486" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Yu"stdafx.h" /Gz /c
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "i486" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Gz /c
-# SUBTRACT CPP /YX /Yc /Yu
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /stack:0x10000,0x1000 /subsystem:windows /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86
-# ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /stack:0x10000,0x1000 /subsystem:windows /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86
-
-!ENDIF 
-
-# Begin Target
-
-# Name "plugins - Win32 (WCE MIPS) Release"
-# Name "plugins - Win32 (WCE MIPS) Debug"
-# Name "plugins - Win32 (WCE SH4) Release"
-# Name "plugins - Win32 (WCE SH4) Debug"
-# Name "plugins - Win32 (WCE SH3) Release"
-# Name "plugins - Win32 (WCE SH3) Debug"
-# Name "plugins - Win32 (WCE ARM) Release"
-# Name "plugins - Win32 (WCE ARM) Debug"
-# Name "plugins - Win32 (WCE x86em) Release"
-# Name "plugins - Win32 (WCE x86em) 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
diff --git a/evc/plugins.vcp.in b/evc/plugins.vcp.in
index f270012d8a..8162e8aac4 100644
--- a/evc/plugins.vcp.in
+++ b/evc/plugins.vcp.in
@@ -1,36 +1,36 @@
-# Microsoft eMbedded Visual Tools Project File - Name="plugins" - Package Owner=<4>
+# Microsoft eMbedded Visual Tools Project File - Name="plugin_�PLUGIN�" - Package Owner=<4>
 # Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (WCE ARM) Application" 0x8501
-# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01
-# TARGTYPE "Win32 (WCE SH3) Application" 0x8101
-# TARGTYPE "Win32 (WCE SH4) Application" 0x8601
-# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201
+# TARGTYPE "Win32 (WCE x86em) Dynamic-Link Library" 0x7f02
+# TARGTYPE "Win32 (WCE SH3) Dynamic-Link Library" 0x8102
+# TARGTYPE "Win32 (WCE ARM) Dynamic-Link Library" 0x8502
+# TARGTYPE "Win32 (WCE SH4) Dynamic-Link Library" 0x8602
+# TARGTYPE "Win32 (WCE MIPS) Dynamic-Link Library" 0x8202
 
-CFG=plugins - Win32 (WCE MIPS) Debug
+CFG=plugin_�PLUGIN� - Win32 (WCE MIPS) 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.vcn".
+!MESSAGE NMAKE /f "plugin_�PLUGIN�.vcn".
 !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.vcn" CFG="plugins - Win32 (WCE MIPS) Debug"
+!MESSAGE NMAKE /f "plugin_�PLUGIN�.vcn" CFG="plugin_�PLUGIN� - Win32 (WCE MIPS) Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "plugins - Win32 (WCE MIPS) Release" (based on "Win32 (WCE MIPS) Application")
-!MESSAGE "plugins - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")
-!MESSAGE "plugins - Win32 (WCE SH4) Release" (based on "Win32 (WCE SH4) Application")
-!MESSAGE "plugins - Win32 (WCE SH4) Debug" (based on "Win32 (WCE SH4) Application")
-!MESSAGE "plugins - Win32 (WCE SH3) Release" (based on "Win32 (WCE SH3) Application")
-!MESSAGE "plugins - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")
-!MESSAGE "plugins - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Application")
-!MESSAGE "plugins - Win32 (WCE ARM) Debug" (based on "Win32 (WCE ARM) Application")
-!MESSAGE "plugins - Win32 (WCE x86em) Release" (based on "Win32 (WCE x86em) Application")
-!MESSAGE "plugins - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")
+!MESSAGE "plugin_�PLUGIN� - Win32 (WCE MIPS) Release" (based on "Win32 (WCE MIPS) Dynamic-Link Library")
+!MESSAGE "plugin_�PLUGIN� - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Dynamic-Link Library")
+!MESSAGE "plugin_�PLUGIN� - Win32 (WCE SH4) Release" (based on "Win32 (WCE SH4) Dynamic-Link Library")
+!MESSAGE "plugin_�PLUGIN� - Win32 (WCE SH4) Debug" (based on "Win32 (WCE SH4) Dynamic-Link Library")
+!MESSAGE "plugin_�PLUGIN� - Win32 (WCE SH3) Release" (based on "Win32 (WCE SH3) Dynamic-Link Library")
+!MESSAGE "plugin_�PLUGIN� - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Dynamic-Link Library")
+!MESSAGE "plugin_�PLUGIN� - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Dynamic-Link Library")
+!MESSAGE "plugin_�PLUGIN� - Win32 (WCE ARM) Debug" (based on "Win32 (WCE ARM) Dynamic-Link Library")
+!MESSAGE "plugin_�PLUGIN� - Win32 (WCE x86em) Release" (based on "Win32 (WCE x86em) Dynamic-Link Library")
+!MESSAGE "plugin_�PLUGIN� - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -39,29 +39,29 @@ CFG=plugins - Win32 (WCE MIPS) Debug
 # PROP Scc_LocalPath ""
 # PROP ATL_Project 2
 
-!IF  "$(CFG)" == "plugins - Win32 (WCE MIPS) Release"
+!IF  "$(CFG)" == "plugin_�PLUGIN� - Win32 (WCE MIPS) Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "MIPSRel"
-# PROP BASE Intermediate_Dir "MIPSRel"
+# PROP BASE Output_Dir "MIPSRel\plugin_�PLUGIN�"
+# PROP BASE Intermediate_Dir "MIPSRel\plugin_�PLUGIN�"
 # PROP BASE CPU_ID "{D6519010-710F-11D3-99F2-00105A0DF099}"
 # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "MIPSRel"
-# PROP Intermediate_Dir "MIPSRel"
+# PROP Output_Dir "MIPSRel\plugin_�PLUGIN�"
+# PROP Intermediate_Dir "MIPSRel\plugin_�PLUGIN�"
 # PROP CPU_ID "{D6519010-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r
 CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "." /I "..\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Oxs /M$(CECrtMT) /c
-# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /Yu"stdafx.h" /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "." /I "..\include" /D "MIPS" /D "_MIPS_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=�PLUGIN� /D "MODULE_NAME_is_�PLUGIN�" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Oxs /M$(CECrtMT) /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -69,32 +69,32 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS
+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS
+# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"vlc_entry__0_5_0_cvs_am" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS
 
-!ELSEIF  "$(CFG)" == "plugins - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "plugin_�PLUGIN� - Win32 (WCE MIPS) Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "MIPSDbg"
-# PROP BASE Intermediate_Dir "MIPSDbg"
+# PROP BASE Output_Dir "MIPSDbg\plugin_�PLUGIN�"
+# PROP BASE Intermediate_Dir "MIPSDbg\plugin_�PLUGIN�"
 # PROP BASE CPU_ID "{D6519010-710F-11D3-99F2-00105A0DF099}"
 # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "MIPSDbg"
-# PROP Intermediate_Dir "MIPSDbg"
+# PROP Output_Dir "MIPSDbg\plugin_�PLUGIN�"
+# PROP Intermediate_Dir "MIPSDbg\plugin_�PLUGIN�"
 # PROP CPU_ID "{D6519010-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r
 CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /Yu"stdafx.h" /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=�PLUGIN� /D "MODULE_NAME_is_�PLUGIN�" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /M$(CECrtMTDebug) /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -102,32 +102,32 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS
+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS
+# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"vlc_entry__0_5_0_cvs_am" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS
 
-!ELSEIF  "$(CFG)" == "plugins - Win32 (WCE SH4) Release"
+!ELSEIF  "$(CFG)" == "plugin_�PLUGIN� - Win32 (WCE SH4) Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "SH4Rel"
-# PROP BASE Intermediate_Dir "SH4Rel"
+# PROP BASE Output_Dir "SH4Rel\plugin_�PLUGIN�"
+# PROP BASE Intermediate_Dir "SH4Rel\plugin_�PLUGIN�"
 # PROP BASE CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}"
 # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "SH4Rel"
-# PROP Intermediate_Dir "SH4Rel"
+# PROP Output_Dir "SH4Rel\plugin_�PLUGIN�"
+# PROP Intermediate_Dir "SH4Rel\plugin_�PLUGIN�"
 # PROP CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r
 CPP=shcl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /Qsh4 /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "." /I "..\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Qsh4 /Oxs /M$(CECrtMT) /c
-# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /Yu"stdafx.h" /Qsh4 /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "." /I "..\include" /D "SHx" /D "SH4" /D "_SH4_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=�PLUGIN� /D "MODULE_NAME_is_�PLUGIN�" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Qsh4 /Oxs /M$(CECrtMT) /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -135,32 +135,32 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4
+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4
+# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"vlc_entry__0_5_0_cvs_am" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4
 
-!ELSEIF  "$(CFG)" == "plugins - Win32 (WCE SH4) Debug"
+!ELSEIF  "$(CFG)" == "plugin_�PLUGIN� - Win32 (WCE SH4) Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SH4Dbg"
-# PROP BASE Intermediate_Dir "SH4Dbg"
+# PROP BASE Output_Dir "SH4Dbg\plugin_�PLUGIN�"
+# PROP BASE Intermediate_Dir "SH4Dbg\plugin_�PLUGIN�"
 # PROP BASE CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}"
 # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "SH4Dbg"
-# PROP Intermediate_Dir "SH4Dbg"
+# PROP Output_Dir "SH4Dbg\plugin_�PLUGIN�"
+# PROP Intermediate_Dir "SH4Dbg\plugin_�PLUGIN�"
 # PROP CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r
 CPP=shcl.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /Qsh4 /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Qsh4 /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /Yu"stdafx.h" /Qsh4 /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=�PLUGIN� /D "MODULE_NAME_is_�PLUGIN�" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Qsh4 /M$(CECrtMTDebug) /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -168,32 +168,32 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4
+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4
+# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"vlc_entry__0_5_0_cvs_am" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4
 
-!ELSEIF  "$(CFG)" == "plugins - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "plugin_�PLUGIN� - Win32 (WCE SH3) Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "SH3Rel"
-# PROP BASE Intermediate_Dir "SH3Rel"
+# PROP BASE Output_Dir "SH3Rel\plugin_�PLUGIN�"
+# PROP BASE Intermediate_Dir "SH3Rel\plugin_�PLUGIN�"
 # PROP BASE CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}"
 # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "SH3Rel"
-# PROP Intermediate_Dir "SH3Rel"
+# PROP Output_Dir "SH3Rel\plugin_�PLUGIN�"
+# PROP Intermediate_Dir "SH3Rel\plugin_�PLUGIN�"
 # PROP CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r
 CPP=shcl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "." /I "..\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Oxs /M$(CECrtMT) /c
-# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /Yu"stdafx.h" /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "." /I "..\include" /D "SHx" /D "SH3" /D "_SH3_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=�PLUGIN� /D "MODULE_NAME_is_�PLUGIN�" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Oxs /M$(CECrtMT) /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -201,32 +201,32 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3
+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3
+# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"vlc_entry__0_5_0_cvs_am" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3
 
-!ELSEIF  "$(CFG)" == "plugins - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "plugin_�PLUGIN� - Win32 (WCE SH3) Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SH3Dbg"
-# PROP BASE Intermediate_Dir "SH3Dbg"
+# PROP BASE Output_Dir "SH3Dbg\plugin_�PLUGIN�"
+# PROP BASE Intermediate_Dir "SH3Dbg\plugin_�PLUGIN�"
 # PROP BASE CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}"
 # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "SH3Dbg"
-# PROP Intermediate_Dir "SH3Dbg"
+# PROP Output_Dir "SH3Dbg\plugin_�PLUGIN�"
+# PROP Intermediate_Dir "SH3Dbg\plugin_�PLUGIN�"
 # PROP CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r
 CPP=shcl.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /Yu"stdafx.h" /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=�PLUGIN� /D "MODULE_NAME_is_�PLUGIN�" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /M$(CECrtMTDebug) /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -234,32 +234,32 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3
+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3
+# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"vlc_entry__0_5_0_cvs_am" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3
 
-!ELSEIF  "$(CFG)" == "plugins - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "plugin_�PLUGIN� - Win32 (WCE ARM) Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMRel"
-# PROP BASE Intermediate_Dir "ARMRel"
+# PROP BASE Output_Dir "ARMRel\plugin_�PLUGIN�"
+# PROP BASE Intermediate_Dir "ARMRel\plugin_�PLUGIN�"
 # PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
 # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ARMRel"
-# PROP Intermediate_Dir "ARMRel"
+# PROP Output_Dir "ARMRel\plugin_�PLUGIN�"
+# PROP Intermediate_Dir "ARMRel\plugin_�PLUGIN�"
 # PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
 CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "." /I "..\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Oxs /M$(CECrtMT) /c
-# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /Yu"stdafx.h" /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "." /I "..\include" /D "ARM" /D "_ARM_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=�PLUGIN� /D "MODULE_NAME_is_�PLUGIN�" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Oxs /M$(CECrtMT) /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -267,32 +267,32 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"vlc_entry__0_5_0_cvs_am" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
 
-!ELSEIF  "$(CFG)" == "plugins - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "plugin_�PLUGIN� - Win32 (WCE ARM) Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMDbg"
-# PROP BASE Intermediate_Dir "ARMDbg"
+# PROP BASE Output_Dir "ARMDbg\plugin_�PLUGIN�"
+# PROP BASE Intermediate_Dir "ARMDbg\plugin_�PLUGIN�"
 # PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
 # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "ARMDbg"
-# PROP Intermediate_Dir "ARMDbg"
+# PROP Output_Dir "ARMDbg\plugin_�PLUGIN�"
+# PROP Intermediate_Dir "ARMDbg\plugin_�PLUGIN�"
 # PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
 CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /Yu"stdafx.h" /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=�PLUGIN� /D "MODULE_NAME_is_�PLUGIN�" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /M$(CECrtMTDebug) /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -300,32 +300,32 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"vlc_entry__0_5_0_cvs_am" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
 
-!ELSEIF  "$(CFG)" == "plugins - Win32 (WCE x86em) Release"
+!ELSEIF  "$(CFG)" == "plugin_�PLUGIN� - Win32 (WCE x86em) Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "X86EMRel"
-# PROP BASE Intermediate_Dir "X86EMRel"
+# PROP BASE Output_Dir "X86EMRel\plugin_�PLUGIN�"
+# PROP BASE Intermediate_Dir "X86EMRel\plugin_�PLUGIN�"
 # PROP BASE CPU_ID "{D6518FF4-710F-11D3-99F2-00105A0DF099}"
 # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "X86EMRel"
-# PROP Intermediate_Dir "X86EMRel"
+# PROP Output_Dir "X86EMRel\plugin_�PLUGIN�"
+# PROP Intermediate_Dir "X86EMRel\plugin_�PLUGIN�"
 # PROP CPU_ID "{D6518FF4-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r
 CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Yu"stdafx.h" /Gz /Oxs /c
-# ADD CPP /nologo /W3 /I "." /I "..\include" /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Gz /Oxs /c
-# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /Yu"stdafx.h" /Gz /Oxs /c
+# ADD CPP /nologo /W3 /I "." /I "..\include" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "i486" /D "_X86_" /D "x86" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=�PLUGIN� /D "MODULE_NAME_is_�PLUGIN�" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Gz /Oxs /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -333,32 +333,32 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /stack:0x10000,0x1000 /subsystem:windows /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86
-# ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /stack:0x10000,0x1000 /subsystem:windows /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86
+# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /stack:0x10000,0x1000 /dll /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86
+# ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /stack:0x10000,0x1000 /entry:"vlc_entry__0_5_0_cvs_am" /dll /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86
 
-!ELSEIF  "$(CFG)" == "plugins - Win32 (WCE x86em) Debug"
+!ELSEIF  "$(CFG)" == "plugin_�PLUGIN� - Win32 (WCE x86em) Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "X86EMDbg"
-# PROP BASE Intermediate_Dir "X86EMDbg"
+# PROP BASE Output_Dir "X86EMDbg\plugin_�PLUGIN�"
+# PROP BASE Intermediate_Dir "X86EMDbg\plugin_�PLUGIN�"
 # PROP BASE CPU_ID "{D6518FF4-710F-11D3-99F2-00105A0DF099}"
 # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "X86EMDbg"
-# PROP Intermediate_Dir "X86EMDbg"
+# PROP Output_Dir "X86EMDbg\plugin_�PLUGIN�"
+# PROP Intermediate_Dir "X86EMDbg\plugin_�PLUGIN�"
 # PROP CPU_ID "{D6518FF4-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r
 CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "i486" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Yu"stdafx.h" /Gz /c
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "i486" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Gz /c
-# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /Yu"stdafx.h" /Gz /c
+# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "i486" /D "_X86_" /D "x86" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=�PLUGIN� /D "MODULE_NAME_is_�PLUGIN�" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Gz /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -366,21 +366,33 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /stack:0x10000,0x1000 /subsystem:windows /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86
-# ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /stack:0x10000,0x1000 /subsystem:windows /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86
+# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /stack:0x10000,0x1000 /dll /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86
+# ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /stack:0x10000,0x1000 /dll /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86
 
 !ENDIF 
 
 # Begin Target
 
-# Name "plugins - Win32 (WCE MIPS) Release"
-# Name "plugins - Win32 (WCE MIPS) Debug"
-# Name "plugins - Win32 (WCE SH4) Release"
-# Name "plugins - Win32 (WCE SH4) Debug"
-# Name "plugins - Win32 (WCE SH3) Release"
-# Name "plugins - Win32 (WCE SH3) Debug"
-# Name "plugins - Win32 (WCE ARM) Release"
-# Name "plugins - Win32 (WCE ARM) Debug"
-# Name "plugins - Win32 (WCE x86em) Release"
-# Name "plugins - Win32 (WCE x86em) Debug"
+# Name "plugin_�PLUGIN� - Win32 (WCE MIPS) Release"
+# Name "plugin_�PLUGIN� - Win32 (WCE MIPS) Debug"
+# Name "plugin_�PLUGIN� - Win32 (WCE SH4) Release"
+# Name "plugin_�PLUGIN� - Win32 (WCE SH4) Debug"
+# Name "plugin_�PLUGIN� - Win32 (WCE SH3) Release"
+# Name "plugin_�PLUGIN� - Win32 (WCE SH3) Debug"
+# Name "plugin_�PLUGIN� - Win32 (WCE ARM) Release"
+# Name "plugin_�PLUGIN� - Win32 (WCE ARM) Debug"
+# Name "plugin_�PLUGIN� - Win32 (WCE x86em) Release"
+# Name "plugin_�PLUGIN� - Win32 (WCE x86em) Debug"
 
+# Begin Group "Source Files"
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+�SOURCES�
+# End Group
+
+# Begin Group "Header Files"
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+�HEADERS�
+# End Group
+
+# End Target
+# End Project
diff --git a/evc/vlc.vcp b/evc/vlc.vcp
index c9cf7739f8..489d543a1d 100644
--- a/evc/vlc.vcp
+++ b/evc/vlc.vcp
@@ -357,7 +357,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r
 CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "i486" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Yu"stdafx.h" /Gz /c
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "i486" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /FR /Gz /c
+# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "i486" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Gz /c
 # SUBTRACT CPP /YX /Yc /Yu
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -383,257 +383,14 @@ LINK32=link.exe
 # Name "vlc - Win32 (WCE ARM) Debug"
 # Name "vlc - Win32 (WCE x86em) Release"
 # Name "vlc - Win32 (WCE x86em) Debug"
-# Begin Group "Source Files"
 
+# Begin Group "Source Files"
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
-
 SOURCE="..\evc\vlc.c"
-
-!IF  "$(CFG)" == "vlc - Win32 (WCE MIPS) Release"
-
-DEP_CPP_VLC_C=\
-	"..\include\beos_specific.h"\
-	"..\include\configuration.h"\
-	"..\include\darwin_specific.h"\
-	"..\include\main.h"\
-	"..\include\modules.h"\
-	"..\include\modules_inner.h"\
-	"..\include\mtime.h"\
-	"..\include\os_specific.h"\
-	"..\include\variables.h"\
-	"..\include\vlc\vlc.h"\
-	"..\include\vlc_common.h"\
-	"..\include\vlc_config.h"\
-	"..\include\vlc_messages.h"\
-	"..\include\vlc_objects.h"\
-	"..\include\vlc_symbols.h"\
-	"..\include\vlc_threads.h"\
-	"..\include\vlc_threads_funcs.h"\
-	"..\include\win32_specific.h"\
-	".\config.h"\
-	
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE MIPS) Debug"
-
-DEP_CPP_VLC_C=\
-	"..\include\beos_specific.h"\
-	"..\include\configuration.h"\
-	"..\include\darwin_specific.h"\
-	"..\include\main.h"\
-	"..\include\modules.h"\
-	"..\include\modules_inner.h"\
-	"..\include\mtime.h"\
-	"..\include\os_specific.h"\
-	"..\include\variables.h"\
-	"..\include\vlc\vlc.h"\
-	"..\include\vlc_common.h"\
-	"..\include\vlc_config.h"\
-	"..\include\vlc_messages.h"\
-	"..\include\vlc_objects.h"\
-	"..\include\vlc_symbols.h"\
-	"..\include\vlc_threads.h"\
-	"..\include\vlc_threads_funcs.h"\
-	"..\include\win32_specific.h"\
-	".\config.h"\
-	
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE SH4) Release"
-
-DEP_CPP_VLC_C=\
-	"..\include\beos_specific.h"\
-	"..\include\configuration.h"\
-	"..\include\darwin_specific.h"\
-	"..\include\main.h"\
-	"..\include\modules.h"\
-	"..\include\modules_inner.h"\
-	"..\include\mtime.h"\
-	"..\include\os_specific.h"\
-	"..\include\variables.h"\
-	"..\include\vlc\vlc.h"\
-	"..\include\vlc_common.h"\
-	"..\include\vlc_config.h"\
-	"..\include\vlc_messages.h"\
-	"..\include\vlc_objects.h"\
-	"..\include\vlc_symbols.h"\
-	"..\include\vlc_threads.h"\
-	"..\include\vlc_threads_funcs.h"\
-	"..\include\win32_specific.h"\
-	".\config.h"\
-	
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE SH4) Debug"
-
-DEP_CPP_VLC_C=\
-	"..\include\beos_specific.h"\
-	"..\include\configuration.h"\
-	"..\include\darwin_specific.h"\
-	"..\include\main.h"\
-	"..\include\modules.h"\
-	"..\include\modules_inner.h"\
-	"..\include\mtime.h"\
-	"..\include\os_specific.h"\
-	"..\include\variables.h"\
-	"..\include\vlc\vlc.h"\
-	"..\include\vlc_common.h"\
-	"..\include\vlc_config.h"\
-	"..\include\vlc_messages.h"\
-	"..\include\vlc_objects.h"\
-	"..\include\vlc_symbols.h"\
-	"..\include\vlc_threads.h"\
-	"..\include\vlc_threads_funcs.h"\
-	"..\include\win32_specific.h"\
-	".\config.h"\
-	
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE SH3) Release"
-
-DEP_CPP_VLC_C=\
-	"..\include\beos_specific.h"\
-	"..\include\configuration.h"\
-	"..\include\darwin_specific.h"\
-	"..\include\main.h"\
-	"..\include\modules.h"\
-	"..\include\modules_inner.h"\
-	"..\include\mtime.h"\
-	"..\include\os_specific.h"\
-	"..\include\variables.h"\
-	"..\include\vlc\vlc.h"\
-	"..\include\vlc_common.h"\
-	"..\include\vlc_config.h"\
-	"..\include\vlc_messages.h"\
-	"..\include\vlc_objects.h"\
-	"..\include\vlc_symbols.h"\
-	"..\include\vlc_threads.h"\
-	"..\include\vlc_threads_funcs.h"\
-	"..\include\win32_specific.h"\
-	".\config.h"\
-	
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE SH3) Debug"
-
-DEP_CPP_VLC_C=\
-	"..\include\beos_specific.h"\
-	"..\include\configuration.h"\
-	"..\include\darwin_specific.h"\
-	"..\include\main.h"\
-	"..\include\modules.h"\
-	"..\include\modules_inner.h"\
-	"..\include\mtime.h"\
-	"..\include\os_specific.h"\
-	"..\include\variables.h"\
-	"..\include\vlc\vlc.h"\
-	"..\include\vlc_common.h"\
-	"..\include\vlc_config.h"\
-	"..\include\vlc_messages.h"\
-	"..\include\vlc_objects.h"\
-	"..\include\vlc_symbols.h"\
-	"..\include\vlc_threads.h"\
-	"..\include\vlc_threads_funcs.h"\
-	"..\include\win32_specific.h"\
-	".\config.h"\
-	
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE ARM) Release"
-
-DEP_CPP_VLC_C=\
-	"..\include\beos_specific.h"\
-	"..\include\configuration.h"\
-	"..\include\darwin_specific.h"\
-	"..\include\main.h"\
-	"..\include\modules.h"\
-	"..\include\modules_inner.h"\
-	"..\include\mtime.h"\
-	"..\include\os_specific.h"\
-	"..\include\variables.h"\
-	"..\include\vlc\vlc.h"\
-	"..\include\vlc_common.h"\
-	"..\include\vlc_config.h"\
-	"..\include\vlc_messages.h"\
-	"..\include\vlc_objects.h"\
-	"..\include\vlc_symbols.h"\
-	"..\include\vlc_threads.h"\
-	"..\include\vlc_threads_funcs.h"\
-	"..\include\win32_specific.h"\
-	".\config.h"\
-	
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE ARM) Debug"
-
-DEP_CPP_VLC_C=\
-	"..\include\beos_specific.h"\
-	"..\include\configuration.h"\
-	"..\include\darwin_specific.h"\
-	"..\include\main.h"\
-	"..\include\modules.h"\
-	"..\include\modules_inner.h"\
-	"..\include\mtime.h"\
-	"..\include\os_specific.h"\
-	"..\include\variables.h"\
-	"..\include\vlc\vlc.h"\
-	"..\include\vlc_common.h"\
-	"..\include\vlc_config.h"\
-	"..\include\vlc_messages.h"\
-	"..\include\vlc_objects.h"\
-	"..\include\vlc_symbols.h"\
-	"..\include\vlc_threads.h"\
-	"..\include\vlc_threads_funcs.h"\
-	"..\include\win32_specific.h"\
-	".\config.h"\
-	
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE x86em) Release"
-
-DEP_CPP_VLC_C=\
-	"..\include\beos_specific.h"\
-	"..\include\configuration.h"\
-	"..\include\darwin_specific.h"\
-	"..\include\main.h"\
-	"..\include\modules.h"\
-	"..\include\modules_inner.h"\
-	"..\include\mtime.h"\
-	"..\include\os_specific.h"\
-	"..\include\variables.h"\
-	"..\include\vlc\vlc.h"\
-	"..\include\vlc_common.h"\
-	"..\include\vlc_config.h"\
-	"..\include\vlc_messages.h"\
-	"..\include\vlc_objects.h"\
-	"..\include\vlc_symbols.h"\
-	"..\include\vlc_threads.h"\
-	"..\include\vlc_threads_funcs.h"\
-	"..\include\win32_specific.h"\
-	".\config.h"\
-	
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE x86em) Debug"
-
-DEP_CPP_VLC_C=\
-	"..\include\beos_specific.h"\
-	"..\include\configuration.h"\
-	"..\include\darwin_specific.h"\
-	"..\include\main.h"\
-	"..\include\modules.h"\
-	"..\include\modules_inner.h"\
-	"..\include\mtime.h"\
-	"..\include\os_specific.h"\
-	"..\include\variables.h"\
-	"..\include\vlc\vlc.h"\
-	"..\include\vlc_common.h"\
-	"..\include\vlc_config.h"\
-	"..\include\vlc_messages.h"\
-	"..\include\vlc_objects.h"\
-	"..\include\vlc_symbols.h"\
-	"..\include\vlc_threads.h"\
-	"..\include\vlc_threads_funcs.h"\
-	"..\include\win32_specific.h"\
-	".\config.h"\
-	
-
-!ENDIF 
-
 # End Source File
 # End Group
+
 # Begin Group "Resource Files"
 
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
diff --git a/evc/vlc.vcp.in b/evc/vlc.vcp.in
index da2454d767..af162390c4 100644
--- a/evc/vlc.vcp.in
+++ b/evc/vlc.vcp.in
@@ -384,3 +384,41 @@ LINK32=link.exe
 # Name "vlc - Win32 (WCE x86em) Release"
 # Name "vlc - Win32 (WCE x86em) Debug"
 
+# Begin Group "Source Files"
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+�SOURCES�
+# 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_wince_rc.rc
+
+!IF  "$(CFG)" == "vlc - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE SH4) Release"
+
+!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE SH4) Debug"
+
+!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE SH3) Release"
+
+!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE x86em) Release"
+
+!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE x86em) Debug"
+
+!ENDIF 
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/evc/vlc.vcp.out b/evc/vlc.vcp.out
deleted file mode 100644
index 6dd92eda4f..0000000000
--- a/evc/vlc.vcp.out
+++ /dev/null
@@ -1,34 +0,0 @@
-
-# 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_wince_rc.rc
-
-!IF  "$(CFG)" == "vlc - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE SH4) Release"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE SH4) Debug"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE SH3) Release"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE SH3) Debug"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE x86em) Release"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 (WCE x86em) Debug"
-
-!ENDIF 
-
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/extras/Win32_msvc/defs.h b/extras/Win32_msvc/defs.h
deleted file mode 100755
index a12f41a685..0000000000
--- a/extras/Win32_msvc/defs.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Define if you have alloca, as a function or macro.  */
-#define HAVE_ALLOCA 1
-
-#define PLUGIN_PATH "."
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-/* #undef off_t */
-
-/* Define as the return type of signal handlers (int or void).  */
-#define RETSIGTYPE void
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
-
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
-
-/* Define if you have the getcwd function.  */
-#define HAVE_GETCWD 1
-
-/* Define if you have the putenv function.  */
-#define HAVE_PUTENV 1
-
-/* Define if you have the setlocale function.  */
-#define HAVE_SETLOCALE 1
-
-/* Define if you have the strcasecmp function.  */
-#define HAVE_STRCASECMP 1
-
-/* Define if you have the strchr function.  */
-#define HAVE_STRCHR 1
-
-/* Define if you have the strdup function.  */
-#define HAVE_STRDUP 1
-
-/* Define if you have the strerror function.  */
-#define HAVE_STRERROR 1
-
-/* Define if you have the strtod function.  */
-#define HAVE_STRTOD 1
-
-/* Define if you have the strtol function.  */
-#define HAVE_STRTOL 1
-
-/* Define if you have the strtoul function.  */
-#define HAVE_STRTOUL 1
-
-/* Define if you have the swab function.  */
-#define HAVE_SWAB 1
-
-/* Define if you have the <fcntl.h> header file.  */
-#define HAVE_FCNTL_H 1
-
-/* Define if you have the <locale.h> header file.  */
-#define HAVE_LOCALE_H 1
-
-/* Define if you have the <malloc.h> header file.  */
-#define HAVE_MALLOC_H 1
-
-/* Define if you have the <stddef.h> header file.  */
-#define HAVE_STDDEF_H 1
-
-/* Define if you have the <stdlib.h> header file.  */
-#define HAVE_STDLIB_H 1
-
-/* Define if you have the <string.h> header file.  */
-#define HAVE_STRING_H 1
-
-/* Define if you have the <sys/types.h> header file.  */
-#define HAVE_SYS_TYPES_H 1
-
-/* Package name */
-#define VLC_PACKAGE "vlc"
-
-/* Package version */
-#define VLC_VERSION "0.3.1"
-
-/* Define if you have the iconv() function. */
-/* #undef HAVE_ICONV */
-
-/* Define as const if the declaration of iconv() needs const. */
-/* #undef ICONV_CONST */
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-/* #undef HAVE_LC_MESSAGES */
-
-/* Define to 1 if translation of program messages to the user's native language
-   is requested. */
-#define ENABLE_NLS 1
-
-/* Maximum supported data alignment */
-#define ATTRIBUTE_ALIGNED_MAX 16
-
-/* iline */
-#define inline __inline
-
-/* Simple version string */
-#define VERSION_MESSAGE "vlc 0.3.1_2002-05-17 Ourumov Copyright 1996-2002 VideoLAN"
-
-/* Copyright string */
-#define COPYRIGHT_MESSAGE "VideoLAN Client - version 0.3.1_2002-05-03 Ourumov - (c) 1996-2002 VideoLAN"
-
-/* 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
diff --git a/extras/Win32_msvc/modules_builtin_msvc.h b/extras/Win32_msvc/modules_builtin_msvc.h
deleted file mode 100755
index 18da4c3289..0000000000
--- a/extras/Win32_msvc/modules_builtin_msvc.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*****************************************************************************
- * modules_builtin.h: built-in modules list
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
- *****************************************************************************/
-
-#define ALLOCATE_BUILTIN( NAME ) \
-    AllocateBuiltinModule( InitModule__MODULE_ ## NAME, \
-                           ActivateModule__MODULE_ ## NAME, \
-                           DeactivateModule__MODULE_ ## NAME );
-
-/* We also consider the main program as a module (useful for config stuff) */
-int InitModule__MODULE_main( module_t* );
-int ActivateModule__MODULE_main( module_t* );
-int DeactivateModule__MODULE_main( module_t* );
-
-/* Add stuff here */
-int InitModule__MODULE_null( module_t* );
-int ActivateModule__MODULE_null( module_t* );
-int DeactivateModule__MODULE_null( module_t* );
-int InitModule__MODULE_mpeg_es( module_t* );
-int ActivateModule__MODULE_mpeg_es( module_t* );
-int DeactivateModule__MODULE_mpeg_es( module_t* );
-int InitModule__MODULE_mpeg_ps( module_t* );
-int ActivateModule__MODULE_mpeg_ps( module_t* );
-int DeactivateModule__MODULE_mpeg_ps( module_t* );
-int InitModule__MODULE_mpeg_ts( module_t* );
-int ActivateModule__MODULE_mpeg_ts( module_t* );
-int DeactivateModule__MODULE_mpeg_ts( module_t* );
-int InitModule__MODULE_file( module_t* );
-int ActivateModule__MODULE_file( module_t* );
-int DeactivateModule__MODULE_file( module_t* );
-int InitModule__MODULE_memcpy( module_t* );
-int ActivateModule__MODULE_memcpy( module_t* );
-int DeactivateModule__MODULE_memcpy( module_t* );
-int InitModule__MODULE_lpcm_adec( module_t* );
-int ActivateModule__MODULE_lpcm_adec( module_t* );
-int DeactivateModule__MODULE_lpcm_adec( module_t* );
-int InitModule__MODULE_ac3_spdif( module_t* );
-int ActivateModule__MODULE_ac3_spdif( module_t* );
-int DeactivateModule__MODULE_ac3_spdif( module_t* );
-int InitModule__MODULE_spudec( module_t* );
-int ActivateModule__MODULE_spudec( module_t* );
-int DeactivateModule__MODULE_spudec( module_t* );
-int InitModule__MODULE_sdl( module_t* );
-int ActivateModule__MODULE_sdl( module_t* );
-int DeactivateModule__MODULE_sdl( module_t* );
-int InitModule__MODULE_directx( module_t* );
-int ActivateModule__MODULE_directx( module_t* );
-int DeactivateModule__MODULE_directx( module_t* );
-int InitModule__MODULE_waveout( module_t* );
-int ActivateModule__MODULE_waveout( module_t* );
-int DeactivateModule__MODULE_waveout( module_t* );
-int InitModule__MODULE_idct( module_t* );
-int ActivateModule__MODULE_idct( module_t* );
-int DeactivateModule__MODULE_idct( module_t* );
-int InitModule__MODULE_idctclassic( module_t* );
-int ActivateModule__MODULE_idctclassic( module_t* );
-int DeactivateModule__MODULE_idctclassic( module_t* );
-int InitModule__MODULE_motion( module_t* );
-int ActivateModule__MODULE_motion( module_t* );
-int DeactivateModule__MODULE_motion( module_t* );
-int InitModule__MODULE_imdct( module_t* );
-int ActivateModule__MODULE_imdct( module_t* );
-int DeactivateModule__MODULE_imdct( module_t* );
-int InitModule__MODULE_downmix( module_t* );
-int ActivateModule__MODULE_downmix( module_t* );
-int DeactivateModule__MODULE_downmix( module_t* );
-int InitModule__MODULE_chroma_i420_rgb( module_t* );
-int ActivateModule__MODULE_chroma_i420_rgb( module_t* );
-int DeactivateModule__MODULE_chroma_i420_rgb( module_t* );
-int InitModule__MODULE_chroma_i420_yuy2( module_t* );
-int ActivateModule__MODULE_chroma_i420_yuy2( module_t* );
-int DeactivateModule__MODULE_chroma_i420_yuy2( module_t* );
-int InitModule__MODULE_chroma_i422_yuy2( module_t* );
-int ActivateModule__MODULE_chroma_i422_yuy2( module_t* );
-int DeactivateModule__MODULE_chroma_i422_yuy2( module_t* );
-int InitModule__MODULE_mpeg_adec( module_t* );
-int ActivateModule__MODULE_mpeg_adec( module_t* );
-int DeactivateModule__MODULE_mpeg_adec( module_t* );
-int InitModule__MODULE_ac3_adec( module_t* );
-int ActivateModule__MODULE_ac3_adec( module_t* );
-int DeactivateModule__MODULE_ac3_adec( module_t* );
-int InitModule__MODULE_dummy( module_t* );
-int ActivateModule__MODULE_dummy( module_t* );
-int DeactivateModule__MODULE_dummy( module_t* );
-int InitModule__MODULE_mpeg_vdec( module_t* );
-int ActivateModule__MODULE_mpeg_vdec( module_t* );
-int DeactivateModule__MODULE_mpeg_vdec( module_t* );
-int InitModule__MODULE_dvd( module_t* );
-int ActivateModule__MODULE_dvd( module_t* );
-int DeactivateModule__MODULE_dvd( module_t* );
-int InitModule__MODULE_wall( module_t* );
-int ActivateModule__MODULE_wall( module_t* );
-int DeactivateModule__MODULE_wall( module_t* );
-
-#define ALLOCATE_ALL_BUILTINS() \
-    do \
-    { \
-        ALLOCATE_BUILTIN(null); \
-        ALLOCATE_BUILTIN(mpeg_es); \
-        ALLOCATE_BUILTIN(mpeg_ps); \
-        ALLOCATE_BUILTIN(mpeg_ts); \
-        ALLOCATE_BUILTIN(file); \
-        ALLOCATE_BUILTIN(memcpy); \
-        ALLOCATE_BUILTIN(lpcm_adec); \
-        ALLOCATE_BUILTIN(spudec); \
-        ALLOCATE_BUILTIN(directx); \
-        ALLOCATE_BUILTIN(waveout); \
-        ALLOCATE_BUILTIN(idct); \
-        ALLOCATE_BUILTIN(idctclassic); \
-        ALLOCATE_BUILTIN(motion); \
-        ALLOCATE_BUILTIN(imdct); \
-        ALLOCATE_BUILTIN(downmix); \
-        ALLOCATE_BUILTIN(chroma_i420_rgb); \
-        ALLOCATE_BUILTIN(chroma_i420_yuy2); \
-        ALLOCATE_BUILTIN(chroma_i422_yuy2); \
-        ALLOCATE_BUILTIN(mpeg_adec); \
-        ALLOCATE_BUILTIN(ac3_adec); \
-        ALLOCATE_BUILTIN(dummy); \
-        ALLOCATE_BUILTIN(mpeg_vdec); \
-        ALLOCATE_BUILTIN(dvd); \
-        ALLOCATE_BUILTIN(wall); \
-    } while( 0 );
diff --git a/extras/Win32_msvc/readme.txt b/extras/Win32_msvc/readme.txt
deleted file mode 100755
index 6c815232cd..0000000000
--- a/extras/Win32_msvc/readme.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-In this directory you will find a Microsoft Visual Studio C++ 6 project
-to build vlc.
-
-You should be aware that this project should mainly be used for debugging vlc.
-Most of the hardware accelerated plugins can't be built from MSVC as they are
-programmed in assembly using the GCC asm syntax and MSVC doesn't understand
-this.
-
-Also you shouldn't expect this project to be working out of the box as you
-need to configure it to include the GTK headers and libraries.
\ No newline at end of file
diff --git a/extras/Win32_msvc/vlc.dsp b/extras/Win32_msvc/vlc.dsp
deleted file mode 100755
index c881572f48..0000000000
--- a/extras/Win32_msvc/vlc.dsp
+++ /dev/null
@@ -1,1631 +0,0 @@
-# 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 /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
-# 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 /MTd /W3 /Gm /GX /ZI /Od /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "__VLC__" /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 "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 Group "extras"
-
-# PROP Default_Filter ""
-# Begin Group "GNUgetopt"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\extras\GNUgetopt\getopt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\extras\GNUgetopt\getopt.h
-# End Source File
-# Begin Source File
-
-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=..\..\..\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=..\..\..\libdvdcss\src\csstables.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libdvdcss\src\dvdcss\dvdcss.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libdvdcss\src\ioctl.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libdvdcss\src\ioctl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libdvdcss\src\libdvdcss.c
-# End Source File
-# Begin Source File
-
-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
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\ac3_adec\ac3_adec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\ac3_adec\ac3_bit_allocate.c
-# 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
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\ac3_adec\ac3_decoder.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\ac3_adec\ac3_exponent.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=ac3_adec
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\ac3_adec\ac3_exponent.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\ac3_adec\ac3_imdct.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=ac3_adec
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\ac3_adec\ac3_internal.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\ac3_adec\ac3_mantissa.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=ac3_adec
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\ac3_adec\ac3_mantissa.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\ac3_adec\ac3_parse.c
-# 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
-# End Source File
-# End Group
-# Begin Group "access"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\plugins\access\file.c
-# 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
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\access\udp.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=udp
-# End Source File
-# End Group
-# Begin Group "chroma"
-
-# PROP Default_Filter ""
-# 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
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\chroma\i420_rgb.h
-# End Source File
-# 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
-# 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
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\chroma\i420_rgb_c.h
-# End Source File
-# 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
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\chroma\i420_yuy2.h
-# End Source File
-# 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
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\chroma\i422_yuy2.h
-# End Source File
-# End Group
-# Begin Group "directx"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\plugins\directx\aout_directx.c
-# 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
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\directx\vout_directx.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=directx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\directx\vout_directx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\directx\vout_events.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=directx
-# End Source File
-# End Group
-# Begin Group "downmix"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\plugins\downmix\ac3_downmix_c.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=downmix
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\downmix\ac3_downmix_common.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\downmix\downmix.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=downmix
-# End Source File
-# End Group
-# Begin Group "dummy"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\plugins\dummy\aout_dummy.c
-# 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
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\dummy\input_dummy.c
-# 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
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\dummy\null.c
-# 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
-# End Source File
-# End Group
-# Begin Group "dvd"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\plugins\dvd\dvd.c
-# ADD CPP /I "../../include" /I "../../../libdvdcss/src" /D "__BUILTIN__" /D MODULE_NAME=dvd
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\dvd\dvd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\dvd\dvd_access.c
-# 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 "../../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 "../../include" /I "../../../libdvdcss/src" /D "__BUILTIN__" /D MODULE_NAME=dvd
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\dvd\dvd_es.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\dvd\dvd_ifo.c
-# ADD CPP /I "../../include" /I "../../../libdvdcss/src" /D "__BUILTIN__" /D MODULE_NAME=dvd
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\dvd\dvd_ifo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\dvd\dvd_seek.c
-# ADD CPP /I "../../include" /I "../../../libdvdcss/src" /D "__BUILTIN__" /D MODULE_NAME=dvd
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\dvd\dvd_seek.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\dvd\dvd_summary.c
-# ADD CPP /I "../../include" /I "../../../libdvdcss/src" /D "__BUILTIN__" /D MODULE_NAME=dvd
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\dvd\dvd_summary.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\dvd\dvd_udf.c
-# ADD CPP /I "../../include" /I "../../../libdvdcss/src" /D "__BUILTIN__" /D MODULE_NAME=dvd
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\dvd\dvd_udf.h
-# End Source File
-# End Group
-# Begin Group "filter"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\plugins\filter\deinterlace.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# 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
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\filter\distort.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=distort
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 Debug"
-
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=distort
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\filter\filter_common.h
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\filter\invert.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=insert
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 Debug"
-
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=insert
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\filter\transform.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=transform
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 Debug"
-
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=transform
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\filter\wall.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=wall
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 Debug"
-
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=wall
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "fx"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\plugins\fx\scope.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=scope
-# End Source File
-# End Group
-# Begin Group "gtk"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\plugins\gtk\gtk.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# 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
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\gtk\gtk_callbacks.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# 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
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\gtk\gtk_callbacks.h
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\gtk\gtk_common.h
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\gtk\gtk_control.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# 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
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\gtk\gtk_control.h
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\gtk\gtk_display.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# 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
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\gtk\gtk_display.h
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\gtk\gtk_interface.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# 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
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\gtk\gtk_interface.h
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\gtk\gtk_menu.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# 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
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\gtk\gtk_menu.h
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\gtk\gtk_modules.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# 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
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\gtk\gtk_modules.h
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\gtk\gtk_open.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# 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
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\gtk\gtk_open.h
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\gtk\gtk_playlist.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# 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
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\gtk\gtk_playlist.h
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\gtk\gtk_preferences.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# 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
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\gtk\gtk_preferences.h
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\gtk\gtk_support.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# 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
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\gtk\gtk_support.h
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "idct"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\plugins\idct\block_c.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\idct\idct.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=idct
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\idct\idct.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\idct\idct_decl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\idct\idct_sparse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\idct\idctclassic.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=idctclassic
-# End Source File
-# End Group
-# Begin Group "imdct"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\plugins\imdct\ac3_imdct_c.c
-# 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
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\imdct\ac3_imdct_common.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\imdct\ac3_retables.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\imdct\ac3_srfft.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\imdct\ac3_srfft_c.c
-# 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
-# End Source File
-# End Group
-# Begin Group "lpcm_adec"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\plugins\lpcm_adec\lpcm_adec.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=lpcm_adec
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\lpcm_adec\lpcm_adec.h
-# End Source File
-# End Group
-# Begin Group "memcpy"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\plugins\memcpy\fastmemcpy.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\memcpy\memcpy.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# 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"
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "motion"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\plugins\motion\motion.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=motion
-# End Source File
-# End Group
-# Begin Group "mpeg_adec"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\plugins\mpeg_adec\adec_layer1.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_adec
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\mpeg_adec\adec_layer1.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\mpeg_adec\adec_layer2.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_adec
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\mpeg_adec\adec_layer2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\mpeg_adec\adec_math.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_adec
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\mpeg_adec\adec_math.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\mpeg_adec\mpeg_adec.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_adec
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\mpeg_adec\mpeg_adec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\mpeg_adec\mpeg_adec_generic.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_adec
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\mpeg_adec\mpeg_adec_generic.h
-# End Source File
-# End Group
-# Begin Group "mpeg_system"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\plugins\mpeg_system\mpeg_es.c
-# 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
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\mpeg_system\mpeg_ts.c
-
-!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"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\plugins\mpeg_vdec\video_decoder.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_vdec
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\mpeg_vdec\video_decoder.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\mpeg_vdec\video_parser.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_vdec
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\mpeg_vdec\video_parser.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\mpeg_vdec\vpar_blocks.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_vdec
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\mpeg_vdec\vpar_blocks.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\mpeg_vdec\vpar_headers.c
-# 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
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\mpeg_vdec\vpar_pool.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\mpeg_vdec\vpar_synchro.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_vdec
-# End Source File
-# End Group
-# Begin Group "network"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\plugins\network\ipv4.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=ipv4
-# End Source File
-# End Group
-# Begin Group "sdl"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\plugins\sdl\aout_sdl.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# 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
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\sdl\sdl.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# 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
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\sdl\vout_sdl.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# 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
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "spudec"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\plugins\spudec\spu_decoder.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=spudec
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\spudec\spu_decoder.h
-# End Source File
-# End Group
-# Begin Group "text"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\plugins\text\logger.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=logger
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\text\rc.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# 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
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "vcd"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\plugins\vcd\cdrom_tools.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# 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
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\vcd\cdrom_tools.h
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\vcd\input_vcd.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# 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
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\vcd\input_vcd.h
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "vlc - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\plugins\vcd\vcd.c
-
-!IF  "$(CFG)" == "vlc - Win32 Release"
-
-# 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
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "win32"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\plugins\win32\waveout.c
-# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=waveout
-# End Source File
-# End Group
-# End Group
-# Begin Group "src"
-
-# PROP Default_Filter ""
-# Begin Group "audio_output"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE="..\..\src\audio_output\aout_ext-dec.c"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\audio_output\aout_pcm.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\audio_output\aout_pcm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\audio_output\aout_spdif.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\audio_output\aout_spdif.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\audio_output\audio_output.c
-# End Source File
-# End Group
-# Begin Group "input"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\input\input.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\input\input_clock.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\input\input_dec.c
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\src\input\input_ext-dec.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\src\input\input_ext-intf.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\src\input\input_ext-plugins.c"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\input\input_programs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\input\mpeg_system.c
-# End Source File
-# End Group
-# Begin Group "interface"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\interface\interface.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\interface\intf_eject.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\interface\intf_msg.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\interface\intf_playlist.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\interface\main.c
-# ADD CPP /I ".."
-# End Source File
-# End Group
-# Begin Group "misc"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\misc\configuration.c
-# ADD CPP /I ".."
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\misc\iso_lang.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\misc\modules.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\modules_builtin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\misc\modules_plugin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\misc\mtime.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\misc\netutils.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\misc\win32_specific.c
-# End Source File
-# End Group
-# Begin Group "video_output"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\video_output\video_output.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\video_output\video_text.c
-# ADD CPP /D DATA_PATH=\".\"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\video_output\video_text.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\video_output\vout_pictures.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\video_output\vout_subpictures.c
-# End Source File
-# End Group
-# End Group
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\include\ac3_downmix.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\ac3_imdct.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\audio_output.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\beos_specific.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\common.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\configuration.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\darwin_specific.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\defs.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\include\input_ext-dec.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\include\input_ext-intf.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\include\input_ext-plugins.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\input_iovec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\interface.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\intf_eject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\intf_msg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\intf_playlist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\inttypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\iso_lang.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\main.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\mmx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\modules.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\modules_inner.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\mtime.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\netutils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\network.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\stream_control.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\threads.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\video.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\video_output.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\videolan\vlc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\win32_specific.h
-# 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
diff --git a/extras/Win32_msvc/vlc.dsw b/extras/Win32_msvc/vlc.dsw
deleted file mode 100755
index 8f56352ed7..0000000000
--- a/extras/Win32_msvc/vlc.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "vlc"=.\vlc.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/msvc/libvlc.dsp.in b/msvc/libvlc.dsp.in
index 3519020f0d..7d51c10b77 100644
--- a/msvc/libvlc.dsp.in
+++ b/msvc/libvlc.dsp.in
@@ -81,3 +81,13 @@ LIB32=link.exe -lib
 # Name "libvlc - Win32 Release"
 # Name "libvlc - Win32 Debug"
 
+# Begin Group "Source Files"
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+�SOURCES�
+# End Group
+# Begin Group "Header Files"
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+�HEADERS�
+# End Group
+# End Target
+# End Project
diff --git a/msvc/vlc.dsp.in b/msvc/vlc.dsp.in
index 6b72ff3a81..d1c0a4daa0 100644
--- a/msvc/vlc.dsp.in
+++ b/msvc/vlc.dsp.in
@@ -84,3 +84,30 @@ LINK32=link.exe
 # 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"
+�SOURCES�
+# 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
diff --git a/msvc/vlc.dsp.out b/msvc/vlc.dsp.out
deleted file mode 100644
index e98a7d7f25..0000000000
--- a/msvc/vlc.dsp.out
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# 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
diff --git a/src/misc/modules.c b/src/misc/modules.c
index dcc79f6c36..779e002e10 100644
--- a/src/misc/modules.c
+++ b/src/misc/modules.c
@@ -2,7 +2,7 @@
  * modules.c : Builtin and plugin modules management functions
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.106 2002/11/18 18:37:23 gbazin Exp $
+ * $Id: modules.c,v 1.107 2002/11/19 17:38:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Ethan C. Baldridge <BaldridgeE@cadmus.com>
@@ -559,7 +559,7 @@ static void AllocateAllPlugins( vlc_object_t *p_this )
 #endif
 
 #if defined( UNDER_CE )
-    wchar_t   psz_dir[MAX_PATH];
+    wchar_t         psz_dir[MAX_PATH];
 #endif
 
     /* If the user provided a plugin path, we add it to the list */
@@ -735,6 +735,14 @@ static int AllocatePluginFile( vlc_object_t * p_this, MYCHAR * psz_file )
     module_t * p_module;
     module_handle_t handle;
 
+#ifdef UNDER_CE
+    char psz_filename[MAX_PATH];
+    WideCharToMultiByte( CP_ACP, WC_DEFAULTCHAR, psz_file, -1,
+                         psz_filename, MAX_PATH, NULL, NULL );
+#else
+    char * psz_filename = psz_file;
+#endif
+
     /* Try to dynamically load the module. */
     if( module_load( psz_file, &handle ) )
     {
@@ -742,7 +750,7 @@ static int AllocatePluginFile( vlc_object_t * p_this, MYCHAR * psz_file )
 
         /* The plugin module couldn't be opened */
         msg_Warn( p_this, "cannot open `%s' (%s)",
-                  psz_file, module_error( psz_buffer ) );
+                  psz_filename, module_error( psz_buffer ) );
         return -1;
     }
 
@@ -757,8 +765,7 @@ static int AllocatePluginFile( vlc_object_t * p_this, MYCHAR * psz_file )
     }
 
     /* We need to fill these since they may be needed by CallEntry() */
-    /* FIXME: this is not unicode-compliant */
-    p_module->psz_filename = (char *)psz_file;
+    p_module->psz_filename = psz_filename;
     p_module->handle = handle;
     p_module->p_symbols = &p_this->p_libvlc->p_module_bank->symbols;
 
-- 
2.25.4