@@ -38,23 +38,23 @@ bool ProjectGenerator::passStaticIncludeObject(uint& startPos, uint& endPos, Sta
3838 endPos = m_inLine.find_first_of (" . \t " , endPos2 + 1 );
3939 }
4040 }
41- string sTag = m_inLine.substr (startPos, endPos - startPos);
42- if (sTag .find (' $' ) != string::npos) {
41+ string tag = m_inLine.substr (startPos, endPos - startPos);
42+ if (tag .find (' $' ) != string::npos) {
4343 // Invalid include. Occurs when include is actually a variable
4444 startPos += 2 ;
45- sTag = m_inLine.substr (startPos, m_inLine.find (' )' , startPos) - startPos);
45+ tag = m_inLine.substr (startPos, m_inLine.find (' )' , startPos) - startPos);
4646 // Check if additional variable (This happens when a string should be prepended to existing items within tag.)
4747 string tag2;
48- if (sTag .find (' :' ) != string::npos) {
49- startPos = sTag .find (" :%=" );
48+ if (tag .find (' :' ) != string::npos) {
49+ startPos = tag .find (" :%=" );
5050 const uint startPos2 = startPos + 3 ;
51- endPos = sTag .find (' %' , startPos2);
52- tag2 = sTag .substr (startPos2, endPos - startPos2);
53- sTag = sTag .substr (0 , startPos);
51+ endPos = tag .find (' %' , startPos2);
52+ tag2 = tag .substr (startPos2, endPos - startPos2);
53+ tag = tag .substr (0 , startPos);
5454 }
5555 // Get variable contents
5656 vector<string> files;
57- m_configHelper.buildObjects (sTag , files);
57+ m_configHelper.buildObjects (tag , files);
5858 if (tag2.length () > 0 ) {
5959 // Prepend the full library path
6060 for (auto file = files.begin (); file < files.end (); ++file) {
@@ -66,16 +66,16 @@ bool ProjectGenerator::passStaticIncludeObject(uint& startPos, uint& endPos, Sta
6666 // Check if object already included in internal list
6767 if (find (m_includesC.begin (), m_includesC.end (), *file) == m_includesC.end ()) {
6868 staticIncludes.push_back (*file);
69- // outputInfo("Found C Static: '" + *vitFile + "'");
69+ outputInfo (" Found C Static: '" + *file + " '" );
7070 }
7171 }
7272 return true ;
7373 }
7474
7575 // Check if object already included in internal list
76- if (find (staticIncludes.begin (), staticIncludes.end (), sTag ) == staticIncludes.end ()) {
77- staticIncludes.push_back (sTag );
78- // outputInfo("Found Static: '" + sTag + "'");
76+ if (find (staticIncludes.begin (), staticIncludes.end (), tag ) == staticIncludes.end ()) {
77+ staticIncludes.push_back (tag );
78+ outputInfo (" Found Static: '" + tag + " '" );
7979 }
8080 return true ;
8181}
@@ -145,8 +145,7 @@ bool ProjectGenerator::passDynamicIncludeObject(uint& startPos, uint& endPos, st
145145 }
146146 if (option->m_value == " 1" ) {
147147 includes.push_back (*object);
148- // outputInfo("Found Dynamic: '" + *vitObject + "', '" + "( " + ident + " && " + sDynInc + " )"
149- // + "'");
148+ outputInfo (" Found Dynamic: '" + *object + " ', '" + " ( " + ident + " && " + dynInc + " )" + " '" );
150149 }
151150 }
152151 }
@@ -188,10 +187,10 @@ bool ProjectGenerator::passDynamicIncludeObject(uint& startPos, uint& endPos, st
188187 // Check if the config option is for a reserved type
189188 if (m_configHelper.m_replaceList .find (ident) != m_configHelper.m_replaceList .end ()) {
190189 m_replaceIncludes[tag].push_back (compare == " 1" ? ident : " !" + ident);
191- // outputInfo("Found Dynamic Replace: '" + sTag + "', '" + ident + "'");
190+ outputInfo (" Found Dynamic Replace: '" + tag + " ', '" + ident + " '" );
192191 } else {
193192 includes.push_back (tag);
194- // outputInfo("Found Dynamic: '" + sTag + "', '" + ident + "'");
193+ outputInfo (" Found Dynamic: '" + tag + " ', '" + ident + " '" );
195194 }
196195 }
197196 }
0 commit comments