using std::string;\r
using std::vector;\r
\r
+#ifdef OUT\r
+#undef OUT\r
+#endif//OUT\r
+\r
void\r
MSVCBackend::_generate_vcproj ( const Module& module )\r
{\r
}\r
\r
string module_type = GetExtension(module.GetTargetName());\r
- bool lib = (module_type == ".lib") || (module_type == ".a");\r
+ bool lib = (module.type == ObjectLibrary) || (module_type == ".lib") || (module_type == ".a");\r
bool dll = (module_type == ".dll") || (module_type == ".cpl");\r
bool exe = (module_type == ".exe");\r
// TODO FIXME - need more checks here for 'sys' and possibly 'drv'?\r
fprintf ( OUT, "\t\t\tName=\"Win32\"/>\r\n" );\r
fprintf ( OUT, "\t</Platforms>\r\n" );\r
\r
+ fprintf ( OUT, "\t<ToolFiles>\r\n" );\r
+ fprintf ( OUT, "\t\t<ToolFile\r\n" );\r
+\r
+ string path = Path::RelativeFromDirectory ( ProjectNode.name, module.GetBasePath() );\r
+ path.erase(path.find(ProjectNode.name, 0), ProjectNode.name.size() + 1);\r
+\r
+ fprintf ( OUT, "\t\t\tRelativePath=\"%s/gccasm.rules\"/>\r\n", path.c_str() );\r
+ fprintf ( OUT, "\t</ToolFiles>\r\n" );\r
+\r
int n = 0;\r
\r
std::string output_dir;\r
{\r
fprintf ( OUT, "\t\t\t<Tool\r\n" );\r
fprintf ( OUT, "\t\t\t\tName=\"VCLibrarianTool\"\r\n" );\r
- fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s.%s\"/>\r\n", module.name.c_str(), module_type.c_str() );\r
+ fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s%s\"/>\r\n", module.name.c_str(), module_type.c_str() );\r
}\r
else\r
{\r
}\r
fprintf ( OUT, "\"\r\n" );\r
\r
- fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s.%s\"\r\n", module.name.c_str(), module_type.c_str() );\r
+ fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s%s\"\r\n", module.name.c_str(), module_type.c_str() );\r
fprintf ( OUT, "\t\t\t\tLinkIncremental=\"%d\"\r\n", debug ? 2 : 1 );\r
fprintf ( OUT, "\t\t\t\tGenerateDebugInformation=\"TRUE\"\r\n" );\r
\r
// Source files\r
fprintf ( OUT, "\t\t<Filter\r\n" );\r
fprintf ( OUT, "\t\t\tName=\"Source Files\"\r\n" );\r
- fprintf ( OUT, "\t\t\tFilter=\"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat\">\r\n" );\r
+ fprintf ( OUT, "\t\t\tFilter=\"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;S\">\r\n" );\r
for ( size_t isrcfile = 0; isrcfile < source_files.size(); isrcfile++ )\r
{\r
const string& source_file = DosSeparator(source_files[isrcfile]);\r
fprintf ( OUT, "\t\t\t<File\r\n" );\r
fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", source_file.c_str() );\r
+\r
+ if (configuration.VSProjectVersion < "8.00") {\r
+ if (source_file.at(source_file.size() - 1) == 'S') {\r
+ for ( size_t iconfig = 0; iconfig < cfgs.size(); iconfig++ )\r
+ {\r
+ std::string& config = cfgs[iconfig];\r
+ fprintf ( OUT, "\t\t\t\t<FileConfiguration\r\n" );\r
+ fprintf ( OUT, "\t\t\t\t\tName=\"" );\r
+ fprintf ( OUT, config.c_str());\r
+ fprintf ( OUT, "|Win32\">\r\n" );\r
+ fprintf ( OUT, "\t\t\t\t\t<Tool\r\n" );\r
+ fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" );\r
+ fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"cl /E "$(InputPath)" | as -o "$(OutDir)\\$(InputName).obj"\"\r\n" );\r
+ fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"/>\r\n" );\r
+ fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" );\r
+ }\r
+ }\r
+ }\r
fprintf ( OUT, "\t\t\t</File>\r\n" );\r
}\r
fprintf ( OUT, "\t\t</Filter>\r\n" );\r
return string1;\r
} \r
\r
-void\r
-MSVCBackend::_generate_sln_header ( FILE* OUT )\r
-{\r
+std::string\r
+MSVCBackend::_get_solution_verion ( void ) {\r
+ string version;\r
+\r
if (configuration.VSProjectVersion.empty())\r
configuration.VSProjectVersion = MS_VS_DEF_VERSION;\r
\r
- string version;\r
-\r
if (configuration.VSProjectVersion == "7.00")\r
- version = "7.00";\r
+ version = "7.00";\r
\r
if (configuration.VSProjectVersion == "7.10")\r
- version = "8.00";\r
+ version = "8.00";\r
\r
if (configuration.VSProjectVersion == "8.00")\r
- version = "9.00";\r
+ version = "9.00";\r
+\r
+ return version;\r
+}\r
+\r
+\r
+void\r
+MSVCBackend::_generate_rules_file ( FILE* OUT )\r
+{\r
+ fprintf ( OUT, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" );\r
+ fprintf ( OUT, "<VisualStudioToolFile\r\n" );\r
+ fprintf ( OUT, "\tName=\"GCC Assembler\"\r\n" );\r
+ fprintf ( OUT, "\tVersion=\"%s\"\r\n", _get_solution_verion().c_str() );\r
+ fprintf ( OUT, "\t>\r\n" );\r
+ fprintf ( OUT, "\t<Rules>\r\n" );\r
+ fprintf ( OUT, "\t\t<CustomBuildRule\r\n" );\r
+ fprintf ( OUT, "\t\t\tName=\"Assembler\"\r\n" );\r
+ fprintf ( OUT, "\t\t\tDisplayName=\"Assembler Files\"\r\n" );\r
+ fprintf ( OUT, "\t\t\tCommandLine=\"cl /E "$(InputPath)" | as -o "$(OutDir)\\$(InputName).obj"\"\r\n" );\r
+ fprintf ( OUT, "\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"\r\n" ); \r
+ fprintf ( OUT, "\t\t\tFileExtensions=\"*.S\"\r\n" );\r
+ fprintf ( OUT, "\t\t\tExecutionDescription=\"asm\"\r\n" );\r
+ fprintf ( OUT, "\t\t\t>\r\n" );\r
+ fprintf ( OUT, "\t\t\t<Properties>\r\n" );\r
+ fprintf ( OUT, "\t\t\t</Properties>\r\n" );\r
+ fprintf ( OUT, "\t\t</CustomBuildRule>\r\n" );\r
+ fprintf ( OUT, "\t</Rules>\r\n" );\r
+ fprintf ( OUT, "</VisualStudioToolFile>\r\n" );\r
+}\r
\r
- fprintf ( OUT, "Microsoft Visual Studio Solution File, Format Version %s\r\n", version.c_str() );\r
+void\r
+MSVCBackend::_generate_sln_header ( FILE* OUT )\r
+{\r
+ fprintf ( OUT, "Microsoft Visual Studio Solution File, Format Version %s\r\n", _get_solution_verion().c_str() );\r
fprintf ( OUT, "# Visual Studio 2005\r\n" );\r
fprintf ( OUT, "\r\n" );\r
}\r
\r
//FIXME: only omit ProjectDependencies in VS 2005 when there are no dependencies\r
//NOTE: VS 2002 do not use ProjectSection; it uses GlobalSection instead\r
- if (configuration.VSProjectVersion == "7.10") {\r
+ if ((configuration.VSProjectVersion == "7.10") || (dependencies.size() > 0)) {\r
fprintf ( OUT, "\tProjectSection(ProjectDependencies) = postProject\r\n" );\r
+ for ( size_t i = 0; i < dependencies.size(); i++ )\r
+ {\r
+ Dependency& dependency = *dependencies[i];\r
+ fprintf ( OUT, "\t\t%s = %s\r\n", dependency.module.guid.c_str(), dependency.module.guid.c_str() );\r
+ }\r
fprintf ( OUT, "\tEndProjectSection\r\n" );\r
}\r
\r
fprintf ( OUT, "\tEndGlobalSection\r\n" );\r
fprintf ( OUT, "\tGlobalSection(ExtensibilityAddIns) = postSolution\r\n" );\r
fprintf ( OUT, "\tEndGlobalSection\r\n" );\r
-\r
\r
if (configuration.VSProjectVersion == "7.00") {\r
fprintf ( OUT, "\tGlobalSection(ProjectDependencies) = postSolution\r\n" );\r
+ //FIXME: Add dependencies for VS 2002\r
fprintf ( OUT, "\tEndGlobalSection\r\n" );\r
}\r
\r