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
size_t i;\r
// TODO FIXME wine hack?\r
- const bool wine = false;\r
+ //const bool wine = false;\r
\r
string vcproj_file = VcprojFileName(module);\r
- printf ( "Creating MSVC2K5 project: '%s'\n", vcproj_file.c_str() );\r
+ printf ( "Creating MSVC.NET project: '%s'\n", vcproj_file.c_str() );\r
FILE* OUT = fopen ( vcproj_file.c_str(), "wb" );\r
\r
vector<string> imports;\r
- for ( i = 0; i < module.non_if_data.libraries.size(); i++ )\r
- {\r
- imports.push_back ( module.non_if_data.libraries[i]->name );\r
- }\r
+ string module_type = GetExtension(module.GetTargetName());\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
+ bool sys = (module_type == ".sys");\r
+\r
+ string path_basedir = module.GetPathToBaseDir ();\r
+ string intenv = Environment::GetIntermediatePath ();\r
+ string outenv = Environment::GetOutputPath ();\r
+ string outdir;\r
+ string intdir;\r
+ \r
+ if ( intenv == "obj-i386" )\r
+ intdir = path_basedir + "obj-i386"; /* append relative dir from project dir */\r
+ else\r
+ intdir = intenv;\r
+\r
+ if ( outenv == "output-i386" )\r
+ outdir = path_basedir + "output-i386";\r
+ else\r
+ outdir = outenv;\r
\r
- string module_type = Right(module.GetTargetName(),3);\r
- bool lib = (module_type == "lib");\r
- bool dll = (module_type == "dll");\r
- bool exe = (module_type == "exe");\r
// TODO FIXME - need more checks here for 'sys' and possibly 'drv'?\r
\r
- bool console = exe; // FIXME: Not always correct\r
+ bool console = exe && (module.type == Win32CUI);\r
\r
// TODO FIXME - not sure if the count here is right...\r
int parts = 0;\r
//$progress_current++;\r
//$output->progress("$dsp_file (file $progress_current of $progress_max)");\r
\r
- // TODO FIXME - what's diff. betw. 'c_srcs' and 'source_files'?\r
string vcproj_path = module.GetBasePath();\r
- vector<string> c_srcs, source_files, resource_files, includes;\r
+ vector<string> source_files, resource_files, includes, libraries, defines;\r
vector<const IfableData*> ifs_list;\r
+ ifs_list.push_back ( &module.project.non_if_data );\r
ifs_list.push_back ( &module.non_if_data );\r
+\r
+ // this is a define in MinGW w32api, but not Microsoft's headers\r
+ defines.push_back ( "_CRT_SECURE_NO_DEPRECATE" );\r
+ defines.push_back ( "_CRT_NON_CONFORMING_SWPRINTFS" );\r
+ defines.push_back ( "STDCALL=__stdcall" );\r
+\r
+ string baseaddr;\r
+\r
while ( ifs_list.size() )\r
{\r
const IfableData& data = *ifs_list.back();\r
// TODO FIXME - do we want the full path of the file here?\r
string file = string(".") + &files[i]->name[vcproj_path.size()];\r
\r
- source_files.push_back ( file );\r
- if ( !stricmp ( Right(file,2).c_str(), ".c" ) )\r
- c_srcs.push_back ( file );\r
if ( !stricmp ( Right(file,3).c_str(), ".rc" ) )\r
resource_files.push_back ( file );\r
+ else\r
+ source_files.push_back ( file );\r
}\r
const vector<Include*>& incs = data.includes;\r
for ( i = 0; i < incs.size(); i++ )\r
{\r
+ // explicitly omit win32api directories\r
+ if ( !strncmp(incs[i]->directory.c_str(), "w32api", 6 ) )\r
+ continue;\r
+\r
+ // explicitly omit include/wine directories\r
+ if ( !strncmp(incs[i]->directory.c_str(), "include\\wine", 12 ) )\r
+ continue;\r
+\r
string path = Path::RelativeFromDirectory (\r
incs[i]->directory,\r
module.GetBasePath() );\r
includes.push_back ( path );\r
}\r
+ const vector<Library*>& libs = data.libraries;\r
+ for ( i = 0; i < libs.size(); i++ )\r
+ {\r
+#if 0\r
+ // this code is deactivated untill the tree builds fine with msvc\r
+ // --- is appended to each library path which is later\r
+ // replaced by the configuration\r
+ // i.e. ../output-i386/lib/rtl/---/rtl.lib becomes\r
+ // ../output-i386/lib/rtl/Debug/rtl.lib \r
+ // etc\r
+ libs[i]->importedModule->\r
+ string libpath = outdir + "\\" + libs[i]->importedModule->GetBasePath() + "\\---\\" + libs[i]->name + ".lib";\r
+ libraries.push_back ( libpath );\r
+#else\r
+ libraries.push_back ( libs[i]->name + ".lib" );\r
+#endif\r
+ }\r
+ const vector<Define*>& defs = data.defines;\r
+ for ( i = 0; i < defs.size(); i++ )\r
+ {\r
+ if ( defs[i]->value[0] )\r
+ defines.push_back ( defs[i]->name + "=" + defs[i]->value );\r
+ else\r
+ defines.push_back ( defs[i]->name );\r
+ }\r
+ for ( i = 0; i < data.properties.size(); i++ )\r
+ {\r
+ Property& prop = *data.properties[i];\r
+ if ( strstr ( module.baseaddress.c_str(), prop.name.c_str() ) )\r
+ baseaddr = prop.value;\r
+ }\r
}\r
- // TODO FIXME - we don't include header files in our build system\r
- //my @header_files = @{module->{header_files}};\r
- vector<string> header_files;\r
\r
- // TODO FIXME - wine hack?\r
- /*if (module.name !~ /^wine(?:_unicode|build|runtests|test)?$/ &&\r
- module.name !~ /^(?:gdi32)_.+?$/ &&\r
- Right ( module.name, 5 ) == "_test" )\r
- {\r
- source_files.push_back ( module.name + ".spec" );\r
- @source_files = sort(@source_files);\r
- }*/\r
+ vector<string> header_files;\r
\r
bool no_cpp = true;\r
bool no_msvc_headers = true;\r
- // TODO FIXME - wine hack?\r
- /*if (module.name =~ /^wine(?:runtests|test)$/\r
- || Right ( module.name, 5 ) == "_test" )\r
- {\r
- no_msvc_headers = false;\r
- }*/\r
\r
std::vector<std::string> cfgs;\r
\r
- cfgs.push_back ( module.name + " - Win32" );\r
+ cfgs.push_back ( "Debug" );\r
+ cfgs.push_back ( "Release" );\r
+ cfgs.push_back ( "Speed" );\r
\r
if (!no_cpp)\r
{\r
cfgs = _cfgs;\r
}\r
\r
- // TODO FIXME - wine hack?\r
- /*if (!no_release)\r
- {\r
- std::vector<std::string> _cfgs;\r
- for ( i = 0; i < cfgs.size(); i++ )\r
- {\r
- _cfgs.push_back ( cfgs[i] + " Debug" );\r
- _cfgs.push_back ( cfgs[i] + " Release" );\r
- }\r
- cfgs.resize(0);\r
- cfgs = _cfgs;\r
- }*/\r
-\r
if (!no_msvc_headers)\r
{\r
std::vector<std::string> _cfgs;\r
}\r
\r
string default_cfg = cfgs.back();\r
+ string include_string;\r
\r
- fprintf ( OUT, "# Microsoft Developer Studio Project File - Name=\"%s\" - Package Owner=<4>\r\n", module.name.c_str() );\r
- fprintf ( OUT, "# Microsoft Developer Studio Generated Build File, Format Version 6.00\r\n" );\r
- fprintf ( OUT, "# ** DO NOT EDIT **\r\n" );\r
- fprintf ( OUT, "\r\n" );\r
+ fprintf ( OUT, "<?xml version=\"1.0\" encoding = \"Windows-1252\"?>\r\n" );\r
+ fprintf ( OUT, "<VisualStudioProject\r\n" );\r
+ fprintf ( OUT, "\tProjectType=\"Visual C++\"\r\n" );\r
\r
- if ( lib )\r
- {\r
- fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Static Library\" 0x0104\r\n" );\r
- }\r
- else if ( dll )\r
- {\r
- fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Dynamic-Link Library\" 0x0102\r\n" );\r
- }\r
- else\r
- {\r
- fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Console Application\" 0x0103\r\n" );\r
- }\r
- fprintf ( OUT, "\r\n" );\r
+ if (configuration.VSProjectVersion.empty())\r
+ configuration.VSProjectVersion = MS_VS_DEF_VERSION;\r
\r
- fprintf ( OUT, "CFG=%s\r\n", default_cfg.c_str() );\r
- fprintf ( OUT, "!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r\n" );\r
- fprintf ( OUT, "!MESSAGE use the Export Makefile command and run\r\n" );\r
- fprintf ( OUT, "!MESSAGE \r\n" );\r
- fprintf ( OUT, "!MESSAGE NMAKE /f \"%s.mak\".\r\n", module.name.c_str() );\r
- fprintf ( OUT, "!MESSAGE \r\n" );\r
- fprintf ( OUT, "!MESSAGE You can specify a configuration when running NMAKE\r\n" );\r
- fprintf ( OUT, "!MESSAGE by defining the macro CFG on the command line. For example:\r\n" );\r
- fprintf ( OUT, "!MESSAGE \r\n" );\r
- fprintf ( OUT, "!MESSAGE NMAKE /f \"%s.mak\" CFG=\"%s\"\r\n", module.name.c_str(), default_cfg.c_str() );\r
- fprintf ( OUT, "!MESSAGE \r\n" );\r
- fprintf ( OUT, "!MESSAGE Possible choices for configuration are:\r\n" );\r
- fprintf ( OUT, "!MESSAGE \r\n" );\r
- for ( i = 0; i < cfgs.size(); i++ )\r
- {\r
- const string& cfg = cfgs[i];\r
- if ( lib )\r
- {\r
- fprintf ( OUT, "!MESSAGE \"%s\" (based on \"Win32 (x86) Static Library\")\r\n", cfg.c_str() );\r
- }\r
- else if ( dll )\r
- {\r
- fprintf ( OUT, "!MESSAGE \"%s\" (based on \"Win32 (x86) Dynamic-Link Library\")\r\n", cfg.c_str() );\r
- }\r
- else\r
- {\r
- fprintf ( OUT, "!MESSAGE \"%s\" (based on \"Win32 (x86) Console Application\")\r\n", cfg.c_str() );\r
- }\r
- }\r
- fprintf ( OUT, "!MESSAGE \r\n" );\r
- fprintf ( OUT, "\r\n" );\r
+ fprintf ( OUT, "\tVersion=\"%s\"\r\n", configuration.VSProjectVersion.c_str() );\r
+ fprintf ( OUT, "\tName=\"%s\"\r\n", module.name.c_str() );\r
+ fprintf ( OUT, "\tProjectGUID=\"%s\"\r\n", module.guid.c_str() ); \r
+ fprintf ( OUT, "\tKeyword=\"Win32Proj\">\r\n" );\r
+\r
+ fprintf ( OUT, "\t<Platforms>\r\n" );\r
+ fprintf ( OUT, "\t\t<Platform\r\n" );\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
- fprintf ( OUT, "# Begin Project\r\n" );\r
- fprintf ( OUT, "# PROP AllowPerConfigDependencies 0\r\n" );\r
- fprintf ( OUT, "# PROP Scc_ProjName \"\"\r\n" );\r
- fprintf ( OUT, "# PROP Scc_LocalPath \"\"\r\n" );\r
- fprintf ( OUT, "CPP=cl.exe\r\n" );\r
- if ( !lib && !exe ) fprintf ( OUT, "MTL=midl.exe\r\n" );\r
- fprintf ( OUT, "RSC=rc.exe\r\n" );\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=\"%sgccasm.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<Configurations>\r\n" );\r
for ( size_t icfg = 0; icfg < cfgs.size(); icfg++ )\r
{\r
std::string& cfg = cfgs[icfg];\r
- if ( icfg )\r
- {\r
- if ( n == 0 )\r
- {\r
- fprintf ( OUT, "!IF \"$(CFG)\" == \"%s\"\r\n", cfg.c_str() );\r
- fprintf ( OUT, "\r\n" );\r
- }\r
- else\r
- {\r
- fprintf ( OUT, "\r\n" );\r
- fprintf ( OUT, "!ELSEIF \"$(CFG)\" == \"%s\"\r\n", cfg.c_str() );\r
- fprintf ( OUT, "\r\n" );\r
- }\r
- }\r
\r
- bool debug = !strstr ( cfg.c_str(), "Release" );\r
- bool msvc_headers = ( 0 != strstr ( cfg.c_str(), "MSVC Headers" ) );\r
+ bool debug = strstr ( cfg.c_str(), "Debug" );\r
+ bool speed = strstr ( cfg.c_str(), "Speed" );\r
+ bool release = (!debug && !speed );\r
\r
- fprintf ( OUT, "# PROP BASE Use_MFC 0\r\n" );\r
+ //bool msvc_headers = ( 0 != strstr ( cfg.c_str(), "MSVC Headers" ) );\r
\r
- if ( debug )\r
- {\r
- fprintf ( OUT, "# PROP BASE Use_Debug_Libraries 1\r\n" );\r
- }\r
- else\r
- {\r
- fprintf ( OUT, "# PROP BASE Use_Debug_Libraries 0\r\n" );\r
- }\r
+ fprintf ( OUT, "\t\t<Configuration\r\n" );\r
+ fprintf ( OUT, "\t\t\tName=\"%s|Win32\"\r\n", cfg.c_str() );\r
+ fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\\%s\\%s\"\r\n", outdir.c_str (), module.GetBasePath ().c_str (), cfg.c_str() );\r
+ fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\\%s\\%s\"\r\n", intdir.c_str (), module.GetBasePath ().c_str (), cfg.c_str() );\r
+ fprintf ( OUT, "\t\t\tConfigurationType=\"%d\"\r\n", exe ? 1 : dll ? 2 : lib ? 4 : -1 );\r
+ fprintf ( OUT, "\t\t\tCharacterSet=\"2\">\r\n" );\r
\r
- output_dir = Replace(cfg,module.name + " - ","");\r
- output_dir = Replace(output_dir," ","_");\r
- output_dir = Replace(output_dir,"C++","Cxx");\r
- // TODO FIXME - wine hack?\r
- //if ( output_prefix_dir.size() )\r
- // output_dir = output_prefix_dir + "\\" + output_dir;\r
+ fprintf ( OUT, "\t\t\t<Tool\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tName=\"VCCLCompilerTool\"\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tOptimization=\"%d\"\r\n", release ? 2 : 0 );\r
\r
- fprintf ( OUT, "# PROP BASE Output_Dir \"%s\"\r\n", output_dir.c_str() );\r
- fprintf ( OUT, "# PROP BASE Intermediate_Dir \"%s\"\r\n", output_dir.c_str() );\r
+ fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\"" );\r
+ bool multiple_includes = false;\r
+ fprintf ( OUT, "./;" );\r
+ for ( i = 0; i < includes.size(); i++ )\r
+ {\r
+ const string& include = includes[i];\r
+ if ( strcmp ( include.c_str(), "." ) )\r
+ {\r
+ if ( multiple_includes )\r
+ fprintf ( OUT, ";" );\r
\r
- fprintf ( OUT, "# PROP BASE Target_Dir \"\"\r\n" );\r
+ fprintf ( OUT, "%s", include.c_str() );\r
+ include_string += " /I " + include;\r
+ multiple_includes = true;\r
+ }\r
+ }\r
+ fprintf ( OUT, "\"\r\n " );\r
\r
- fprintf ( OUT, "# PROP Use_MFC 0\r\n" );\r
if ( debug )\r
{\r
- fprintf ( OUT, "# PROP Use_Debug_Libraries 1\r\n" );\r
+ defines.push_back ( "_DEBUG" );\r
}\r
else\r
{\r
- fprintf ( OUT, "# PROP Use_Debug_Libraries 0\r\n" );\r
+ defines.push_back ( "NDEBUG" );\r
}\r
- fprintf ( OUT, "# PROP Output_Dir \"%s\"\r\n", output_dir.c_str() );\r
- fprintf ( OUT, "# PROP Intermediate_Dir \"%s\"\r\n", output_dir.c_str() );\r
-\r
- if ( dll ) fprintf ( OUT, "# PROP Ignore_Export_Lib 0\r\n" );\r
- fprintf ( OUT, "# PROP Target_Dir \"\"\r\n" );\r
-\r
- vector<string> defines;\r
- defines.push_back ( "WINVER=0x0501" );\r
- defines.push_back ( "_WIN32_WINNT=0x0501" );\r
- defines.push_back ( "_WIN32_IE=0x0600" );\r
- defines.push_back ( "WIN32" );\r
- defines.push_back ( "_WINDOWS" );\r
- defines.push_back ( "WIN32" );\r
- defines.push_back ( "_MBCS" );\r
- if ( debug )\r
+\r
+ if ( lib || exe )\r
{\r
- defines.push_back ( "_DEBUG" );\r
- if ( lib || exe )\r
- {\r
- fprintf ( OUT, "# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od" );\r
- defines.push_back ( "_LIB" );\r
- }\r
- else\r
- {\r
- fprintf ( OUT, "# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od" );\r
- defines.push_back ( "_WINDOWS" );\r
- defines.push_back ( "_USRDLL" );\r
- // TODO FIXME - wine hack?\r
- //defines.push_back ( string("\U") + module.name + "\E_EXPORTS" );\r
- }\r
+ defines.push_back ( "_LIB" );\r
}\r
else\r
{\r
- defines.push_back ( "NDEBUG" );\r
- if ( lib || exe )\r
- {\r
- fprintf ( OUT, "# ADD BASE CPP /nologo /W3 /GX /O2" );\r
- defines.push_back ( "_LIB" );\r
- }\r
- else\r
- {\r
- fprintf ( OUT, "# ADD BASE CPP /nologo /MT /W3 /GX /O2" );\r
- defines.push_back ( "_WINDOWS" );\r
- defines.push_back ( "_USRDLL" );\r
- // TODO FIXME - wine hack?\r
- //defines.push_back ( string("\U") + module.name + "\E_EXPORTS" );\r
- }\r
+ defines.push_back ( "_WINDOWS" );\r
+ defines.push_back ( "_USRDLL" );\r
}\r
\r
+ fprintf ( OUT, "\t\t\t\tPreprocessorDefinitions=\"" );\r
for ( i = 0; i < defines.size(); i++ )\r
{\r
- fprintf ( OUT, " /D \"%s\"", defines[i].c_str() );\r
- }\r
- if ( lib || exe ) fprintf ( OUT, " /YX" );\r
- fprintf ( OUT, " /FD" );\r
- if ( debug )\r
- {\r
- fprintf ( OUT, " /GZ" );\r
- if ( lib || exe ) fprintf ( OUT, " " );\r
+ if ( i > 0 )\r
+ fprintf ( OUT, ";" );\r
+\r
+ defines[i] = _replace_str(defines[i], "\"","""); \r
+ fprintf ( OUT, "%s", defines[i].c_str() );\r
}\r
- fprintf ( OUT, " /c" );\r
- fprintf ( OUT, "\r\n" );\r
-\r
- vector<string> defines2;\r
- defines2.push_back ( "WINVER=0x0501" );\r
- defines2.push_back ( "_WIN32_WINNT=0x0501" );\r
- defines2.push_back ( "_WIN32_IE=0x0600" );\r
- defines2.push_back ( "WIN32" );\r
- defines2.push_back ( "_WINDOWS" );\r
- defines2.push_back ( "_MBCS" );\r
- if ( debug )\r
+ fprintf ( OUT, "\"\r\n" );\r
+\r
+ fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"%s\"\r\n", speed ? "FALSE" : "TRUE" );\r
+ fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"%s\"\r\n", debug ? "3" : "0" );\r
+ fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"5\"\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"%s\"\r\n", debug ? "TRUE" : "FALSE" );\r
+ fprintf ( OUT, "\t\t\t\tEnableFunctionLevelLinking=\"%s\"\r\n", debug ? "TRUE" : "FALSE" );\r
+ \r
+ if ( module.pch != NULL )\r
{\r
- defines2.push_back ( "_DEBUG" );\r
- if(lib)\r
- {\r
- fprintf ( OUT, "# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od" );\r
- defines2.push_back ( "_LIB" );\r
- }\r
- else\r
- {\r
- fprintf ( OUT, "# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od" );\r
- defines2.push_back ( "_USRDLL" );\r
- }\r
+ fprintf ( OUT, "\t\t\t\tUsePrecompiledHeader=\"2\"\r\n" );\r
+ string pch_path = Path::RelativeFromDirectory (\r
+ module.pch->file.name,\r
+ module.GetBasePath() );\r
+ fprintf ( OUT, "\t\t\t\tPrecompiledHeaderThrough=\"%s\"\r\n", pch_path.c_str() );\r
}\r
else\r
{\r
- defines2.push_back ( "NDEBUG" );\r
- if(lib)\r
- {\r
- fprintf ( OUT, "# ADD CPP /nologo /MT /W3 /GX /O2" );\r
- defines2.push_back ( "_LIB" );\r
- }\r
- else\r
- {\r
- fprintf ( OUT, "# ADD CPP /nologo /MT /W3 /GX /O2" );\r
- defines2.push_back ( "_USRDLL" );\r
- }\r
+ fprintf ( OUT, "\t\t\t\tUsePrecompiledHeader=\"0\"\r\n" );\r
}\r
\r
- // TODO FIXME - wine hack?\r
- if ( wine )\r
+ fprintf ( OUT, "\t\t\t\tWholeProgramOptimization=\"%s\"\r\n", release ? "TRUE" : "FALSE");\r
+ if ( release )\r
{\r
- // TODO FIXME - wine hack?\r
- //defines2.push_back ( string("_\U") + module.name + "\E_" );\r
- // TODO FIXME - wine hack?\r
- /*if ( module.name !~ /^(?:wine(?:build|test)|.*?_test)$/ )\r
- defines2.push_back ( "__WINESRC__" );*/\r
- if ( msvc_headers )\r
- defines2.push_back ( "__WINE_USE_NATIVE_HEADERS" );\r
- string output_dir2 = Replace(output_dir,"\\","\\\\");\r
- defines2.push_back ( ssprintf("__WINETEST_OUTPUT_DIR=\\\"%s\\\"",output_dir.c_str()) );\r
- defines2.push_back ( "__i386__" );\r
- defines2.push_back ( "_X86_" );\r
-\r
- // TODO FIXME - wine hacks?\r
- /*if(module.name =~ /^gdi32_(?:enhmfdrv|mfdrv)$/) {\r
- push @includes, ".." );\r
- }\r
+ fprintf ( OUT, "\t\t\t\tFavorSizeOrSpeed=\"1\"\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tStringPooling=\"true\"\r\n" );\r
+ }\r
\r
- if ( strstr ( module.name.c_str(), "_test" )\r
- {\r
- include.push_back ( msvc_wine_dir + "\\" + output_dir );\r
- }\r
+ fprintf ( OUT, "\t\t\t\tEnablePREfast=\"%s\"\r\n", debug ? "TRUE" : "FALSE");\r
+ fprintf ( OUT, "\t\t\t\tDisableSpecificWarnings=\"4201;4127\"\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tWarningLevel=\"%s\"\r\n", release ? "0" : "4" );\r
+ fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"%s\"\r\n", release ? "FALSE" : "TRUE");\r
+ if ( !module.cplusplus )\r
+ fprintf ( OUT, "\t\t\t\tCompileAs=\"1\"\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tDebugInformationFormat=\"%s\"/>\r\n", speed ? "0" : "4");\r
\r
- if (!msvc_headers || module.name == "winetest")\r
- {\r
- includes.push_back ( wine_include_dir );\r
- }*/\r
- }\r
+ fprintf ( OUT, "\t\t\t<Tool\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tName=\"VCCustomBuildTool\"/>\r\n" );\r
\r
- //if ( wine )\r
+ if ( lib )\r
{\r
- for ( i = 0; i < includes.size(); i++ )\r
- {\r
- const string& include = includes[i];\r
- if ( strpbrk ( include.c_str(), "[\\\"]" ) )\r
- {\r
- fprintf ( OUT, " /I \"%s\"", include.c_str() );\r
- }\r
- else\r
- {\r
- fprintf ( OUT, " /I %s", include.c_str() );\r
- }\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.lib\"/>\r\n", module.name.c_str() );\r
}\r
-\r
- fprintf ( OUT, " /I \".\"" );\r
- for ( i = 0; i < defines2.size(); i++ )\r
+ else\r
{\r
- const string& define = defines2[i];\r
- if ( strpbrk ( define.c_str(), "[\\\"]" ) )\r
- {\r
- fprintf ( OUT, " /D \"%s\"", define.c_str() );\r
- }\r
- else\r
+ fprintf ( OUT, "\t\t\t<Tool\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tName=\"VCLinkerTool\"\r\n" );\r
+\r
+ fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\"" );\r
+ for ( i = 0; i < libraries.size(); i++ )\r
{\r
- fprintf ( OUT, " /D %s", define.c_str() );\r
+ if ( i > 0 )\r
+ fprintf ( OUT, " " );\r
+#if 0 \r
+ // this code is deactivated untill \r
+ // msvc can build the whole tree\r
+ string libpath = libraries[i].c_str();\r
+ libpath.replace (libpath.find("---"), //See HACK\r
+ 3,\r
+ cfg);\r
+ fprintf ( OUT, "%s", libpath.c_str() );\r
+#else\r
+ fprintf ( OUT, "%s", libraries[i].c_str() );\r
+#endif\r
}\r
- }\r
- if ( wine ) fprintf ( OUT, " /D inline=__inline" );\r
- if ( 0 && wine ) fprintf ( OUT, " /D \"__STDC__\"" );\r
+ fprintf ( OUT, "\"\r\n" );\r
\r
- fprintf ( OUT, lib ? " /YX" : " /FR" );\r
- fprintf ( OUT, " /FD" );\r
- if ( debug ) fprintf ( OUT, " /GZ" );\r
- if ( debug && lib ) fprintf ( OUT, " " );\r
- fprintf ( OUT, " /c" );\r
- if ( !no_cpp ) fprintf ( OUT, " /TP" );\r
- fprintf ( OUT, "\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\tLinkIncremental=\"%d\"\r\n", debug ? 2 : 1 );\r
+ fprintf ( OUT, "\t\t\t\tGenerateDebugInformation=\"%s\"\r\n", speed ? "FALSE" : "TRUE" );\r
\r
- if ( debug )\r
- {\r
- if ( dll )\r
+ if ( debug )\r
+ fprintf ( OUT, "\t\t\t\tProgramDatabaseFile=\"$(OutDir)/%s.pdb\"\r\n", module.name.c_str() );\r
+\r
+ if ( sys )\r
{\r
- fprintf ( OUT, "# SUBTRACT CPP /X /YX\r\n" );\r
- fprintf ( OUT, "# ADD BASE MTL /nologo /D \"_DEBUG\" /mktyplib203 /win32\r\n" );\r
- fprintf ( OUT, "# ADD MTL /nologo /D \"_DEBUG\" /mktyplib203 /win32\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /DRIVER /ALIGN:0x20 /SUBSYSTEM:NATIVE /SECTION:INIT,D /NODEFAULTLIB /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint == "" ? "DriverEntry" : module.entrypoint.c_str ());\r
+ fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x10000" : baseaddr.c_str ()); \r
}\r
- fprintf ( OUT, "# ADD BASE RSC /l 0x41d /d \"_DEBUG\"\r\n" );\r
- fprintf ( OUT, "# ADD RSC /l 0x41d" );\r
- if ( wine )\r
+ else if ( exe )\r
{\r
- for ( i = 0; i < includes.size(); i++ )\r
+ if ( module.type == Kernel )\r
+ {\r
+ fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SUBSYSTEM:NATIVE /NODEFAULTLIB /SECTION:INIT,D /ALIGN:0x80\"\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"KiSystemStartup\"\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ()); \r
+ }\r
+ else if ( module.type == NativeCUI )\r
{\r
- fprintf ( OUT, " /i \"%s\"", includes[i].c_str() );\r
+ fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SUBSYSTEM:NATIVE /NODEFAULTLIB /ALIGN:0x20\"\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"NtProcessStartup\"\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ()); \r
}\r
+ else if ( module.type == Win32CUI || module.type == Win32GUI )\r
+ {\r
+ fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 );\r
+ }\r
}\r
- fprintf ( OUT, " /d \"_DEBUG\"\r\n" );\r
- }\r
- else\r
- {\r
- if ( dll )\r
- {\r
- fprintf ( OUT, "# SUBTRACT CPP /YX\r\n" );\r
- fprintf ( OUT, "# ADD BASE MTL /nologo /D \"NDEBUG\" /mktyplib203 /win32\r\n" );\r
- fprintf ( OUT, "# ADD MTL /nologo /D \"NDEBUG\" /mktyplib203 /win32\r\n" );\r
- }\r
- fprintf ( OUT, "# ADD BASE RSC /l 0x41d /d \"NDEBUG\"\r\n" );\r
- fprintf ( OUT, "# ADD RSC /l 0x41d" );\r
- if ( wine )\r
+ else if ( dll )\r
{\r
- for ( i = 0; i < includes.size(); i++ )\r
- fprintf ( OUT, " /i \"%s\"", includes[i].c_str() );\r
+ fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint == "" ? "DllMain" : module.entrypoint.c_str ());\r
+ fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x40000" : baseaddr.c_str ());\r
}\r
- fprintf ( OUT, "/d \"NDEBUG\"\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 );\r
}\r
- fprintf ( OUT, "BSC32=bscmake.exe\r\n" );\r
- fprintf ( OUT, "# ADD BASE BSC32 /nologo\r\n" );\r
- fprintf ( OUT, "# ADD BSC32 /nologo\r\n" );\r
-\r
- if ( exe || dll )\r
+ \r
+ fprintf ( OUT, "\t\t\t<Tool\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tName=\"VCResourceCompilerTool\"\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\"" );\r
+ multiple_includes = false;\r
+ fprintf ( OUT, "./;" );\r
+ for ( i = 0; i < includes.size(); i++ )\r
{\r
- fprintf ( OUT, "LINK32=link.exe\r\n" );\r
- fprintf ( OUT, "# ADD BASE LINK32 " );\r
- vector<string> libraries;\r
- libraries.push_back ( "kernel32.lib" );\r
- libraries.push_back ( "user32.lib" );\r
- libraries.push_back ( "gdi32.lib" );\r
- libraries.push_back ( "winspool.lib" );\r
- libraries.push_back ( "comdlg32.lib" );\r
- libraries.push_back ( "advapi32.lib" );\r
- libraries.push_back ( "shell32.lib" );\r
- libraries.push_back ( "ole32.lib" );\r
- libraries.push_back ( "oleaut32.lib" );\r
- libraries.push_back ( "uuid.lib" );\r
- libraries.push_back ( "odbc32.lib" );\r
- libraries.push_back ( "odbccp32.lib" );\r
- for ( i = 0; i < libraries.size(); i++ )\r
+ const string& include = includes[i];\r
+ if ( strcmp ( include.c_str(), "." ) )\r
{\r
- fprintf ( OUT, "%s ", libraries[i].c_str() );\r
+ if ( multiple_includes )\r
+ fprintf ( OUT, ";" );\r
+ fprintf ( OUT, "%s", include.c_str() );\r
+ multiple_includes = true;\r
}\r
- fprintf ( OUT, " /nologo" );\r
- if ( dll ) fprintf ( OUT, " /dll" );\r
- if ( console ) fprintf ( OUT, " /subsystem:console" );\r
- if ( debug ) fprintf ( OUT, " /debug" );\r
- fprintf ( OUT, " /machine:I386" );\r
- if ( debug ) fprintf ( OUT, " /pdbtype:sept" );\r
- fprintf ( OUT, "\r\n" );\r
-\r
- fprintf ( OUT, "# ADD LINK32" );\r
- fprintf ( OUT, " /nologo" );\r
- // TODO FIXME - do we need their kludge?\r
- //if ( module.name == "ntdll" ) fprintf ( OUT, " libcmt.lib" ); // FIXME: Kludge\r
- for ( i = 0; i < imports.size(); i++ )\r
- {\r
- const string& import = imports[i];\r
- if ( import != "msvcrt" )\r
- fprintf ( OUT, " %s.lib", import.c_str() );\r
- }\r
- if ( dll ) fprintf ( OUT, " /dll" );\r
- if ( console ) fprintf ( OUT, " /subsystem:console" );\r
- if ( debug ) fprintf ( OUT, " /debug" );\r
- fprintf ( OUT, " /machine:I386" );\r
- // TODO FIXME - do we need their kludge?\r
- //if ( module.name == "ntdll" ) fprintf ( OUT, " /nodefaultlib" ); // FIXME: Kludge\r
- if ( dll ) fprintf ( OUT, " /def:\"%s.def\"", module.name.c_str() );\r
- if ( debug ) fprintf ( OUT, " /pdbtype:sept" );\r
- fprintf ( OUT, "\r\n" );\r
- }\r
- else\r
- {\r
- fprintf ( OUT, "LIB32=link.exe -lib\r\n" );\r
- fprintf ( OUT, "# ADD BASE LIB32 /nologo\r\n" );\r
- fprintf ( OUT, "# ADD LIB32 /nologo\r\n" );\r
}\r
+ fprintf ( OUT, "\"/>\r\n " );\r
+\r
+ fprintf ( OUT, "\t\t\t<Tool\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tName=\"VCMIDLTool\"/>\r\n" );\r
+ fprintf ( OUT, "\t\t\t<Tool\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tName=\"VCPostBuildEventTool\"/>\r\n" );\r
+ fprintf ( OUT, "\t\t\t<Tool\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tName=\"VCPreBuildEventTool\"/>\r\n" );\r
+ fprintf ( OUT, "\t\t\t<Tool\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tName=\"VCPreLinkEventTool\"/>\r\n" );\r
+ fprintf ( OUT, "\t\t\t<Tool\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tName=\"VCWebServiceProxyGeneratorTool\"/>\r\n" );\r
+ fprintf ( OUT, "\t\t\t<Tool\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tName=\"VCWebDeploymentTool\"/>\r\n" );\r
+ fprintf ( OUT, "\t\t</Configuration>\r\n" );\r
\r
n++;\r
}\r
+ fprintf ( OUT, "\t</Configurations>\r\n" );\r
\r
- if ( cfgs.size() != 0 )\r
- {\r
- fprintf ( OUT, "\r\n" );\r
- fprintf ( OUT, "!ENDIF \r\n" );\r
- fprintf ( OUT, "\r\n" );\r
- }\r
-#if 0\r
- if ( module.name == "winebuild" )\r
- {\r
- fprintf ( OUT, "# Begin Special Build Tool\r\n" );\r
- fprintf ( OUT, "SOURCE=\"$(InputPath)\"\r\n" );\r
- fprintf ( OUT, "PostBuild_Desc=Copying wine.dll and wine_unicode.dll ...\r\n" );\r
- fprintf ( OUT, "PostBuild_Cmds=" );\r
- fprintf ( OUT, "copy ..\\..\\library\\%s\\wine.dll $(OutDir)\t",\r
- output_dir.c_str() );\r
- fprintf ( OUT, "copy ..\\..\\unicode\\%s\\wine_unicode.dll $(OutDir)\r\n",\r
- output_dir.c_str() );\r
- fprintf ( OUT, "# End Special Build Tool\r\n" );\r
- }\r
-#endif\r
- fprintf ( OUT, "# Begin Target\r\n" );\r
- fprintf ( OUT, "\r\n" );\r
- for ( i = 0; i < cfgs.size(); i++ )\r
- {\r
- fprintf ( OUT, "# Name \"%s\"\r\n", cfgs[i].c_str() );\r
- }\r
-\r
- fprintf ( OUT, "# Begin Group \"Source Files\"\r\n" );\r
- fprintf ( OUT, "\r\n" );\r
- fprintf ( OUT, "# PROP Default_Filter \"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat\"\r\n" );\r
+ fprintf ( OUT, "\t<Files>\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;S\">\r\n" );\r
for ( size_t isrcfile = 0; isrcfile < source_files.size(); isrcfile++ )\r
{\r
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 ( strncmp ( source_file.c_str(), ".\\", 2 ) )\r
+ for ( size_t iconfig = 0; iconfig < cfgs.size(); iconfig++ )\r
{\r
- source_file = string(".\\") + source_file;\r
- }\r
-#if 0\r
- if ( !strcmp ( &source_file[source_file.size()-5], ".spec" ) )\r
- {\r
- string basename = string ( source_file.c_str(), source_file.size() - 5 );\r
-\r
- // TODO FIXME - not sure what this is doing? wine hack maybe?\r
- //if ( basename !~ /\..{1,3}$/; ) basename += string(".dll");\r
- string dbg_c_file = basename + ".dbg.c";\r
-\r
- fprintf ( OUT, "# Begin Source File\r\n" );\r
- fprintf ( OUT, "\r\n" );\r
- fprintf ( OUT, "SOURCE=%s\r\n", dbg_c_file.c_str() );\r
- fprintf ( OUT, "# End Source File\r\n" );\r
- }\r
-#endif\r
- fprintf ( OUT, "# Begin Source File\r\n" );\r
- fprintf ( OUT, "\r\n" );\r
-\r
- fprintf ( OUT, "SOURCE=%s\r\n", source_file.c_str() );\r
+ std::string& config = cfgs[iconfig];\r
\r
- if ( !strcmp ( &source_file[source_file.size()-5], ".spec" ) )\r
- {\r
-#if 0\r
- string basename = string ( source_file.c_str(), source_file.size() - 5 );\r
-\r
- string spec_file = source_file;\r
- string def_file = basename + ".def";\r
-\r
- // TODO FIXME - not sure what this is doing? wine hack maybe?\r
- //if ( basename !~ /\..{1,3}$/; ) basename += ".dll";\r
- string dbg_file = basename + ".dbg";\r
- string dbg_c_file = basename + ".dbg.c";\r
-\r
- string srcdir = "."; // FIXME: Is this really always correct?\r
-\r
- fprintf ( OUT, "# Begin Custom Build\r\n" );\r
- fprintf ( OUT, "InputPath=%s\r\n", spec_file.c_str() );\r
- fprintf ( OUT, "\r\n" );\r
- fprintf ( OUT, "BuildCmds= \\\r\n" );\r
- fprintf ( OUT, "\t..\\..\\tools\\winebuild\\%s\\winebuild.exe --def %s > %s \\\r\n",\r
- output_dir.c_str(),\r
- spec_file.c_str(),\r
- def_file.c_str() );\r
- \r
- if ( module.name == "ntdll" )\r
+ if (( isrcfile == 0 ) && ( module.pch != NULL ))\r
{\r
- int n = 0;\r
- for ( i = 0; i < c_srcs.size(); i++ )\r
+ /* little hack to speed up PCH */\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=\"VCCLCompilerTool\"\r\n" );\r
+ fprintf ( OUT, "\t\t\t\t\t\tUsePrecompiledHeader=\"1\"/>\r\n" );\r
+ fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" );\r
+ }\r
+\r
+ if (configuration.VSProjectVersion < "8.00") {\r
+ if ((source_file.find(".idl") != string::npos) || ((source_file.find(".asm") != string::npos || tolower(source_file.at(source_file.size() - 1)) == 's')))\r
{\r
- const string& c_src = c_srcs[i];\r
- if(n++ > 0)\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
+ if (source_file.find(".idl") != string::npos)\r
{\r
- fprintf ( OUT, "\techo %s >> %s \\\r\n", c_src.c_str(), dbg_file.c_str() );\r
+ fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" );\r
+ fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(OutDir)\\(InputName).obj\"/>\r\n" );\r
}\r
- else\r
- {\r
- fprintf ( OUT, "\techo %s > %s \\\r\n", c_src.c_str(), dbg_file.c_str() );\r
- }\r
- }\r
- fprintf ( OUT, "\t..\\..\\tools\\winebuild\\%s\\winebuild.exe",\r
- output_dir.c_str() );\r
- fprintf ( OUT, " -o %s --debug -C%s %s \\\r\n",\r
- dbg_c_file.c_str(),\r
- srcdir.c_str(),\r
- dbg_file.c_str() );\r
- }\r
- else\r
- {\r
- string sc_srcs;\r
- for ( i = 0; i < c_srcs.size(); i++ )\r
- {\r
- const string& c_src = c_srcs[i];\r
- if ( !strcmp ( &c_src[c_src.size()-2], ".c" ) )\r
+ else if ((source_file.find(".asm") != string::npos || tolower(source_file.at(source_file.size() - 1)) == 's'))\r
{\r
- if ( sc_srcs.size() )\r
- sc_srcs += " ";\r
- sc_srcs += c_src;\r
+ fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" );\r
+ fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"cl /E "$(InputPath)" %s /D__ASM__ | as -o "$(OutDir)\\(InputName).obj"\"\r\n",include_string.c_str() );\r
+ fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(OutDir)\\(InputName).obj\"/>\r\n" );\r
}\r
+ fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" );\r
}\r
-\r
- fprintf ( OUT, "\t..\\..\\tools\\winebuild\\%s\\winebuild.exe",\r
- output_dir.c_str() );\r
- fprintf ( OUT, " -o %s --debug -C%s %s \\\r\n",\r
- dbg_c_file.c_str(),\r
- srcdir.c_str(),\r
- sc_srcs.c_str() );\r
}\r
-\r
- fprintf ( OUT, "\t\r\n" );\r
- fprintf ( OUT, "\r\n" );\r
- fprintf ( OUT, "\"%s\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\r\n", def_file.c_str() );\r
- fprintf ( OUT, " $(BuildCmds)\r\n" );\r
- fprintf ( OUT, "\r\n" );\r
- fprintf ( OUT, "\"%s\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\r\n", dbg_c_file.c_str() );\r
- fprintf ( OUT, " $(BuildCmds)\r\n" );\r
- fprintf ( OUT, "# End Custom Build\r\n" );\r
-#endif\r
}\r
- /*else if ( source_file =~ /([^\\]*?\.h)$/ )\r
- {\r
- my $h_file = $1;\r
-\r
- foreach my $cfg (@cfgs) {\r
- if($#cfgs == 0) {\r
- # Nothing\r
- } elsif($n == 0) {\r
- fprintf ( OUT, "!IF \"$(CFG)\" == \"$cfg\"\r\n" );\r
- fprintf ( OUT, "\r\n" );\r
- } else {\r
- fprintf ( OUT, "\r\n" );\r
- fprintf ( OUT, "!ELSEIF \"$(CFG)\" == \"$cfg\"\r\n" );\r
- fprintf ( OUT, "\r\n" );\r
- }\r
-\r
- $output_dir = $cfg;\r
- $output_dir =~ s/^$project - //;\r
- $output_dir =~ s/ /_/g;\r
- $output_dir =~ s/C\+\+/Cxx/g;\r
- if($output_prefix_dir) {\r
- $output_dir = "$output_prefix_dir\\$output_dir" );\r
- }\r
-\r
- fprintf ( OUT, "# Begin Custom Build\r\n" );\r
- fprintf ( OUT, "OutDir=%s\r\n", output_dir.c_str() );\r
- fprintf ( OUT, "InputPath=%s\r\n", source_file.c_str() );\r
- fprintf ( OUT, "\r\n" );\r
- fprintf ( OUT, "\"$(OutDir)\\wine\\%s\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\r\n", h_file.c_str() );\r
- fprintf ( OUT, "\tcopy \"$(InputPath)\" \"$(OutDir)\\wine\"\r\n" );\r
- fprintf ( OUT, "\r\n" );\r
- fprintf ( OUT, "# End Custom Build\r\n" );\r
- }\r
-\r
- if ( cfgs.size() != 0)\r
- {\r
- fprintf ( OUT, "\r\n" );\r
- fprintf ( OUT, "!ENDIF \r\n" );\r
- fprintf ( OUT, "\r\n" );\r
- }\r
- }*/\r
-\r
- fprintf ( OUT, "# End Source File\r\n" );\r
+ fprintf ( OUT, "\t\t\t</File>\r\n" );\r
}\r
- fprintf ( OUT, "# End Group\r\n" );\r
- fprintf ( OUT, "# Begin Group \"Header Files\"\r\n" );\r
- fprintf ( OUT, "\r\n" );\r
- fprintf ( OUT, "# PROP Default_Filter \"h;hpp;hxx;hm;inl\"\r\n" );\r
+ fprintf ( OUT, "\t\t</Filter>\r\n" );\r
+\r
+ // Header files\r
+ fprintf ( OUT, "\t\t<Filter\r\n" );\r
+ fprintf ( OUT, "\t\t\tName=\"Header Files\"\r\n" );\r
+ fprintf ( OUT, "\t\t\tFilter=\"h;hpp;hxx;hm;inl\">\r\n" );\r
for ( i = 0; i < header_files.size(); i++ )\r
{\r
const string& header_file = header_files[i];\r
- fprintf ( OUT, "# Begin Source File\r\n" );\r
- fprintf ( OUT, "\r\n" );\r
- fprintf ( OUT, "SOURCE=.\\%s\r\n", header_file.c_str() );\r
- fprintf ( OUT, "# End Source File\r\n" );\r
+ fprintf ( OUT, "\t\t\t<File\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", header_file.c_str() );\r
+ fprintf ( OUT, "\t\t\t</File>\r\n" );\r
}\r
- fprintf ( OUT, "# End Group\r\n" );\r
+ fprintf ( OUT, "\t\t</Filter>\r\n" );\r
\r
-\r
-\r
- fprintf ( OUT, "# Begin Group \"Resource Files\"\r\n" );\r
- fprintf ( OUT, "\r\n" );\r
- fprintf ( OUT, "# PROP Default_Filter \"ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe\"\r\n" );\r
+ // Resource files\r
+ fprintf ( OUT, "\t\t<Filter\r\n" );\r
+ fprintf ( OUT, "\t\t\tName=\"Resource Files\"\r\n" );\r
+ fprintf ( OUT, "\t\t\tFilter=\"ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe\">\r\n" );\r
for ( i = 0; i < resource_files.size(); i++ )\r
{\r
const string& resource_file = resource_files[i];\r
- fprintf ( OUT, "# Begin Source File\r\n" );\r
- fprintf ( OUT, "\r\n" );\r
- fprintf ( OUT, "SOURCE=.\\%s\r\n", resource_file.c_str() );\r
- fprintf ( OUT, "# End Source File\r\n" );\r
+ fprintf ( OUT, "\t\t\t<File\r\n" );\r
+ fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", resource_file.c_str() );\r
+ fprintf ( OUT, "\t\t\t</File>\r\n" );\r
}\r
- fprintf ( OUT, "# End Group\r\n" );\r
-\r
- fprintf ( OUT, "# End Target\r\n" );\r
- fprintf ( OUT, "# End Project\r\n" );\r
+ fprintf ( OUT, "\t\t</Filter>\r\n" );\r
\r
+ fprintf ( OUT, "\t</Files>\r\n" );\r
+ fprintf ( OUT, "\t<Globals>\r\n" );\r
+ fprintf ( OUT, "\t</Globals>\r\n" );\r
+ fprintf ( OUT, "</VisualStudioProject>\r\n" );\r
fclose(OUT);\r
}\r
\r
-#if 0\r
+std::string\r
+MSVCBackend::_replace_str(std::string string1, const std::string &find_str, const std::string &replace_str)\r
+{\r
+ std::string::size_type pos = string1.find(find_str, 0);\r
+ int intLen = find_str.length();\r
+\r
+ while(std::string::npos != pos)\r
+ {\r
+ string1.replace(pos, intLen, replace_str);\r
+ pos = string1.find(find_str, intLen + pos);\r
+ }\r
+\r
+ return string1;\r
+} \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
+ if (configuration.VSProjectVersion == "7.00")\r
+ version = "7.00";\r
+\r
+ if (configuration.VSProjectVersion == "7.10")\r
+ version = "8.00";\r
+\r
+ if (configuration.VSProjectVersion == "8.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
+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
\r
void\r
-MSVCBackend::_generate_dsw_project (\r
+MSVCBackend::_generate_sln_project (\r
FILE* OUT,\r
const Module& module,\r
- std::string dsp_file,\r
+ std::string vcproj_file,\r
+ std::string sln_guid,\r
+ std::string vcproj_guid,\r
const std::vector<Dependency*>& dependencies )\r
{\r
- dsp_file = DosSeparator ( std::string(".\\") + dsp_file );\r
- \r
- // TODO FIXME - must they be sorted?\r
- //@dependencies = sort(@dependencies);\r
+ vcproj_file = DosSeparator ( std::string(".\\") + vcproj_file );\r
\r
- fprintf ( OUT, "###############################################################################\r\n" );\r
- fprintf ( OUT, "\r\n" );\r
- fprintf ( OUT, "Project: \"%s\"=%s - Package Owner=<4>\r\n", module.name.c_str(), dsp_file.c_str() );\r
- fprintf ( OUT, "\r\n" );\r
- fprintf ( OUT, "Package=<5>\r\n" );\r
- fprintf ( OUT, "{{{\r\n" );\r
- fprintf ( OUT, "}}}\r\n" );\r
- fprintf ( OUT, "\r\n" );\r
- fprintf ( OUT, "Package=<4>\r\n" );\r
- fprintf ( OUT, "{{{\r\n" );\r
- for ( size_t i = 0; i < dependencies.size(); i++ )\r
- {\r
- Dependency& dependency = *dependencies[i];\r
- fprintf ( OUT, " Begin Project Dependency\r\n" );\r
- fprintf ( OUT, " Project_Dep_Name %s\r\n", dependency.module.name.c_str() );\r
- fprintf ( OUT, " End Project Dependency\r\n" );\r
+ fprintf ( OUT, "Project(\"%s\") = \"%s\", \"%s\", \"%s\"\r\n", sln_guid.c_str() , module.name.c_str(), vcproj_file.c_str(), vcproj_guid.c_str() );\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") || (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
- fprintf ( OUT, "}}}\r\n" );\r
- fprintf ( OUT, "\r\n" );\r
+\r
+ fprintf ( OUT, "EndProject\r\n" );\r
}\r
\r
+\r
void\r
-MSVCBackend::_generate_dsw_footer ( FILE* OUT )\r
+MSVCBackend::_generate_sln_footer ( FILE* OUT )\r
{\r
- fprintf ( OUT, "###############################################################################\r\n" );\r
- fprintf ( OUT, "\r\n" );\r
- fprintf ( OUT, "Global:\r\n" );\r
- fprintf ( OUT, "\r\n" );\r
- fprintf ( OUT, "Package=<5>\r\n" );\r
- fprintf ( OUT, "{{{\r\n" );\r
- fprintf ( OUT, "}}}\r\n" );\r
- fprintf ( OUT, "\r\n" );\r
- fprintf ( OUT, "Package=<3>\r\n" );\r
- fprintf ( OUT, "{{{\r\n" );\r
- fprintf ( OUT, "}}}\r\n" );\r
- fprintf ( OUT, "\r\n" );\r
- fprintf ( OUT, "###############################################################################\r\n" );\r
+ fprintf ( OUT, "Global\r\n" );\r
+ fprintf ( OUT, "\tGlobalSection(SolutionConfiguration) = preSolution\r\n" );\r
+ fprintf ( OUT, "\t\tDebug = Debug\r\n" );\r
+ fprintf ( OUT, "\t\tRelease = Release\r\n" );\r
+ fprintf ( OUT, "\tEndGlobalSection\r\n" );\r
+ fprintf ( OUT, "\tGlobalSection(ProjectConfiguration) = postSolution\r\n" );\r
+ for ( size_t i = 0; i < ProjectNode.modules.size(); i++ )\r
+ {\r
+ Module& module = *ProjectNode.modules[i];\r
+ std::string guid = module.guid;\r
+ _generate_sln_configurations ( OUT, guid.c_str() );\r
+ } \r
+ fprintf ( OUT, "\tEndGlobalSection\r\n" );\r
+ fprintf ( OUT, "\tGlobalSection(ExtensibilityGlobals) = postSolution\r\n" );\r
+ fprintf ( OUT, "\tEndGlobalSection\r\n" );\r
+ fprintf ( OUT, "\tGlobalSection(ExtensibilityAddIns) = postSolution\r\n" );\r
+ fprintf ( OUT, "\tEndGlobalSection\r\n" );\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
+ if (configuration.VSProjectVersion == "8.00") {\r
+ fprintf ( OUT, "\tGlobalSection(SolutionProperties) = preSolution\r\n" );\r
+ fprintf ( OUT, "\t\tHideSolutionNode = FALSE\r\n" );\r
+ fprintf ( OUT, "\tEndGlobalSection\r\n" );\r
+ }\r
+\r
+ fprintf ( OUT, "EndGlobal\r\n" );\r
fprintf ( OUT, "\r\n" );\r
}\r
\r
-#endif\r
\r
void\r
-MSVCBackend::_generate_sln_header ( FILE* OUT )\r
+MSVCBackend::_generate_sln_configurations ( FILE* OUT, std::string vcproj_guid )\r
{\r
- fprintf ( OUT, "Microsoft Visual Studio Solution File, Format Version 9.00\r\n" );\r
- fprintf ( OUT, "# Visual C++ Express 2005\r\n" );\r
- fprintf ( OUT, "\r\n" );\r
+ fprintf ( OUT, "\t\t%s.Debug.ActiveCfg = Debug|Win32\r\n", vcproj_guid.c_str() );\r
+ fprintf ( OUT, "\t\t%s.Debug.Build.0 = Debug|Win32\r\n", vcproj_guid.c_str() );\r
+ fprintf ( OUT, "\t\t%s.Debug.Release.ActiveCfg = Release|Win32\r\n", vcproj_guid.c_str() );\r
+ fprintf ( OUT, "\t\t%s.Debug.Release.Build.0 = Release|Win32\r\n", vcproj_guid.c_str() );\r
}\r
\r
void\r
MSVCBackend::_generate_sln ( FILE* OUT )\r
{\r
+ string sln_guid = "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}";\r
+ vector<string> guids;\r
+\r
_generate_sln_header(OUT);\r
// TODO FIXME - is it necessary to sort them?\r
for ( size_t i = 0; i < ProjectNode.modules.size(); i++ )\r
{\r
Module& module = *ProjectNode.modules[i];\r
-\r
+ \r
std::string vcproj_file = VcprojFileName ( module );\r
- _generate_dsw_project ( OUT, module, vcproj_file, module.dependencies );\r
- }\r
-// _generate_dsw_footer ( OUT );\r
+ _generate_sln_project ( OUT, module, vcproj_file, sln_guid, module.guid, module.dependencies );\r
+ }\r
+ _generate_sln_footer ( OUT );\r
}\r
\r
-\r
-\r
-/*\r
- m_devFile << "Microsoft Visual Studio Solution File, Format Version 9.00" << endl;\r
- m_devFile << "# Visual C++ Express 2005" << endl;\r
-\r
- m_devFile << "# FIXME Project listings here" << endl;\r
- m_devFile << "EndProject" << endl;\r
- m_devFile << "Global" << endl;\r
- m_devFile << " GlobalSection(SolutionConfigurationPlatforms) = preSolution" << endl;\r
- m_devFile << " Debug|Win32 = Debug|Win32" << endl;\r
- m_devFile << " Release|Win32 = Release|Win32" << endl;\r
- m_devFile << " EndGlobalSection" << endl;\r
- m_devFile << " GlobalSection(ProjectConfigurationPlatforms) = postSolution" << endl;\r
- m_devFile << " #FIXME Project Listings Here" << endl;\r
- m_devFile << " EndGlobalSection" << endl;\r
- m_devFile << " GlobalSection(SolutionProperties) = preSolution" << endl;\r
- m_devFile << " HideSolutionNode = FALSE" << endl;\r
- m_devFile << " EndGlobalSection" << endl;\r
- m_devFile << "EndGlobal" << endl;\r
-\r
- m_devFile << endl << endl;\r
-*/\r
projects / reactos.git / blobdiff