Don't add underscore prefix to amd64 symbols
[reactos.git] / reactos / tools / rbuild / backend / msvc / msvcmaker.cpp
index 2c64105..82bd3ee 100644 (file)
@@ -1,9 +1,29 @@
+/*
+ * Copyright (C) 2002 Patrik Stridvall
+ * Copyright (C) 2005 Royce Mitchell III
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifdef _MSC_VER
 #pragma warning ( disable : 4786 )
 #endif//_MSC_VER
 
 #include <string>
 #include <vector>
+#include <set>
 
 #include <stdio.h>
 
 
 using std::string;
 using std::vector;
+using std::set;
+
+typedef set<string> StringSet;
+
+#ifdef OUT
+#undef OUT
+#endif//OUT
 
 void
 MSVCBackend::_generate_dsp ( const Module& module )
@@ -29,13 +56,13 @@ MSVCBackend::_generate_dsp ( const Module& module )
                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");
+       string module_type = GetExtension(*module.output);
+       bool lib = (module_type == ".lib") || (module_type == ".a");
+       bool dll = (module_type == ".dll") || (module_type == ".cpl");
+       bool exe = (module_type == ".exe") || (module_type == ".scr");
        // TODO FIXME - need more checks here for 'sys' and possibly 'drv'?
 
-       bool console = exe; // FIXME: Not always correct
+       bool console = exe && (module.type == Win32CUI);
 
        // TODO FIXME - not sure if the count here is right...
        int parts = 0;
@@ -55,33 +82,64 @@ MSVCBackend::_generate_dsp ( const Module& module )
        //$output->progress("$dsp_file (file $progress_current of $progress_max)");
 
        // TODO FIXME - what's diff. betw. 'c_srcs' and 'source_files'?
-       string dsp_path = module.GetBasePath();
-       vector<string> c_srcs, source_files, resource_files;
+       vector<string> c_srcs, source_files, header_files, resource_files, includes, libraries;
+       StringSet common_defines;
        vector<const IfableData*> ifs_list;
+       ifs_list.push_back ( &module.project.non_if_data );
        ifs_list.push_back ( &module.non_if_data );
+
+       // this is a define in MinGW w32api, but not Microsoft's headers
+       common_defines.insert ( "STDCALL=__stdcall" );
+
        while ( ifs_list.size() )
        {
                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()];
+                       if (files[i]->file.directory != SourceDirectory)
+                               continue;
+
+                       // We want the full path here for directory support later on
+                       string path = Path::RelativeFromDirectory (
+                               files[i]->file.relative_path,
+                               module.output->relative_path );
+                       string file = path + std::string("\\") + files[i]->file.name;
 
                        source_files.push_back ( file );
                        if ( !stricmp ( Right(file,2).c_str(), ".c" ) )
                                c_srcs.push_back ( file );
+                       if ( !stricmp ( Right(file,2).c_str(), ".h" ) )
+                               header_files.push_back ( file );
                        if ( !stricmp ( Right(file,3).c_str(), ".rc" ) )
                                resource_files.push_back ( file );
                }
+               const vector<Include*>& incs = data.includes;
+               for ( i = 0; i < incs.size(); i++ )
+               {
+                       string path = Path::RelativeFromDirectory (
+                               incs[i]->directory->relative_path,
+                               module.output->relative_path );
+                       includes.push_back ( path );
+               }
+               const vector<Library*>& libs = data.libraries;
+               for ( i = 0; i < libs.size(); i++ )
+               {
+                       libraries.push_back ( libs[i]->name + ".lib" );
+               }
+               const vector<Define*>& defs = data.defines;
+               for ( i = 0; i < defs.size(); i++ )
+               {
+                       if ( defs[i]->value[0] )
+                               common_defines.insert( defs[i]->name + "=" + defs[i]->value );
+                       else
+                               common_defines.insert( defs[i]->name );
+               }
        }
        // TODO FIXME - we don't include header files in our build system
        //my @header_files = @{module->{header_files}};
-       vector<string> header_files;
+       //vector<string> header_files;
 
        // TODO FIXME - wine hack?
        /*if (module.name !~ /^wine(?:_unicode|build|runtests|test)?$/ &&
@@ -203,25 +261,20 @@ MSVCBackend::_generate_dsp ( const Module& module )
        if ( !lib && !exe ) fprintf ( OUT, "MTL=midl.exe\r\n" );
        fprintf ( OUT, "RSC=rc.exe\r\n" );
 
-       int n = 0;
-
        std::string output_dir;
        for ( size_t icfg = 0; icfg < cfgs.size(); icfg++ )
        {
                std::string& cfg = cfgs[icfg];
-               if ( icfg )
+               if ( icfg == 0 )
                {
-                       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, "!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" );
                }
 
                bool debug = !strstr ( cfg.c_str(), "Release" );
@@ -265,52 +318,46 @@ MSVCBackend::_generate_dsp ( const Module& module )
                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" );
+               StringSet defines = common_defines;
+
                if ( debug )
                {
-                       defines.push_back ( "_DEBUG" );
+                       defines.insert ( "_DEBUG" );
                        if ( lib || exe )
                        {
                                fprintf ( OUT, "# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od" );
-                               defines.push_back ( "_LIB" );
+                               defines.insert ( "_LIB" );
                        }
                        else
                        {
                                fprintf ( OUT, "# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od" );
-                               defines.push_back ( "_WINDOWS" );
-                               defines.push_back ( "_USRDLL" );
+                               defines.insert ( "_WINDOWS" );
+                               defines.insert ( "_USRDLL" );
                                // TODO FIXME - wine hack?
-                               //defines.push_back ( string("\U") + module.name + "\E_EXPORTS" );
+                               //defines.insert ( string("\U") + module.name + "\E_EXPORTS" );
                        }
                }
                else
                {
-                       defines.push_back ( "NDEBUG" );
+                       defines.insert ( "NDEBUG" );
                        if ( lib || exe )
                        {
                                fprintf ( OUT, "# ADD BASE CPP /nologo /W3 /GX /O2" );
-                               defines.push_back ( "_LIB" );
+                               defines.insert ( "_LIB" );
                        }
                        else
                        {
                                fprintf ( OUT, "# ADD BASE CPP /nologo /MT /W3 /GX /O2" );
-                               defines.push_back ( "_WINDOWS" );
-                               defines.push_back ( "_USRDLL" );
+                               defines.insert ( "_WINDOWS" );
+                               defines.insert ( "_USRDLL" );
                                // TODO FIXME - wine hack?
-                               //defines.push_back ( string("\U") + module.name + "\E_EXPORTS" );
+                               //defines.insert ( string("\U") + module.name + "\E_EXPORTS" );
                        }
                }
 
-               for ( i = 0; i < defines.size(); i++ )
+               for ( StringSet::const_iterator it1=defines.begin(); it1!=defines.end(); it1++ )
                {
-                       fprintf ( OUT, " /D \"%s\"", defines[i].c_str() );
+                       fprintf ( OUT, " /D \"%s\"", it1->c_str() );
                }
                if ( lib || exe ) fprintf ( OUT, " /YX" );
                fprintf ( OUT, " /FD" );
@@ -322,57 +369,49 @@ MSVCBackend::_generate_dsp ( const Module& module )
                fprintf ( OUT, " /c" );
                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" );
+                       defines.insert ( "_DEBUG" );
                        if(lib)
                        {
                                fprintf ( OUT, "# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od" );
-                               defines2.push_back ( "_LIB" );
+                               defines.insert ( "_LIB" );
                        }
                        else
                        {
                                fprintf ( OUT, "# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od" );
-                               defines2.push_back ( "_USRDLL" );
+                               defines.insert ( "_USRDLL" );
                        }
                }
                else
                {
-                       defines2.push_back ( "NDEBUG" );
+                       defines.insert ( "NDEBUG" );
                        if(lib)
                        {
                                fprintf ( OUT, "# ADD CPP /nologo /MT /W3 /GX /O2" );
-                               defines2.push_back ( "_LIB" );
+                               defines.insert ( "_LIB" );
                        }
                        else
                        {
                                fprintf ( OUT, "# ADD CPP /nologo /MT /W3 /GX /O2" );
-                               defines2.push_back ( "_USRDLL" );
+                               defines.insert ( "_USRDLL" );
                        }
                }
 
-               std::vector<std::string> includes;
                // TODO FIXME - wine hack?
                if ( wine )
                {
                        // TODO FIXME - wine hack?
-                       //defines2.push_back ( string("_\U") + module.name + "\E_" );
+                       //defines.insert ( string("_\U") + module.name + "\E_" );
                        // TODO FIXME - wine hack?
                        /*if ( module.name !~ /^(?:wine(?:build|test)|.*?_test)$/ )
-                               defines2.push_back ( "__WINESRC__" );*/
+                               defines.insert ( "__WINESRC__" );*/
                        if ( msvc_headers )
-                               defines2.push_back ( "__WINE_USE_NATIVE_HEADERS" );
+                               defines.insert ( "__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_" );
+                       defines.insert ( ssprintf("__WINETEST_OUTPUT_DIR=\\\"%s\\\"",output_dir.c_str()) );
+                       defines.insert ( "__i386__" );
+                       defines.insert ( "_X86_" );
 
                        // TODO FIXME - wine hacks?
                        /*if(module.name =~ /^gdi32_(?:enhmfdrv|mfdrv)$/) {
@@ -390,12 +429,12 @@ MSVCBackend::_generate_dsp ( const Module& module )
                        }*/
                }
 
-               if ( wine )
+               //if ( wine )
                {
-                       for ( i = 0; i < includes.size(); i++ );
+                       for ( i = 0; i < includes.size(); i++ )
                        {
                                const string& include = includes[i];
-                               if ( strpbrk ( include.c_str(), "[\\\"]" ) )
+                               if ( strpbrk ( include.c_str(), "[\\\"]" ) || !strncmp ( include.c_str(), "../", 3 ) )
                                {
                                        fprintf ( OUT, " /I \"%s\"", include.c_str() );
                                }
@@ -406,9 +445,10 @@ MSVCBackend::_generate_dsp ( const Module& module )
                        }
                }
 
-               for ( i = 0; i < defines2.size(); i++ )
+               fprintf ( OUT, " /I \".\"" );
+               for ( StringSet::const_iterator it2=defines.begin(); it2!=defines.end(); it2++ )
                {
-                       const string& define = defines2[i];
+                       const string& define = *it2;
                        if ( strpbrk ( define.c_str(), "[\\\"]" ) )
                        {
                                fprintf ( OUT, " /D \"%s\"", define.c_str() );
@@ -439,13 +479,18 @@ MSVCBackend::_generate_dsp ( const Module& module )
                        }
                        fprintf ( OUT, "# ADD BASE RSC /l 0x41d /d \"_DEBUG\"\r\n" );
                        fprintf ( OUT, "# ADD RSC /l 0x41d" );
-                       if ( wine )
+                       /*if ( wine )*/
                        {
                                for ( i = 0; i < includes.size(); i++ )
                                {
                                        fprintf ( OUT, " /i \"%s\"", includes[i].c_str() );
                                }
                        }
+
+                       for ( StringSet::const_iterator it3=defines.begin(); it3!=defines.end(); it3++ )
+                       {
+                               fprintf ( OUT, " /D \"%s\"", it3->c_str() );
+                       }
                        fprintf ( OUT, " /d \"_DEBUG\"\r\n" );
                }
                else
@@ -463,6 +508,13 @@ MSVCBackend::_generate_dsp ( const Module& module )
                                for ( i = 0; i < includes.size(); i++ )
                                        fprintf ( OUT, " /i \"%s\"", includes[i].c_str() );
                        }
+
+                       for ( StringSet::const_iterator it4=defines.begin(); it4!=defines.end(); it4++ )
+                       {
+                               fprintf ( OUT, " /D \"%s\"", it4->c_str() );
+                       }
+
+
                        fprintf ( OUT, "/d \"NDEBUG\"\r\n" );
                }
                fprintf ( OUT, "BSC32=bscmake.exe\r\n" );
@@ -473,19 +525,7 @@ MSVCBackend::_generate_dsp ( const Module& module )
                {
                        fprintf ( OUT, "LINK32=link.exe\r\n" );
                        fprintf ( OUT, "# ADD BASE LINK32 " );
-                       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() );
@@ -515,6 +555,7 @@ MSVCBackend::_generate_dsp ( const Module& module )
                        // 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 (( dll ) && ( module_type == ".cpl")) fprintf ( OUT, " /out:\"Win32\\%s%s\"", module.name.c_str(), module_type.c_str() );
                        if ( debug ) fprintf ( OUT, " /pdbtype:sept" );
                        fprintf ( OUT, "\r\n" );
                }
@@ -524,8 +565,6 @@ MSVCBackend::_generate_dsp ( const Module& module )
                        fprintf ( OUT, "# ADD BASE LIB32 /nologo\r\n" );
                        fprintf ( OUT, "# ADD LIB32 /nologo\r\n" );
                }
-
-               n++;
        }
 
        if ( cfgs.size() != 0 )
@@ -534,7 +573,7 @@ MSVCBackend::_generate_dsp ( const Module& module )
                fprintf ( OUT, "!ENDIF \r\n" );
                fprintf ( OUT, "\r\n" );
        }
-
+#if 0
        if ( module.name == "winebuild" )
        {
                fprintf ( OUT, "# Begin Special Build Tool\r\n" );
@@ -547,6 +586,7 @@ MSVCBackend::_generate_dsp ( const Module& module )
                        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++ )
@@ -566,7 +606,7 @@ MSVCBackend::_generate_dsp ( const Module& module )
                {
                        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 );
@@ -580,7 +620,7 @@ MSVCBackend::_generate_dsp ( const Module& module )
                        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" );
 
@@ -588,6 +628,7 @@ MSVCBackend::_generate_dsp ( const Module& module )
 
                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;
@@ -608,7 +649,7 @@ MSVCBackend::_generate_dsp ( const Module& module )
                                output_dir.c_str(),
                                spec_file.c_str(),
                                def_file.c_str() );
-                       
+
                        if ( module.name == "ntdll" )
                        {
                                int n = 0;
@@ -661,6 +702,7 @@ MSVCBackend::_generate_dsp ( const Module& module )
                        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)$/ )
                {
@@ -707,7 +749,6 @@ MSVCBackend::_generate_dsp ( const Module& module )
                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" );
@@ -726,7 +767,7 @@ MSVCBackend::_generate_dsp ( const Module& module )
        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++ )
+/*     for ( i = 0; i < resource_files.size(); i++ )
        {
                const string& resource_file = resource_files[i];
                fprintf ( OUT, "# Begin Source File\r\n" );
@@ -734,7 +775,7 @@ MSVCBackend::_generate_dsp ( const Module& module )
                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 Group\r\n" );
 
        fprintf ( OUT, "# End Target\r\n" );
        fprintf ( OUT, "# End Project\r\n" );
@@ -745,9 +786,9 @@ MSVCBackend::_generate_dsp ( const Module& module )
 void
 MSVCBackend::_generate_dsw_header ( FILE* OUT )
 {
-    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" );
+       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
@@ -757,21 +798,21 @@ MSVCBackend::_generate_dsw_project (
        std::string dsp_file,
        const std::vector<Dependency*>& dependencies )
 {
-    dsp_file = DosSeparator ( std::string(".\\") + dsp_file );
-    
+       dsp_file = DosSeparator ( std::string(".\\") + dsp_file );
+
        // TODO FIXME - must they be sorted?
-    //@dependencies = sort(@dependencies);
-
-    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" );
+       //@dependencies = sort(@dependencies);
+
+       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];
@@ -807,14 +848,14 @@ 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++ )
+       for( std::map<std::string, Module*>::const_iterator p = ProjectNode.modules.begin(); p != ProjectNode.modules.end(); ++ p )
        {
-               Module& module = *ProjectNode.modules[i];
+               Module& module = *p->second;
 
                std::string dsp_file = DspFileName ( module );
 
                // TODO FIXME - more wine hacks?
-        /*if ( module.name == "gdi32" )
+               /*if ( module.name == "gdi32" )
                {
                        for ( size_t idir = 0; idir < gdi32_dirs.size(); idir++ )
                        {
@@ -823,9 +864,9 @@ MSVCBackend::_generate_wine_dsw ( FILE* OUT )
 
                                dependencies.push_back ( Replace ( "gdi32_" + dir2, "/", "_" ) );
                        }
-        }*/
+               }*/
 
                _generate_dsw_project ( OUT, module, dsp_file, module.dependencies );
-    }
-    _generate_dsw_footer ( OUT );
+       }
+       _generate_dsw_footer ( OUT );
 }