project_generate: Support dynamic emms include.

Since yasm emms is not required for 32b but is required for 64b we
include it all the time so that we can support both configurations in a
single project.

SMP/project_generate/source/configGenerator_build.cpp

@@ -506,4 +506,11 @@ void configGenerator::buildObjects( const string & sTag, vector<string> & vObjec
         vObjects.push_back( "strtod" ); //msvc contains a strtod but it does not handle NaN's correctly
         vObjects.push_back( "getopt" );
     }
+    else if( sTag.compare( "EMMS_OBJS__yes_" ) == 0 )
+    {
+        if( this->getConfigOption( "MMX_EXTERNAL" )->m_sValue.compare( "1" ) == 0 )
+        {
+            vObjects.push_back( "x86/emms" ); //yasm emms is not required in 32b but is for 64bit unless with icl
+        }
+    }
 }
\ No newline at end of file

SMP/project_generate/source/projectGenerator.cpp

@@ -1906,7 +1906,7 @@ bool projectGenerator::passStaticIncludeObject( uint & uiStartPos, uint & uiEndP
             //Check if object already included in internal list
             if( find( m_vCIncludes.begin(), m_vCIncludes.end(), *vitFile ) == m_vCIncludes.end() )
             {
-                m_vCIncludes.push_back( *vitFile );
+                vStaticIncludes.push_back( *vitFile );
                 //cout << "  Found C Static: '" << *vitFile << "'" << endl;
             }
         }