add include directories from xml, remove "." hack, as projects that need to include...
[reactos.git] / reactos / tools / rbuild / backend / msvc / msvcmaker.cpp
index 1c99b70..950cb44 100644 (file)
 
 #include "msvc.h"
 
-#if 0
+using std::string;
+using std::vector;
 
-void _generate_dsp ( FILE* OUT, const string& module )
+void
+MSVCBackend::_generate_dsp ( const Module& module )
 {
-    my $dsp_file = modules[module]->{dsp_file};
-    my $project = modules[module]->{project};
-    my @imports = @{modules[module]->{imports}};
+       size_t i;
+       // TODO FIXME wine hack?
+       const bool wine = false;
+
+       string dsp_file = DspFileName(module);
+       printf ( "Creating MSVC project: '%s'\n", dsp_file.c_str() );
+       FILE* OUT = fopen ( dsp_file.c_str(), "wb" );
+
+       vector<string> imports;
+       for ( i = 0; i < module.non_if_data.libraries.size(); i++ )
+       {
+               imports.push_back ( module.non_if_data.libraries[i]->name );
+       }
+
+       string module_type = Right(module.GetTargetName(),3);
+       bool lib = (module_type == "lib");
+       bool dll = (module_type == "dll");
+       bool exe = (module_type == "exe");
+       // TODO FIXME - need more checks here for 'sys' and possibly 'drv'?
 
-    my $lib = (modules[module]->{type} eq "lib");
-    my $dll = (modules[module]->{type} eq "dll");
-    my $exe = (modules[module]->{type} eq "exe");
+       bool console = exe; // FIXME: Not always correct
 
-    my $console = $exe; # FIXME: Not always correct
+       // TODO FIXME - not sure if the count here is right...
+       int parts = 0;
+       const char* p = strpbrk ( dsp_file.c_str(), "/\\" );
+       while ( p )
+       {
+               ++parts;
+               p = strpbrk ( p+1, "/\\" );
+       }
+       string msvc_wine_dir = "..";
+       while ( --parts )
+               msvc_wine_dir += "\\..";
+
+       string wine_include_dir = msvc_wine_dir + "\\include";
+
+       //$progress_current++;
+       //$output->progress("$dsp_file (file $progress_current of $progress_max)");
 
-    my $msvc_wine_dir = do
+       // TODO FIXME - what's diff. betw. 'c_srcs' and 'source_files'?
+       string dsp_path = module.GetBasePath();
+       vector<string> c_srcs, source_files, resource_files, includes;
+       vector<const IfableData*> ifs_list;
+       ifs_list.push_back ( &module.non_if_data );
+       while ( ifs_list.size() )
        {
-               my @parts = split(m%/%, $dsp_file);
-               if($#parts == 1) {
-                       ".." );
-               } elsif($#parts == 2) {
-                       "..\\.." );
-               } else {
-                       "..\\..\\.." );
+               const IfableData& data = *ifs_list.back();
+               ifs_list.pop_back();
+               // TODO FIXME - refactor needed - we're discarding if conditions
+               for ( i = 0; i < data.ifs.size(); i++ )
+                       ifs_list.push_back ( &data.ifs[i]->data );
+               const vector<File*>& files = data.files;
+               for ( i = 0; i < files.size(); i++ )
+               {
+                       // TODO FIXME - do we want the full path of the file here?
+                       string file = string(".") + &files[i]->name[dsp_path.size()];
+
+                       source_files.push_back ( file );
+                       if ( !stricmp ( Right(file,2).c_str(), ".c" ) )
+                               c_srcs.push_back ( file );
+                       if ( !stricmp ( Right(file,3).c_str(), ".rc" ) )
+                               resource_files.push_back ( file );
                }
-    };
-    my $wine_include_dir = "$msvc_wine_dir\\include" );
-
-    $progress_current++;
-    $output->progress("$dsp_file (file $progress_current of $progress_max)");
-
-    my @c_srcs = @{modules[module]->{c_srcs}};
-    my @source_files = @{modules[module]->{source_files}};
-    my @header_files = @{modules[module]->{header_files}};
-    my @resource_files = @{modules[module]->{resource_files}};
-
-    if ($project !~ /^wine(?:_unicode|build|runtests|test)?$/ &&
-        $project !~ /^(?:gdi32)_.+?$/ &&
-        $project !~ /_test$/)
-    {
-               push @source_files, "$project.spec" );
-               # push @source_files, "$project.spec.c" );
+               const vector<Include*>& incs = data.includes;
+               for ( i = 0; i < incs.size(); i++ )
+               {
+                       string path = Path::RelativeFromDirectory (
+                               incs[i]->directory,
+                               module.GetBasePath() );
+                       if ( !path.size() )
+                               i = i;
+                       includes.push_back ( path );
+               }
+       }
+       // TODO FIXME - we don't include header files in our build system
+       //my @header_files = @{module->{header_files}};
+       vector<string> header_files;
+
+       // TODO FIXME - wine hack?
+       /*if (module.name !~ /^wine(?:_unicode|build|runtests|test)?$/ &&
+               module.name !~ /^(?:gdi32)_.+?$/ &&
+               Right ( module.name, 5 ) == "_test" )
+       {
+               source_files.push_back ( module.name + ".spec" );
                @source_files = sort(@source_files);
-    }
+       }*/
 
-    my $no_cpp = 1;
-    my $no_msvc_headers = 1;
-    if ($project =~ /^wine(?:runtests|test)$/ || $project =~ /_test$/) {
-               $no_msvc_headers = 0;
-    }
+       bool no_cpp = true;
+       bool no_msvc_headers = true;
+       // TODO FIXME - wine hack?
+       /*if (module.name =~ /^wine(?:runtests|test)$/
+               || Right ( module.name, 5 ) == "_test" )
+       {
+               no_msvc_headers = false;
+       }*/
 
-    my @cfgs;
+       std::vector<std::string> cfgs;
 
-    push @cfgs, "$project - Win32" );
+       cfgs.push_back ( module.name + " - Win32" );
 
-    if (!$no_cpp) {
-               my @_cfgs;
-               foreach my $cfg (@cfgs) {
-                       push @_cfgs, "$cfg C" );
-                       push @_cfgs, "$cfg C++" );
+       if (!no_cpp)
+       {
+               std::vector<std::string> _cfgs;
+               for ( i = 0; i < cfgs.size(); i++ )
+               {
+                       _cfgs.push_back ( cfgs[i] + " C" );
+                       _cfgs.push_back ( cfgs[i] + " C++" );
                }
-               @cfgs = @_cfgs;
-    }
+               cfgs.resize(0);
+               cfgs = _cfgs;
+       }
 
-    if (!$no_release) {
-               my @_cfgs;
-               foreach my $cfg (@cfgs) {
-                       push @_cfgs, "$cfg Debug" );
-                       push @_cfgs, "$cfg Release" );
+       // TODO FIXME - wine hack?
+       /*if (!no_release)
+       {
+               std::vector<std::string> _cfgs;
+               for ( i = 0; i < cfgs.size(); i++ )
+               {
+                       _cfgs.push_back ( cfgs[i] + " Debug" );
+                       _cfgs.push_back ( cfgs[i] + " Release" );
                }
-               @cfgs = @_cfgs;
-    }
+               cfgs.resize(0);
+               cfgs = _cfgs;
+       }*/
 
-    if (!$no_msvc_headers) {
-               my @_cfgs;
-               foreach my $cfg (@cfgs) {
-                       push @_cfgs, "$cfg MSVC Headers" );
-                       push @_cfgs, "$cfg Wine Headers" );
+       if (!no_msvc_headers)
+       {
+               std::vector<std::string> _cfgs;
+               for ( i = 0; i < cfgs.size(); i++ )
+               {
+                       _cfgs.push_back ( cfgs[i] + " MSVC Headers" );
+                       _cfgs.push_back ( cfgs[i] + " Wine Headers" );
                }
-               @cfgs = @_cfgs;
-    }
+               cfgs.resize(0);
+               cfgs = _cfgs;
+       }
 
-    my $default_cfg = $cfgs[$#cfgs];
+       string default_cfg = cfgs.back();
 
-    fprintf ( OUT, "# Microsoft Developer Studio Project File - Name=\"$project\" - Package Owner=<4>\n" );
-    fprintf ( OUT, "# Microsoft Developer Studio Generated Build File, Format Version 6.00\n" );
-    fprintf ( OUT, "# ** DO NOT EDIT **\n" );
-    fprintf ( OUT, "\n" );
+       fprintf ( OUT, "# Microsoft Developer Studio Project File - Name=\"%s\" - Package Owner=<4>\r\n", module.name.c_str() );
+       fprintf ( OUT, "# Microsoft Developer Studio Generated Build File, Format Version 6.00\r\n" );
+       fprintf ( OUT, "# ** DO NOT EDIT **\r\n" );
+       fprintf ( OUT, "\r\n" );
 
-    if ($lib) {
-               fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Static Library\" 0x0104\n" );
-    } elsif ($dll) {
-               fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Dynamic-Link Library\" 0x0102\n" );
-    } else {
-               fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Console Application\" 0x0103\n" );
-    }
-    fprintf ( OUT, "\n" );
-
-    fprintf ( OUT, "CFG=$default_cfg\n" );
-    fprintf ( OUT, "!MESSAGE This is not a valid makefile. To build this project using NMAKE,\n" );
-    fprintf ( OUT, "!MESSAGE use the Export Makefile command and run\n" );
-    fprintf ( OUT, "!MESSAGE \n" );
-    fprintf ( OUT, "!MESSAGE NMAKE /f \"$project.mak\".\n" );
-    fprintf ( OUT, "!MESSAGE \n" );
-    fprintf ( OUT, "!MESSAGE You can specify a configuration when running NMAKE\n" );
-    fprintf ( OUT, "!MESSAGE by defining the macro CFG on the command line. For example:\n" );
-    fprintf ( OUT, "!MESSAGE \n" );
-    fprintf ( OUT, "!MESSAGE NMAKE /f \"$project.mak\" CFG=\"$default_cfg\"\n" );
-    fprintf ( OUT, "!MESSAGE \n" );
-    fprintf ( OUT, "!MESSAGE Possible choices for configuration are:\n" );
-    fprintf ( OUT, "!MESSAGE \n" );
-    foreach my $cfg (@cfgs) {
-               if ($lib) {
-                       fprintf ( OUT, "!MESSAGE \"$cfg\" (based on \"Win32 (x86) Static Library\")\n" );
-               } elsif ($dll) {
-                       fprintf ( OUT, "!MESSAGE \"$cfg\" (based on \"Win32 (x86) Dynamic-Link Library\")\n" );
-               } else {
-                       fprintf ( OUT, "!MESSAGE \"$cfg\" (based on \"Win32 (x86) Console Application\")\n" );
+       if ( lib )
+       {
+               fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Static Library\" 0x0104\r\n" );
+       }
+       else if ( dll )
+       {
+               fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Dynamic-Link Library\" 0x0102\r\n" );
+       }
+       else
+       {
+               fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Console Application\" 0x0103\r\n" );
+       }
+       fprintf ( OUT, "\r\n" );
+
+       fprintf ( OUT, "CFG=%s\r\n", default_cfg.c_str() );
+       fprintf ( OUT, "!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r\n" );
+       fprintf ( OUT, "!MESSAGE use the Export Makefile command and run\r\n" );
+       fprintf ( OUT, "!MESSAGE \r\n" );
+       fprintf ( OUT, "!MESSAGE NMAKE /f \"%s.mak\".\r\n", module.name.c_str() );
+       fprintf ( OUT, "!MESSAGE \r\n" );
+       fprintf ( OUT, "!MESSAGE You can specify a configuration when running NMAKE\r\n" );
+       fprintf ( OUT, "!MESSAGE by defining the macro CFG on the command line. For example:\r\n" );
+       fprintf ( OUT, "!MESSAGE \r\n" );
+       fprintf ( OUT, "!MESSAGE NMAKE /f \"%s.mak\" CFG=\"%s\"\r\n", module.name.c_str(), default_cfg.c_str() );
+       fprintf ( OUT, "!MESSAGE \r\n" );
+       fprintf ( OUT, "!MESSAGE Possible choices for configuration are:\r\n" );
+       fprintf ( OUT, "!MESSAGE \r\n" );
+       for ( i = 0; i < cfgs.size(); i++ )
+       {
+               const string& cfg = cfgs[i];
+               if ( lib )
+               {
+                       fprintf ( OUT, "!MESSAGE \"%s\" (based on \"Win32 (x86) Static Library\")\r\n", cfg.c_str() );
                }
-    }
-    fprintf ( OUT, "!MESSAGE \n" );
-    fprintf ( OUT, "\n" );
-
-    fprintf ( OUT, "# Begin Project\n" );
-    fprintf ( OUT, "# PROP AllowPerConfigDependencies 0\n" );
-    fprintf ( OUT, "# PROP Scc_ProjName \"\"\n" );
-    fprintf ( OUT, "# PROP Scc_LocalPath \"\"\n" );
-    fprintf ( OUT, "CPP=cl.exe\n" );
-    fprintf ( OUT, "MTL=midl.exe\n" if !$lib && !$exe;
-    fprintf ( OUT, "RSC=rc.exe\n" );
-
-    my $n = 0;
-
-    my $output_dir;
-    foreach my $cfg (@cfgs) {
-               if($#cfgs == 0) {
-                       # Nothing
-               } elsif($n == 0) {
-                       fprintf ( OUT, "!IF  \"\$(CFG)\" == \"$cfg\"\n" );
-                       fprintf ( OUT, "\n" );
-               } else {
-                       fprintf ( OUT, "\n" );
-                       fprintf ( OUT, "!ELSEIF  \"\$(CFG)\" == \"$cfg\"\n" );
-                       fprintf ( OUT, "\n" );
+               else if ( dll )
+               {
+                       fprintf ( OUT, "!MESSAGE \"%s\" (based on \"Win32 (x86) Dynamic-Link Library\")\r\n", cfg.c_str() );
                }
+               else
+               {
+                       fprintf ( OUT, "!MESSAGE \"%s\" (based on \"Win32 (x86) Console Application\")\r\n", cfg.c_str() );
+               }
+       }
+       fprintf ( OUT, "!MESSAGE \r\n" );
+       fprintf ( OUT, "\r\n" );
 
-               my $debug = ($cfg !~ /Release/);
-               my $msvc_headers = ($cfg =~ /MSVC Headers/);
-
-               fprintf ( OUT, "# PROP BASE Use_MFC 0\n" );
+       fprintf ( OUT, "# Begin Project\r\n" );
+       fprintf ( OUT, "# PROP AllowPerConfigDependencies 0\r\n" );
+       fprintf ( OUT, "# PROP Scc_ProjName \"\"\r\n" );
+       fprintf ( OUT, "# PROP Scc_LocalPath \"\"\r\n" );
+       fprintf ( OUT, "CPP=cl.exe\r\n" );
+       if ( !lib && !exe ) fprintf ( OUT, "MTL=midl.exe\r\n" );
+       fprintf ( OUT, "RSC=rc.exe\r\n" );
 
-               if($debug) {
-                       fprintf ( OUT, "# PROP BASE Use_Debug_Libraries 1\n" );
-               } else {
-                       fprintf ( OUT, "# PROP BASE Use_Debug_Libraries 0\n" );
-               }
+       int n = 0;
 
-               $output_dir = $cfg;
-               $output_dir =~ s/^$project - //;
-               $output_dir =~ s/ /_/g;
-               $output_dir =~ s/C\+\+/Cxx/g;
-               if($output_prefix_dir) {
-                       $output_dir = "$output_prefix_dir\\$output_dir" );
+       std::string output_dir;
+       for ( size_t icfg = 0; icfg < cfgs.size(); icfg++ )
+       {
+               std::string& cfg = cfgs[icfg];
+               if ( icfg )
+               {
+                       if ( n == 0 )
+                       {
+                               fprintf ( OUT, "!IF  \"$(CFG)\" == \"%s\"\r\n", cfg.c_str() );
+                               fprintf ( OUT, "\r\n" );
+                       }
+                       else
+                       {
+                               fprintf ( OUT, "\r\n" );
+                               fprintf ( OUT, "!ELSEIF  \"$(CFG)\" == \"%s\"\r\n", cfg.c_str() );
+                               fprintf ( OUT, "\r\n" );
+                       }
                }
 
-               fprintf ( OUT, "# PROP BASE Output_Dir \"$output_dir\"\n" );
-               fprintf ( OUT, "# PROP BASE Intermediate_Dir \"$output_dir\"\n" );
+               bool debug = !strstr ( cfg.c_str(), "Release" );
+               bool msvc_headers = ( 0 != strstr ( cfg.c_str(), "MSVC Headers" ) );
 
-               fprintf ( OUT, "# PROP BASE Target_Dir \"\"\n" );
+               fprintf ( OUT, "# PROP BASE Use_MFC 0\r\n" );
 
-               fprintf ( OUT, "# PROP Use_MFC 0\n" );
-               if($debug) {
-                       fprintf ( OUT, "# PROP Use_Debug_Libraries 1\n" );
-               } else {
-                       fprintf ( OUT, "# PROP Use_Debug_Libraries 0\n" );
+               if ( debug )
+               {
+                       fprintf ( OUT, "# PROP BASE Use_Debug_Libraries 1\r\n" );
+               }
+               else
+               {
+                       fprintf ( OUT, "# PROP BASE Use_Debug_Libraries 0\r\n" );
                }
-               fprintf ( OUT, "# PROP Output_Dir \"$output_dir\"\n" );
-               fprintf ( OUT, "# PROP Intermediate_Dir \"$output_dir\"\n" );
 
-               fprintf ( OUT, "# PROP Ignore_Export_Lib 0\n" if $dll;
-               fprintf ( OUT, "# PROP Target_Dir \"\"\n" );
+               output_dir = Replace(cfg,module.name + " - ","");
+               output_dir = Replace(output_dir," ","_");
+               output_dir = Replace(output_dir,"C++","Cxx");
+               // TODO FIXME - wine hack?
+               //if ( output_prefix_dir.size() )
+               //      output_dir = output_prefix_dir + "\\" + output_dir;
 
-               my @defines;
-               if($debug) {
-                       if($lib || $exe) {
+               fprintf ( OUT, "# PROP BASE Output_Dir \"%s\"\r\n", output_dir.c_str() );
+               fprintf ( OUT, "# PROP BASE Intermediate_Dir \"%s\"\r\n", output_dir.c_str() );
+
+               fprintf ( OUT, "# PROP BASE Target_Dir \"\"\r\n" );
+
+               fprintf ( OUT, "# PROP Use_MFC 0\r\n" );
+               if ( debug )
+               {
+                       fprintf ( OUT, "# PROP Use_Debug_Libraries 1\r\n" );
+               }
+               else
+               {
+                       fprintf ( OUT, "# PROP Use_Debug_Libraries 0\r\n" );
+               }
+               fprintf ( OUT, "# PROP Output_Dir \"%s\"\r\n", output_dir.c_str() );
+               fprintf ( OUT, "# PROP Intermediate_Dir \"%s\"\r\n", output_dir.c_str() );
+
+               if ( dll ) fprintf ( OUT, "# PROP Ignore_Export_Lib 0\r\n" );
+               fprintf ( OUT, "# PROP Target_Dir \"\"\r\n" );
+
+               vector<string> defines;
+               defines.push_back ( "WINVER=0x0501" );
+               defines.push_back ( "_WIN32_WINNT=0x0501" );
+               defines.push_back ( "_WIN32_IE=0x0600" );
+               defines.push_back ( "WIN32" );
+               defines.push_back ( "_WINDOWS" );
+               defines.push_back ( "WIN32" );
+               defines.push_back ( "_MBCS" );
+               if ( debug )
+               {
+                       defines.push_back ( "_DEBUG" );
+                       if ( lib || exe )
+                       {
                                fprintf ( OUT, "# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od" );
-                               @defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 _DEBUG _MBCS _LIB));
-                       } else {
+                               defines.push_back ( "_LIB" );
+                       }
+                       else
+                       {
                                fprintf ( OUT, "# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od" );
-                               @defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 _DEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS"));
+                               defines.push_back ( "_WINDOWS" );
+                               defines.push_back ( "_USRDLL" );
+                               // TODO FIXME - wine hack?
+                               //defines.push_back ( string("\U") + module.name + "\E_EXPORTS" );
                        }
-               } else {
-                       if($lib || $exe) {
+               }
+               else
+               {
+                       defines.push_back ( "NDEBUG" );
+                       if ( lib || exe )
+                       {
                                fprintf ( OUT, "# ADD BASE CPP /nologo /W3 /GX /O2" );
-                               @defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 NDEBUG _MBCS _LIB));
-                       } else {
+                               defines.push_back ( "_LIB" );
+                       }
+                       else
+                       {
                                fprintf ( OUT, "# ADD BASE CPP /nologo /MT /W3 /GX /O2" );
-                               @defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 NDEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS"));
+                               defines.push_back ( "_WINDOWS" );
+                               defines.push_back ( "_USRDLL" );
+                               // TODO FIXME - wine hack?
+                               //defines.push_back ( string("\U") + module.name + "\E_EXPORTS" );
                        }
                }
 
-               foreach my $define (@defines) {
-                       fprintf ( OUT, " /D \"$define\"" );
+               for ( i = 0; i < defines.size(); i++ )
+               {
+                       fprintf ( OUT, " /D \"%s\"", defines[i].c_str() );
                }
-               fprintf ( OUT, " /YX" if $lib || $exe;
+               if ( lib || exe ) fprintf ( OUT, " /YX" );
                fprintf ( OUT, " /FD" );
-               fprintf ( OUT, " /GZ" if $debug;
-               fprintf ( OUT, " " if $debug && ($lib || $exe);
+               if ( debug )
+               {
+                       fprintf ( OUT, " /GZ" );
+                       if ( lib || exe ) fprintf ( OUT, " " );
+               }
                fprintf ( OUT, " /c" );
-               fprintf ( OUT, "\n" );
-
-               my @defines2;
-               if($debug) {
-                       if($lib) {
+               fprintf ( OUT, "\r\n" );
+
+               vector<string> defines2;
+               defines2.push_back ( "WINVER=0x0501" );
+               defines2.push_back ( "_WIN32_WINNT=0x0501" );
+               defines2.push_back ( "_WIN32_IE=0x0600" );
+               defines2.push_back ( "WIN32" );
+               defines2.push_back ( "_WINDOWS" );
+               defines2.push_back ( "_MBCS" );
+               if ( debug )
+               {
+                       defines2.push_back ( "_DEBUG" );
+                       if(lib)
+                       {
                                fprintf ( OUT, "# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od" );
-                               @defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 _DEBUG _WINDOWS _MBCS _LIB);
-                       } else {
+                               defines2.push_back ( "_LIB" );
+                       }
+                       else
+                       {
                                fprintf ( OUT, "# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od" );
-                               @defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 _DEBUG WIN32 _WINDOWS _MBCS _USRDLL);
+                               defines2.push_back ( "_USRDLL" );
                        }
-               } else {
-                       if($lib) {
+               }
+               else
+               {
+                       defines2.push_back ( "NDEBUG" );
+                       if(lib)
+                       {
                                fprintf ( OUT, "# ADD CPP /nologo /MT /W3 /GX /O2" );
-                               @defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 NDEBUG _WINDOWS _MBCS _LIB);
-                       } else {
+                               defines2.push_back ( "_LIB" );
+                       }
+                       else
+                       {
                                fprintf ( OUT, "# ADD CPP /nologo /MT /W3 /GX /O2" );
-                               @defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 NDEBUG WIN32 _WINDOWS _MBCS _USRDLL);
+                               defines2.push_back ( "_USRDLL" );
                        }
                }
 
-               my @includes = ();
-               if($wine) {
-                       push @defines2, "_\U${project}\E_" );
-                       push @defines2, qw(__WINESRC__) if $project !~ /^(?:wine(?:build|test)|.*?_test)$/;
-                       if ($msvc_headers) {
-                       push @defines2, qw(__WINE_USE_NATIVE_HEADERS);
-                       }
-                       my $output_dir2 = $output_dir;
-                       $output_dir =~ s/\\/\\\\/g;
-                       push @defines2, "__WINETEST_OUTPUT_DIR=\\\"$output_dir\\\"" );
-                       push @defines2, qw(__i386__ _X86_);
-
-                       if($project =~ /^gdi32_(?:enhmfdrv|mfdrv)$/) {
+               // TODO FIXME - wine hack?
+               if ( wine )
+               {
+                       // TODO FIXME - wine hack?
+                       //defines2.push_back ( string("_\U") + module.name + "\E_" );
+                       // TODO FIXME - wine hack?
+                       /*if ( module.name !~ /^(?:wine(?:build|test)|.*?_test)$/ )
+                               defines2.push_back ( "__WINESRC__" );*/
+                       if ( msvc_headers )
+                               defines2.push_back ( "__WINE_USE_NATIVE_HEADERS" );
+                       string output_dir2 = Replace(output_dir,"\\","\\\\");
+                       defines2.push_back ( ssprintf("__WINETEST_OUTPUT_DIR=\\\"%s\\\"",output_dir.c_str()) );
+                       defines2.push_back ( "__i386__" );
+                       defines2.push_back ( "_X86_" );
+
+                       // TODO FIXME - wine hacks?
+                       /*if(module.name =~ /^gdi32_(?:enhmfdrv|mfdrv)$/) {
                                push @includes, ".." );
                        }
 
-                       if ($project =~ /_test$/) {
-                               push @includes, "$msvc_wine_dir\\$output_dir" );
+                       if ( strstr ( module.name.c_str(), "_test" )
+                       {
+                               include.push_back ( msvc_wine_dir + "\\" + output_dir );
                        }
 
-                       if (!$msvc_headers || $project eq "winetest") {
-                               push @includes, $wine_include_dir;
-                       }
+                       if (!msvc_headers || module.name == "winetest")
+                       {
+                               includes.push_back ( wine_include_dir );
+                       }*/
                }
 
-               if($wine) {
-                       foreach my $include (@includes) {
-                               if ($include !~ /[\\\"]/) {
-                                       fprintf ( OUT, " /I \"$include\"" );
-                               } else {
-                                       fprintf ( OUT, " /I $include" );
+               //if ( wine )
+               {
+                       for ( i = 0; i < includes.size(); i++ )
+                       {
+                               const string& include = includes[i];
+                               if ( strpbrk ( include.c_str(), "[\\\"]" ) )
+                               {
+                                       fprintf ( OUT, " /I \"%s\"", include.c_str() );
+                               }
+                               else
+                               {
+                                       fprintf ( OUT, " /I %s", include.c_str() );
                                }
                        }
                }
 
-               foreach my $define (@defines2) {
-                       if ($define !~ /[\\\"]/) {
-                               fprintf ( OUT, " /D \"$define\"" );
-                       } else {
-                               fprintf ( OUT, " /D $define" );
+               fprintf ( OUT, " /I \".\"" );
+               for ( i = 0; i < defines2.size(); i++ )
+               {
+                       const string& define = defines2[i];
+                       if ( strpbrk ( define.c_str(), "[\\\"]" ) )
+                       {
+                               fprintf ( OUT, " /D \"%s\"", define.c_str() );
+                       }
+                       else
+                       {
+                               fprintf ( OUT, " /D %s", define.c_str() );
                        }
                }
-               fprintf ( OUT, " /D inline=__inline" if $wine;
-               fprintf ( OUT, " /D \"__STDC__\"" if 0 && $wine;
+               if ( wine ) fprintf ( OUT, " /D inline=__inline" );
+               if ( 0 && wine ) fprintf ( OUT, " /D \"__STDC__\"" );
 
-               fprintf ( OUT, " /YX" if $lib;
-               fprintf ( OUT, " /FR" if !$lib;
+               fprintf ( OUT, lib ? " /YX" : " /FR" );
                fprintf ( OUT, " /FD" );
-               fprintf ( OUT, " /GZ" if $debug;
-               fprintf ( OUT, " " if $debug && $lib;
+               if ( debug ) fprintf ( OUT, " /GZ" );
+               if ( debug && lib ) fprintf ( OUT, " " );
                fprintf ( OUT, " /c" );
-               fprintf ( OUT, " /TP" if !$no_cpp;
-               fprintf ( OUT, "\n" );
-
-               if($debug) {
-                       fprintf ( OUT, "# SUBTRACT CPP /X /YX\n" if $dll;
-                       fprintf ( OUT, "# ADD BASE MTL /nologo /D \"_DEBUG\" /mktyplib203 /win32\n" if $dll;
-                       fprintf ( OUT, "# ADD MTL /nologo /D \"_DEBUG\" /mktyplib203 /win32\n" if $dll;
-                       fprintf ( OUT, "# ADD BASE RSC /l 0x41d /d \"_DEBUG\"\n" );
+               if ( !no_cpp ) fprintf ( OUT, " /TP" );
+               fprintf ( OUT, "\r\n" );
+
+               if ( debug )
+               {
+                       if ( dll )
+                       {
+                               fprintf ( OUT, "# SUBTRACT CPP /X /YX\r\n" );
+                               fprintf ( OUT, "# ADD BASE MTL /nologo /D \"_DEBUG\" /mktyplib203 /win32\r\n" );
+                               fprintf ( OUT, "# ADD MTL /nologo /D \"_DEBUG\" /mktyplib203 /win32\r\n" );
+                       }
+                       fprintf ( OUT, "# ADD BASE RSC /l 0x41d /d \"_DEBUG\"\r\n" );
                        fprintf ( OUT, "# ADD RSC /l 0x41d" );
-                       if($wine) {
-                               foreach my $include (@includes) {
-                                       fprintf ( OUT, " /i \"$include\"" );
+                       if ( wine )
+                       {
+                               for ( i = 0; i < includes.size(); i++ )
+                               {
+                                       fprintf ( OUT, " /i \"%s\"", includes[i].c_str() );
                                }
                        }
-                       fprintf ( OUT, " /d \"_DEBUG\"\n" );
-               } else {
-                       fprintf ( OUT, "# SUBTRACT CPP /YX\n" if $dll;
-                       fprintf ( OUT, "# ADD BASE MTL /nologo /D \"NDEBUG\" /mktyplib203 /win32\n" if $dll;
-                       fprintf ( OUT, "# ADD MTL /nologo /D \"NDEBUG\" /mktyplib203 /win32\n" if $dll;
-                       fprintf ( OUT, "# ADD BASE RSC /l 0x41d /d \"NDEBUG\"\n" );
+                       fprintf ( OUT, " /d \"_DEBUG\"\r\n" );
+               }
+               else
+               {
+                       if ( dll )
+                       {
+                               fprintf ( OUT, "# SUBTRACT CPP /YX\r\n" );
+                               fprintf ( OUT, "# ADD BASE MTL /nologo /D \"NDEBUG\" /mktyplib203 /win32\r\n" );
+                               fprintf ( OUT, "# ADD MTL /nologo /D \"NDEBUG\" /mktyplib203 /win32\r\n" );
+                       }
+                       fprintf ( OUT, "# ADD BASE RSC /l 0x41d /d \"NDEBUG\"\r\n" );
                        fprintf ( OUT, "# ADD RSC /l 0x41d" );
-                       if($wine) {
-                               foreach my $include (@includes) {
-                                       fprintf ( OUT, " /i \"$include\"" );
-                               }
+                       if ( wine )
+                       {
+                               for ( i = 0; i < includes.size(); i++ )
+                                       fprintf ( OUT, " /i \"%s\"", includes[i].c_str() );
                        }
-                       fprintf ( OUT, "/d \"NDEBUG\"\n" );
+                       fprintf ( OUT, "/d \"NDEBUG\"\r\n" );
                }
-               fprintf ( OUT, "BSC32=bscmake.exe\n" );
-               fprintf ( OUT, "# ADD BASE BSC32 /nologo\n" );
-               fprintf ( OUT, "# ADD BSC32 /nologo\n" );
+               fprintf ( OUT, "BSC32=bscmake.exe\r\n" );
+               fprintf ( OUT, "# ADD BASE BSC32 /nologo\r\n" );
+               fprintf ( OUT, "# ADD BSC32 /nologo\r\n" );
 
-               if($exe || $dll) {
-                       fprintf ( OUT, "LINK32=link.exe\n" );
+               if ( exe || dll )
+               {
+                       fprintf ( OUT, "LINK32=link.exe\r\n" );
                        fprintf ( OUT, "# ADD BASE LINK32 " );
-                       my @libraries = qw(kernel32.lib user32.lib gdi32.lib winspool.lib
-                                                  comdlg32.lib advapi32.lib shell32.lib ole32.lib
-                                                  oleaut32.lib uuid.lib odbc32.lib odbccp32.lib);
-                       foreach my $library (@libraries) {
-                               fprintf ( OUT, "$library " );
+                       vector<string> libraries;
+                       libraries.push_back ( "kernel32.lib" );
+                       libraries.push_back ( "user32.lib" );
+                       libraries.push_back ( "gdi32.lib" );
+                       libraries.push_back ( "winspool.lib" );
+                       libraries.push_back ( "comdlg32.lib" );
+                       libraries.push_back ( "advapi32.lib" );
+                       libraries.push_back ( "shell32.lib" );
+                       libraries.push_back ( "ole32.lib" );
+                       libraries.push_back ( "oleaut32.lib" );
+                       libraries.push_back ( "uuid.lib" );
+                       libraries.push_back ( "odbc32.lib" );
+                       libraries.push_back ( "odbccp32.lib" );
+                       for ( i = 0; i < libraries.size(); i++ )
+                       {
+                               fprintf ( OUT, "%s ", libraries[i].c_str() );
                        }
                        fprintf ( OUT, " /nologo" );
-                       fprintf ( OUT, " /dll" if $dll;
-                               fprintf ( OUT, " /subsystem:console" if $console;
-                       fprintf ( OUT, " /debug" if $debug;
+                       if ( dll ) fprintf ( OUT, " /dll" );
+                       if ( console ) fprintf ( OUT, " /subsystem:console" );
+                       if ( debug ) fprintf ( OUT, " /debug" );
                        fprintf ( OUT, " /machine:I386" );
-                       fprintf ( OUT, " /pdbtype:sept" if $debug;
-                       fprintf ( OUT, "\n" );
+                       if ( debug ) fprintf ( OUT, " /pdbtype:sept" );
+                       fprintf ( OUT, "\r\n" );
 
                        fprintf ( OUT, "# ADD LINK32" );
                        fprintf ( OUT, " /nologo" );
-                       fprintf ( OUT, " libcmt.lib" if $project =~ /^ntdll$/; # FIXME: Kludge
-                       foreach my $import (@imports) {
-                               fprintf ( OUT, " $import.lib" if ($import ne "msvcrt");
+                       // TODO FIXME - do we need their kludge?
+                       //if ( module.name == "ntdll" ) fprintf ( OUT, " libcmt.lib" ); // FIXME: Kludge
+                       for ( i = 0; i < imports.size(); i++ )
+                       {
+                               const string& import = imports[i];
+                               if ( import != "msvcrt" )
+                                       fprintf ( OUT, " %s.lib", import.c_str() );
                        }
-                       fprintf ( OUT, " /dll" if $dll;
-                               fprintf ( OUT, " /subsystem:console" if $console;
-                       fprintf ( OUT, " /debug" if $debug;
+                       if ( dll ) fprintf ( OUT, " /dll" );
+                       if ( console ) fprintf ( OUT, " /subsystem:console" );
+                       if ( debug ) fprintf ( OUT, " /debug" );
                        fprintf ( OUT, " /machine:I386" );
-                       fprintf ( OUT, " /nodefaultlib" if $project =~ /^ntdll$/; # FIXME: Kludge
-                       fprintf ( OUT, " /def:\"$project.def\"" if $dll;
-                       fprintf ( OUT, " /pdbtype:sept" if $debug;
-                       fprintf ( OUT, "\n" );
-               } else {
-                       fprintf ( OUT, "LIB32=link.exe -lib\n" );
-                       fprintf ( OUT, "# ADD BASE LIB32 /nologo\n" );
-                       fprintf ( OUT, "# ADD LIB32 /nologo\n" );
+                       // TODO FIXME - do we need their kludge?
+                       //if ( module.name == "ntdll" ) fprintf ( OUT, " /nodefaultlib" ); // FIXME: Kludge
+                       if ( dll ) fprintf ( OUT, " /def:\"%s.def\"", module.name.c_str() );
+                       if ( debug ) fprintf ( OUT, " /pdbtype:sept" );
+                       fprintf ( OUT, "\r\n" );
+               }
+               else
+               {
+                       fprintf ( OUT, "LIB32=link.exe -lib\r\n" );
+                       fprintf ( OUT, "# ADD BASE LIB32 /nologo\r\n" );
+                       fprintf ( OUT, "# ADD LIB32 /nologo\r\n" );
                }
 
-               $n++;
-    }
-
-    if($#cfgs != 0) {
-               fprintf ( OUT, "\n" );
-               fprintf ( OUT, "!ENDIF \n" );
-               fprintf ( OUT, "\n" );
-    }
+               n++;
+       }
 
-    if ($project eq "winebuild") {
-               fprintf ( OUT, "# Begin Special Build Tool\n" );
-               fprintf ( OUT, "SOURCE=\"\$(InputPath)\"\n" );
-        fprintf ( OUT, "PostBuild_Desc=Copying wine.dll and wine_unicode.dll ...\n" );
+       if ( cfgs.size() != 0 )
+       {
+               fprintf ( OUT, "\r\n" );
+               fprintf ( OUT, "!ENDIF \r\n" );
+               fprintf ( OUT, "\r\n" );
+       }
+#if 0
+       if ( module.name == "winebuild" )
+       {
+               fprintf ( OUT, "# Begin Special Build Tool\r\n" );
+               fprintf ( OUT, "SOURCE=\"$(InputPath)\"\r\n" );
+               fprintf ( OUT, "PostBuild_Desc=Copying wine.dll and wine_unicode.dll ...\r\n" );
                fprintf ( OUT, "PostBuild_Cmds=" );
-               fprintf ( OUT, "copy ..\\..\\library\\$output_dir\\wine.dll \$(OutDir)\t" );
-               fprintf ( OUT, "copy ..\\..\\unicode\\$output_dir\\wine_unicode.dll \$(OutDir)\n" );
-               fprintf ( OUT, "# End Special Build Tool\n" );
-    }
-    fprintf ( OUT, "# Begin Target\n" );
-    fprintf ( OUT, "\n" );
-    foreach my $cfg (@cfgs) {
-               fprintf ( OUT, "# Name \"$cfg\"\n" );
-    }
-
-    fprintf ( OUT, "# Begin Group \"Source Files\"\n" );
-    fprintf ( OUT, "\n" );
-    fprintf ( OUT, "# PROP Default_Filter \"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat\"\n" );
-
-    foreach my $source_file (@source_files) {
-               $source_file =~ s%/%\\%g;
-               if($source_file !~ /^\./) {
-                       $source_file = ".\\$source_file" );
-               }
+               fprintf ( OUT, "copy ..\\..\\library\\%s\\wine.dll $(OutDir)\t",
+                       output_dir.c_str() );
+               fprintf ( OUT, "copy ..\\..\\unicode\\%s\\wine_unicode.dll $(OutDir)\r\n",
+                       output_dir.c_str() );
+               fprintf ( OUT, "# End Special Build Tool\r\n" );
+       }
+#endif
+       fprintf ( OUT, "# Begin Target\r\n" );
+       fprintf ( OUT, "\r\n" );
+       for ( i = 0; i < cfgs.size(); i++ )
+       {
+               fprintf ( OUT, "# Name \"%s\"\r\n", cfgs[i].c_str() );
+       }
 
-               if($source_file =~ /^(.*?)\.spec$/) {
-                       my $basename = $1;
+       fprintf ( OUT, "# Begin Group \"Source Files\"\r\n" );
+       fprintf ( OUT, "\r\n" );
+       fprintf ( OUT, "# PROP Default_Filter \"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat\"\r\n" );
 
-                       $basename = "$basename.dll" if $basename !~ /\..{1,3}$/;
-                       my $dbg_c_file = "$basename.dbg.c" );
+       for ( size_t isrcfile = 0; isrcfile < source_files.size(); isrcfile++ )
+       {
+               string source_file = DosSeparator(source_files[isrcfile]);
 
-                       fprintf ( OUT, "# Begin Source File\n" );
-                       fprintf ( OUT, "\n" );
-                       fprintf ( OUT, "SOURCE=$dbg_c_file\n" );
-                       fprintf ( OUT, "# End Source File\n" );
+               if ( strncmp ( source_file.c_str(), ".\\", 2 ) )
+               {
+                       source_file = string(".\\") + source_file;
                }
+#if 0
+               if ( !strcmp ( &source_file[source_file.size()-5], ".spec" ) )
+               {
+                       string basename = string ( source_file.c_str(), source_file.size() - 5 );
+
+                       // TODO FIXME - not sure what this is doing? wine hack maybe?
+                       //if ( basename !~ /\..{1,3}$/; ) basename += string(".dll");
+                       string dbg_c_file = basename + ".dbg.c";
+
+                       fprintf ( OUT, "# Begin Source File\r\n" );
+                       fprintf ( OUT, "\r\n" );
+                       fprintf ( OUT, "SOURCE=%s\r\n", dbg_c_file.c_str() );
+                       fprintf ( OUT, "# End Source File\r\n" );
+               }
+#endif
+               fprintf ( OUT, "# Begin Source File\r\n" );
+               fprintf ( OUT, "\r\n" );
 
-               fprintf ( OUT, "# Begin Source File\n" );
-               fprintf ( OUT, "\n" );
-
-               fprintf ( OUT, "SOURCE=$source_file\n" );
-
-               if($source_file =~ /^(.*?)\.spec$/) {
-                       my $basename = $1;
-
-                       my $spec_file = $source_file;
-                       my $def_file = "$basename.def" );
-
-                       $basename = "$basename.dll" if $basename !~ /\..{1,3}$/;
-                       my $dbg_file = "$basename.dbg" );
-                       my $dbg_c_file = "$basename.dbg.c" );
-
-                       my $srcdir = "." ); # FIXME: Is this really always correct?
+               fprintf ( OUT, "SOURCE=%s\r\n", source_file.c_str() );
 
-                       fprintf ( OUT, "# Begin Custom Build\n" );
-                       fprintf ( OUT, "InputPath=$spec_file\n" );
-                       fprintf ( OUT, "\n" );
-                       fprintf ( OUT, "BuildCmds= \\\n" );
-                       fprintf ( OUT, "\t..\\..\\tools\\winebuild\\$output_dir\\winebuild.exe --def $spec_file > $def_file \\\n" );
+               if ( !strcmp ( &source_file[source_file.size()-5], ".spec" ) )
+               {
+#if 0
+                       string basename = string ( source_file.c_str(), source_file.size() - 5 );
+
+                       string spec_file = source_file;
+                       string def_file = basename + ".def";
+
+                       // TODO FIXME - not sure what this is doing? wine hack maybe?
+                       //if ( basename !~ /\..{1,3}$/; ) basename += ".dll";
+                       string dbg_file = basename + ".dbg";
+                       string dbg_c_file = basename + ".dbg.c";
+
+                       string srcdir = "."; // FIXME: Is this really always correct?
+
+                       fprintf ( OUT, "# Begin Custom Build\r\n" );
+                       fprintf ( OUT, "InputPath=%s\r\n", spec_file.c_str() );
+                       fprintf ( OUT, "\r\n" );
+                       fprintf ( OUT, "BuildCmds= \\\r\n" );
+                       fprintf ( OUT, "\t..\\..\\tools\\winebuild\\%s\\winebuild.exe --def %s > %s \\\r\n",
+                               output_dir.c_str(),
+                               spec_file.c_str(),
+                               def_file.c_str() );
                        
-                       if($project =~ /^ntdll$/) {
-                               my $n = 0;
-                               foreach my $c_src (@c_srcs) {
-                                       if($n++ > 0)  {
-                                               fprintf ( OUT, "\techo $c_src >> $dbg_file \\\n" );
-                                       } else {
-                                               fprintf ( OUT, "\techo $c_src > $dbg_file \\\n" );
+                       if ( module.name == "ntdll" )
+                       {
+                               int n = 0;
+                               for ( i = 0; i < c_srcs.size(); i++ )
+                               {
+                                       const string& c_src = c_srcs[i];
+                                       if(n++ > 0)
+                                       {
+                                               fprintf ( OUT, "\techo %s >> %s \\\r\n", c_src.c_str(), dbg_file.c_str() );
+                                       }
+                                       else
+                                       {
+                                               fprintf ( OUT, "\techo %s > %s \\\r\n", c_src.c_str(), dbg_file.c_str() );
+                                       }
+                               }
+                               fprintf ( OUT, "\t..\\..\\tools\\winebuild\\%s\\winebuild.exe",
+                                       output_dir.c_str() );
+                               fprintf ( OUT, " -o %s --debug -C%s %s \\\r\n",
+                                       dbg_c_file.c_str(),
+                                       srcdir.c_str(),
+                                       dbg_file.c_str() );
+                       }
+                       else
+                       {
+                               string sc_srcs;
+                               for ( i = 0; i < c_srcs.size(); i++ )
+                               {
+                                       const string& c_src = c_srcs[i];
+                                       if ( !strcmp ( &c_src[c_src.size()-2], ".c" ) )
+                                       {
+                                               if ( sc_srcs.size() )
+                                                       sc_srcs += " ";
+                                               sc_srcs += c_src;
                                        }
                                }
-                               fprintf ( OUT, "\t..\\..\\tools\\winebuild\\$output_dir\\winebuild.exe" );
-                               fprintf ( OUT, " -o $dbg_c_file --debug -C$srcdir $dbg_file \\\n" );
-                       } else {
-                               my $c_srcs = join(" ", grep(/\.c$/, @c_srcs));
 
-                               fprintf ( OUT, "\t..\\..\\tools\\winebuild\\$output_dir\\winebuild.exe" );
-                               fprintf ( OUT, " -o $dbg_c_file --debug -C$srcdir $c_srcs \\\n" );
+                               fprintf ( OUT, "\t..\\..\\tools\\winebuild\\%s\\winebuild.exe",
+                                       output_dir.c_str() );
+                               fprintf ( OUT, " -o %s --debug -C%s %s \\\r\n",
+                                       dbg_c_file.c_str(),
+                                       srcdir.c_str(),
+                                       sc_srcs.c_str() );
                        }
 
-                       fprintf ( OUT, "\t\n" );
-                       fprintf ( OUT, "\n" );
-                       fprintf ( OUT, "\"$def_file\" : \$(SOURCE) \"\$(INTDIR)\" \"\$(OUTDIR)\"\n" );
-                       fprintf ( OUT, "   \$(BuildCmds)\n" );
-                       fprintf ( OUT, "\n" );
-                       fprintf ( OUT, "\"$dbg_c_file\" : \$(SOURCE) \"\$(INTDIR)\" \"\$(OUTDIR)\"\n" );
-                       fprintf ( OUT, "   \$(BuildCmds)\n" );
-                       fprintf ( OUT, "# End Custom Build\n" );
-               } elsif($source_file =~ /([^\\]*?\.h)$/) {
+                       fprintf ( OUT, "\t\r\n" );
+                       fprintf ( OUT, "\r\n" );
+                       fprintf ( OUT, "\"%s\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\r\n", def_file.c_str() );
+                       fprintf ( OUT, "   $(BuildCmds)\r\n" );
+                       fprintf ( OUT, "\r\n" );
+                       fprintf ( OUT, "\"%s\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\r\n", dbg_c_file.c_str() );
+                       fprintf ( OUT, "   $(BuildCmds)\r\n" );
+                       fprintf ( OUT, "# End Custom Build\r\n" );
+#endif
+               }
+               /*else if ( source_file =~ /([^\\]*?\.h)$/ )
+               {
                        my $h_file = $1;
 
                        foreach my $cfg (@cfgs) {
                                if($#cfgs == 0) {
                                        # Nothing
                                } elsif($n == 0) {
-                                       fprintf ( OUT, "!IF  \"\$(CFG)\" == \"$cfg\"\n" );
-                                       fprintf ( OUT, "\n" );
+                                       fprintf ( OUT, "!IF  \"$(CFG)\" == \"$cfg\"\r\n" );
+                                       fprintf ( OUT, "\r\n" );
                                } else {
-                                       fprintf ( OUT, "\n" );
-                                       fprintf ( OUT, "!ELSEIF  \"\$(CFG)\" == \"$cfg\"\n" );
-                                       fprintf ( OUT, "\n" );
+                                       fprintf ( OUT, "\r\n" );
+                                       fprintf ( OUT, "!ELSEIF  \"$(CFG)\" == \"$cfg\"\r\n" );
+                                       fprintf ( OUT, "\r\n" );
                                }
 
                                $output_dir = $cfg;
@@ -476,63 +699,67 @@ void _generate_dsp ( FILE* OUT, const string& module )
                                        $output_dir = "$output_prefix_dir\\$output_dir" );
                                }
 
-                               fprintf ( OUT, "# Begin Custom Build\n" );
-                               fprintf ( OUT, "OutDir=$output_dir\n" );
-                               fprintf ( OUT, "InputPath=$source_file\n" );
-                               fprintf ( OUT, "\n" );
-                               fprintf ( OUT, "\"\$(OutDir)\\wine\\$h_file\" : \$(SOURCE) \"\$(INTDIR)\" \"\$(OUTDIR)\"\n" );
-                               fprintf ( OUT, "\tcopy \"\$(InputPath)\" \"\$(OutDir)\\wine\"\n" );
-                               fprintf ( OUT, "\n" );
-                               fprintf ( OUT, "# End Custom Build\n" );
+                               fprintf ( OUT, "# Begin Custom Build\r\n" );
+                               fprintf ( OUT, "OutDir=%s\r\n", output_dir.c_str() );
+                               fprintf ( OUT, "InputPath=%s\r\n", source_file.c_str() );
+                               fprintf ( OUT, "\r\n" );
+                               fprintf ( OUT, "\"$(OutDir)\\wine\\%s\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\r\n", h_file.c_str() );
+                               fprintf ( OUT, "\tcopy \"$(InputPath)\" \"$(OutDir)\\wine\"\r\n" );
+                               fprintf ( OUT, "\r\n" );
+                               fprintf ( OUT, "# End Custom Build\r\n" );
                        }
 
-                       if($#cfgs != 0) {
-                               fprintf ( OUT, "\n" );
-                               fprintf ( OUT, "!ENDIF \n" );
-                               fprintf ( OUT, "\n" );
+                       if ( cfgs.size() != 0)
+                       {
+                               fprintf ( OUT, "\r\n" );
+                               fprintf ( OUT, "!ENDIF \r\n" );
+                               fprintf ( OUT, "\r\n" );
                        }
-               }
+               }*/
 
-               fprintf ( OUT, "# End Source File\n" );
-    }
-    fprintf ( OUT, "# End Group\n" );
-
-    fprintf ( OUT, "# Begin Group \"Header Files\"\n" );
-    fprintf ( OUT, "\n" );
-    fprintf ( OUT, "# PROP Default_Filter \"h;hpp;hxx;hm;inl\"\n" );
-    foreach my $header_file (@header_files) {
-               fprintf ( OUT, "# Begin Source File\n" );
-               fprintf ( OUT, "\n" );
-               fprintf ( OUT, "SOURCE=.\\$header_file\n" );
-               fprintf ( OUT, "# End Source File\n" );
-    }
-    fprintf ( OUT, "# End Group\n" );
+               fprintf ( OUT, "# End Source File\r\n" );
+       }
+       fprintf ( OUT, "# End Group\r\n" );
+       fprintf ( OUT, "# Begin Group \"Header Files\"\r\n" );
+       fprintf ( OUT, "\r\n" );
+       fprintf ( OUT, "# PROP Default_Filter \"h;hpp;hxx;hm;inl\"\r\n" );
+       for ( i = 0; i < header_files.size(); i++ )
+       {
+               const string& header_file = header_files[i];
+               fprintf ( OUT, "# Begin Source File\r\n" );
+               fprintf ( OUT, "\r\n" );
+               fprintf ( OUT, "SOURCE=.\\%s\r\n", header_file.c_str() );
+               fprintf ( OUT, "# End Source File\r\n" );
+       }
+       fprintf ( OUT, "# End Group\r\n" );
 
 
 
-    fprintf ( OUT, "# Begin Group \"Resource Files\"\n" );
-    fprintf ( OUT, "\n" );
-    fprintf ( OUT, "# PROP Default_Filter \"ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe\"\n" );
-    foreach my $resource_file (@resource_files) {
-               fprintf ( OUT, "# Begin Source File\n" );
-               fprintf ( OUT, "\n" );
-               fprintf ( OUT, "SOURCE=.\\$resource_file\n" );
-               fprintf ( OUT, "# End Source File\n" );
-    }
-    fprintf ( OUT, "# End Group\n" );
+       fprintf ( OUT, "# Begin Group \"Resource Files\"\r\n" );
+       fprintf ( OUT, "\r\n" );
+       fprintf ( OUT, "# PROP Default_Filter \"ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe\"\r\n" );
+       for ( i = 0; i < resource_files.size(); i++ )
+       {
+               const string& resource_file = resource_files[i];
+               fprintf ( OUT, "# Begin Source File\r\n" );
+               fprintf ( OUT, "\r\n" );
+               fprintf ( OUT, "SOURCE=.\\%s\r\n", resource_file.c_str() );
+               fprintf ( OUT, "# End Source File\r\n" );
+       }
+       fprintf ( OUT, "# End Group\r\n" );
 
-    fprintf ( OUT, "# End Target\n" );
-    fprintf ( OUT, "# End Project\n" );
+       fprintf ( OUT, "# End Target\r\n" );
+       fprintf ( OUT, "# End Project\r\n" );
 
-    close(OUT);
+       fclose(OUT);
 }
-#endif
+
 void
 MSVCBackend::_generate_dsw_header ( FILE* OUT )
 {
-    fprintf ( OUT, "Microsoft Developer Studio Workspace File, Format Version 6.00\n" );
-    fprintf ( OUT, "# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\n" );
-    fprintf ( OUT, "\n" );
+    fprintf ( OUT, "Microsoft Developer Studio Workspace File, Format Version 6.00\r\n" );
+    fprintf ( OUT, "# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\r\n" );
+    fprintf ( OUT, "\r\n" );
 }
 
 void
@@ -542,51 +769,49 @@ MSVCBackend::_generate_dsw_project (
        std::string dsp_file,
        const std::vector<Dependency*>& dependencies )
 {
-    dsp_file = std::string(".\\") + dsp_file;
-       // TODO FIXME - what does next line do?
-    //$dsp_file =~ y%/%\\%;
+    dsp_file = DosSeparator ( std::string(".\\") + dsp_file );
     
        // TODO FIXME - must they be sorted?
     //@dependencies = sort(@dependencies);
 
-    fprintf ( OUT, "###############################################################################\n" );
-    fprintf ( OUT, "\n" );
-    fprintf ( OUT, "Project: \"%s\"=%s - Package Owner=<4>\n", module.name.c_str(), dsp_file.c_str() );
-    fprintf ( OUT, "\n" );
-    fprintf ( OUT, "Package=<5>\n" );
-    fprintf ( OUT, "{{{\n" );
-    fprintf ( OUT, "}}}\n" );
-    fprintf ( OUT, "\n" );
-    fprintf ( OUT, "Package=<4>\n" );
-    fprintf ( OUT, "{{{\n" );
+    fprintf ( OUT, "###############################################################################\r\n" );
+    fprintf ( OUT, "\r\n" );
+    fprintf ( OUT, "Project: \"%s\"=%s - Package Owner=<4>\r\n", module.name.c_str(), dsp_file.c_str() );
+    fprintf ( OUT, "\r\n" );
+    fprintf ( OUT, "Package=<5>\r\n" );
+    fprintf ( OUT, "{{{\r\n" );
+    fprintf ( OUT, "}}}\r\n" );
+    fprintf ( OUT, "\r\n" );
+    fprintf ( OUT, "Package=<4>\r\n" );
+    fprintf ( OUT, "{{{\r\n" );
        for ( size_t i = 0; i < dependencies.size(); i++ )
        {
                Dependency& dependency = *dependencies[i];
-               fprintf ( OUT, "    Begin Project Dependency\n" );
-               fprintf ( OUT, "    Project_Dep_Name %s\n", dependency.module.name.c_str() );
-               fprintf ( OUT, "    End Project Dependency\n" );
+               fprintf ( OUT, "    Begin Project Dependency\r\n" );
+               fprintf ( OUT, "    Project_Dep_Name %s\r\n", dependency.module.name.c_str() );
+               fprintf ( OUT, "    End Project Dependency\r\n" );
        }
-       fprintf ( OUT, "}}}\n" );
-       fprintf ( OUT, "\n" );
+       fprintf ( OUT, "}}}\r\n" );
+       fprintf ( OUT, "\r\n" );
 }
 
 void
 MSVCBackend::_generate_dsw_footer ( FILE* OUT )
 {
-       fprintf ( OUT, "###############################################################################\n" );
-       fprintf ( OUT, "\n" );
-       fprintf ( OUT, "Global:\n" );
-       fprintf ( OUT, "\n" );
-       fprintf ( OUT, "Package=<5>\n" );
-       fprintf ( OUT, "{{{\n" );
-       fprintf ( OUT, "}}}\n" );
-       fprintf ( OUT, "\n" );
-       fprintf ( OUT, "Package=<3>\n" );
-       fprintf ( OUT, "{{{\n" );
-       fprintf ( OUT, "}}}\n" );
-       fprintf ( OUT, "\n" );
-       fprintf ( OUT, "###############################################################################\n" );
-       fprintf ( OUT, "\n" );
+       fprintf ( OUT, "###############################################################################\r\n" );
+       fprintf ( OUT, "\r\n" );
+       fprintf ( OUT, "Global:\r\n" );
+       fprintf ( OUT, "\r\n" );
+       fprintf ( OUT, "Package=<5>\r\n" );
+       fprintf ( OUT, "{{{\r\n" );
+       fprintf ( OUT, "}}}\r\n" );
+       fprintf ( OUT, "\r\n" );
+       fprintf ( OUT, "Package=<3>\r\n" );
+       fprintf ( OUT, "{{{\r\n" );
+       fprintf ( OUT, "}}}\r\n" );
+       fprintf ( OUT, "\r\n" );
+       fprintf ( OUT, "###############################################################################\r\n" );
+       fprintf ( OUT, "\r\n" );
 }
 
 void
@@ -595,22 +820,20 @@ MSVCBackend::_generate_wine_dsw ( FILE* OUT )
        _generate_dsw_header(OUT);
        // TODO FIXME - is it necessary to sort them?
        for ( size_t i = 0; i < ProjectNode.modules.size(); i++ )
-       //foreach my $module (sort(keys(%modules)))
        {
                Module& module = *ProjectNode.modules[i];
 
-               //my $project = modules[module]->{project};
                std::string dsp_file = DspFileName ( module );
 
                // TODO FIXME - more wine hacks?
-        /*if($project =~ /^gdi32$/) {
-                       foreach my $dir (@gdi32_dirs) {
-                               my $dir2 = $dir;
+        /*if ( module.name == "gdi32" )
+               {
+                       for ( size_t idir = 0; idir < gdi32_dirs.size(); idir++ )
+                       {
+                               string dir2 = gdi32_dirs[idir];
                                $dir2 =~ s%^.*?/([^/]+)$%$1%;
 
-                               my $module = "gdi32_$dir2";
-                               $module =~ s%/%_%g;
-                               push @dependencies, $module;
+                               dependencies.push_back ( Replace ( "gdi32_" + dir2, "/", "_" ) );
                        }
         }*/