+/*
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
#ifdef _MSC_VER
#pragma warning ( disable : 4786 )
#endif//_MSC_VER
using std::string;
using std::vector;
-#if 0
+#ifdef OUT
+#undef OUT
+#endif//OUT
+
void
-MSVCBackend::_generate_dsp ( FILE* OUT, const std::string& moduleName )
+MSVCBackend::_generate_dsp ( const Module& module )
{
size_t i;
+ // TODO FIXME wine hack?
+ const bool wine = false;
- Module& module = *ProjectNode.LocateModule ( moduleName );
+ string dsp_file = DspFileName(module);
+ printf ( "Creating MSVC project: '%s'\n", dsp_file.c_str() );
+ FILE* OUT = fopen ( dsp_file.c_str(), "wb" );
- std::string dsp_file = DspFileName(module);
- my @imports = @{module->{imports}};
+ vector<string> imports;
+ for ( i = 0; i < module.non_if_data.libraries.size(); i++ )
+ {
+ imports.push_back ( module.non_if_data.libraries[i]->name );
+ }
- bool lib = (module->{type} eq "lib");
- my $dll = (module->{type} eq "dll");
- my $exe = (module->{type} eq "exe");
+ string module_type = GetExtension(module.GetTargetName());
+ bool lib = (module_type == ".lib") || (module_type == ".a");
+ bool dll = (module_type == ".dll") || (module_type == ".cpl");
+ bool exe = (module_type == ".exe");
+ // TODO FIXME - need more checks here for 'sys' and possibly 'drv'?
- my $console = $exe; # FIXME: Not always correct
+ bool console = exe && (module.type == Win32CUI);
// TODO FIXME - not sure if the count here is right...
- int parts = 1;
- const char* p = strchr ( dsp_file.c_str(), '/' );
+ int parts = 0;
+ const char* p = strpbrk ( dsp_file.c_str(), "/\\" );
while ( p )
{
++parts;
- p = strchr ( p+1, '/' );
+ p = strpbrk ( p+1, "/\\" );
}
- std::string msvc_wine_dir = "..";
- while ( parts-- )
+ string msvc_wine_dir = "..";
+ while ( --parts )
msvc_wine_dir += "\\..";
- std::string wine_include_dir = msvc_wine_dir + "\\include";
+ string wine_include_dir = msvc_wine_dir + "\\include";
//$progress_current++;
//$output->progress("$dsp_file (file $progress_current of $progress_max)");
- my @c_srcs = @{module->{c_srcs}};
- my @source_files = @{module->{source_files}};
+ // TODO FIXME - what's diff. betw. 'c_srcs' and 'source_files'?
+ string dsp_path = module.GetBasePath();
+ vector<string> c_srcs, source_files, resource_files, includes, libraries, 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
+ defines.push_back ( "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()];
+
+ source_files.push_back ( file );
+ if ( !stricmp ( Right(file,2).c_str(), ".c" ) )
+ c_srcs.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++ )
+ {
+
+ // explicitly omit win32api directories
+ if ( !strncmp(incs[i]->directory.c_str(), "w32api", 6 ) )
+ continue;
+
+ // explicitly omit include/wine directories
+ if ( !strncmp(incs[i]->directory.c_str(), "include\\wine", 12 ) )
+ continue;
+
+ string path = Path::RelativeFromDirectory (
+ incs[i]->directory,
+ module.GetBasePath() );
+ 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] )
+ defines.push_back ( defs[i]->name + "=" + defs[i]->value );
+ else
+ defines.push_back ( 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;
- my @resource_files = @{module->{resource_files}};
- if (module.name !~ /^wine(?:_unicode|build|runtests|test)?$/ &&
+ // TODO FIXME - wine hack?
+ /*if (module.name !~ /^wine(?:_unicode|build|runtests|test)?$/ &&
module.name !~ /^(?:gdi32)_.+?$/ &&
- module.name !~ /_test$/)
+ Right ( module.name, 5 ) == "_test" )
{
- push @source_files, "$project.spec" );
+ source_files.push_back ( module.name + ".spec" );
@source_files = sort(@source_files);
- }
+ }*/
bool no_cpp = true;
bool no_msvc_headers = true;
- if (module.name =~ /^wine(?:runtests|test)$/
- || module.name =~ /_test$/)
+ // TODO FIXME - wine hack?
+ /*if (module.name =~ /^wine(?:runtests|test)$/
+ || Right ( module.name, 5 ) == "_test" )
{
no_msvc_headers = false;
- }
+ }*/
std::vector<std::string> cfgs;
cfgs = _cfgs;
}
- if (!no_release)
+ // TODO FIXME - wine hack?
+ /*if (!no_release)
{
std::vector<std::string> _cfgs;
for ( i = 0; i < cfgs.size(); i++ )
}
cfgs.resize(0);
cfgs = _cfgs;
- }
+ }*/
if (!no_msvc_headers)
{
string default_cfg = cfgs.back();
- fprintf ( OUT, "# Microsoft Developer Studio Project File - Name=\"%s\" - Package Owner=<4>\n", module.name.c_str() );
- fprintf ( OUT, "# Microsoft Developer Studio Generated Build File, Format Version 6.00\n" );
- fprintf ( OUT, "# ** DO NOT EDIT **\n" );
- fprintf ( OUT, "\n" );
+ fprintf ( OUT, "# Microsoft Developer Studio Project File - Name=\"%s\" - Package Owner=<4>\r\n", module.name.c_str() );
+ fprintf ( OUT, "# Microsoft Developer Studio Generated Build File, Format Version 6.00\r\n" );
+ fprintf ( OUT, "# ** DO NOT EDIT **\r\n" );
+ fprintf ( OUT, "\r\n" );
if ( lib )
{
- fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Static Library\" 0x0104\n" );
+ fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Static Library\" 0x0104\r\n" );
}
else if ( dll )
{
- fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Dynamic-Link Library\" 0x0102\n" );
+ fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Dynamic-Link Library\" 0x0102\r\n" );
}
else
{
- fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Console Application\" 0x0103\n" );
+ fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Console Application\" 0x0103\r\n" );
}
- fprintf ( OUT, "\n" );
-
- fprintf ( OUT, "CFG=$default_cfg\n" );
- fprintf ( OUT, "!MESSAGE This is not a valid makefile. To build this project using NMAKE,\n" );
- fprintf ( OUT, "!MESSAGE use the Export Makefile command and run\n" );
- fprintf ( OUT, "!MESSAGE \n" );
- fprintf ( OUT, "!MESSAGE NMAKE /f \"%s.mak\".\n", module.name.c_str() );
- fprintf ( OUT, "!MESSAGE \n" );
- fprintf ( OUT, "!MESSAGE You can specify a configuration when running NMAKE\n" );
- fprintf ( OUT, "!MESSAGE by defining the macro CFG on the command line. For example:\n" );
- fprintf ( OUT, "!MESSAGE \n" );
- fprintf ( OUT, "!MESSAGE NMAKE /f \"%s.mak\" CFG=\"%s\"\n", module.name.c_str(), default_cfg.c_str() );
- fprintf ( OUT, "!MESSAGE \n" );
- fprintf ( OUT, "!MESSAGE Possible choices for configuration are:\n" );
- fprintf ( OUT, "!MESSAGE \n" );
+ fprintf ( OUT, "\r\n" );
+
+ fprintf ( OUT, "CFG=%s\r\n", default_cfg.c_str() );
+ fprintf ( OUT, "!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r\n" );
+ fprintf ( OUT, "!MESSAGE use the Export Makefile command and run\r\n" );
+ fprintf ( OUT, "!MESSAGE \r\n" );
+ fprintf ( OUT, "!MESSAGE NMAKE /f \"%s.mak\".\r\n", module.name.c_str() );
+ fprintf ( OUT, "!MESSAGE \r\n" );
+ fprintf ( OUT, "!MESSAGE You can specify a configuration when running NMAKE\r\n" );
+ fprintf ( OUT, "!MESSAGE by defining the macro CFG on the command line. For example:\r\n" );
+ fprintf ( OUT, "!MESSAGE \r\n" );
+ fprintf ( OUT, "!MESSAGE NMAKE /f \"%s.mak\" CFG=\"%s\"\r\n", module.name.c_str(), default_cfg.c_str() );
+ fprintf ( OUT, "!MESSAGE \r\n" );
+ fprintf ( OUT, "!MESSAGE Possible choices for configuration are:\r\n" );
+ fprintf ( OUT, "!MESSAGE \r\n" );
for ( i = 0; i < cfgs.size(); i++ )
{
- string& cfg = cfgs[i];
+ const string& cfg = cfgs[i];
if ( lib )
{
- fprintf ( OUT, "!MESSAGE \"%s\" (based on \"Win32 (x86) Static Library\")\n", cfg.c_str() );
+ fprintf ( OUT, "!MESSAGE \"%s\" (based on \"Win32 (x86) Static Library\")\r\n", cfg.c_str() );
}
else if ( dll )
{
- fprintf ( OUT, "!MESSAGE \"%s\" (based on \"Win32 (x86) Dynamic-Link Library\")\n", cfg.c_str() );
+ fprintf ( OUT, "!MESSAGE \"%s\" (based on \"Win32 (x86) Dynamic-Link Library\")\r\n", cfg.c_str() );
}
else
{
- fprintf ( OUT, "!MESSAGE \"%s\" (based on \"Win32 (x86) Console Application\")\n", cfg.c_str() );
+ fprintf ( OUT, "!MESSAGE \"%s\" (based on \"Win32 (x86) Console Application\")\r\n", cfg.c_str() );
}
}
- fprintf ( OUT, "!MESSAGE \n" );
- fprintf ( OUT, "\n" );
+ fprintf ( OUT, "!MESSAGE \r\n" );
+ fprintf ( OUT, "\r\n" );
- fprintf ( OUT, "# Begin Project\n" );
- fprintf ( OUT, "# PROP AllowPerConfigDependencies 0\n" );
- fprintf ( OUT, "# PROP Scc_ProjName \"\"\n" );
- fprintf ( OUT, "# PROP Scc_LocalPath \"\"\n" );
- fprintf ( OUT, "CPP=cl.exe\n" );
- if ( !lib && !exe ) fprintf ( OUT, "MTL=midl.exe\n" );
- fprintf ( OUT, "RSC=rc.exe\n" );
+ fprintf ( OUT, "# Begin Project\r\n" );
+ fprintf ( OUT, "# PROP AllowPerConfigDependencies 0\r\n" );
+ fprintf ( OUT, "# PROP Scc_ProjName \"\"\r\n" );
+ fprintf ( OUT, "# PROP Scc_LocalPath \"\"\r\n" );
+ fprintf ( OUT, "CPP=cl.exe\r\n" );
+ if ( !lib && !exe ) fprintf ( OUT, "MTL=midl.exe\r\n" );
+ fprintf ( OUT, "RSC=rc.exe\r\n" );
int n = 0;
{
if ( n == 0 )
{
- fprintf ( OUT, "!IF \"\$(CFG)\" == \"%s\"\n", cfg.c_str() );
- fprintf ( OUT, "\n" );
+ fprintf ( OUT, "!IF \"$(CFG)\" == \"%s\"\r\n", cfg.c_str() );
+ fprintf ( OUT, "\r\n" );
}
else
{
- fprintf ( OUT, "\n" );
- fprintf ( OUT, "!ELSEIF \"\$(CFG)\" == \"%s\"\n", cfg.c_str() );
- fprintf ( OUT, "\n" );
+ 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" );
bool msvc_headers = ( 0 != strstr ( cfg.c_str(), "MSVC Headers" ) );
- fprintf ( OUT, "# PROP BASE Use_MFC 0\n" );
+ fprintf ( OUT, "# PROP BASE Use_MFC 0\r\n" );
if ( debug )
{
- fprintf ( OUT, "# PROP BASE Use_Debug_Libraries 1\n" );
+ fprintf ( OUT, "# PROP BASE Use_Debug_Libraries 1\r\n" );
}
else
{
- fprintf ( OUT, "# PROP BASE Use_Debug_Libraries 0\n" );
+ fprintf ( OUT, "# PROP BASE Use_Debug_Libraries 0\r\n" );
}
output_dir = Replace(cfg,module.name + " - ","");
output_dir = Replace(output_dir," ","_");
output_dir = Replace(output_dir,"C++","Cxx");
- if ( output_prefix_dir.size() )
- output_dir = output_prefix_dir + "\\" + output_dir;
+ // TODO FIXME - wine hack?
+ //if ( output_prefix_dir.size() )
+ // output_dir = output_prefix_dir + "\\" + output_dir;
- fprintf ( OUT, "# PROP BASE Output_Dir \"%s\"\n", output_dir.c_str() );
- fprintf ( OUT, "# PROP BASE Intermediate_Dir \"%s\"\n", output_dir.c_str() );
+ fprintf ( OUT, "# PROP BASE Output_Dir \"%s\"\r\n", output_dir.c_str() );
+ fprintf ( OUT, "# PROP BASE Intermediate_Dir \"%s\"\r\n", output_dir.c_str() );
- fprintf ( OUT, "# PROP BASE Target_Dir \"\"\n" );
+ fprintf ( OUT, "# PROP BASE Target_Dir \"\"\r\n" );
- fprintf ( OUT, "# PROP Use_MFC 0\n" );
+ fprintf ( OUT, "# PROP Use_MFC 0\r\n" );
if ( debug )
{
- fprintf ( OUT, "# PROP Use_Debug_Libraries 1\n" );
+ fprintf ( OUT, "# PROP Use_Debug_Libraries 1\r\n" );
}
else
{
- fprintf ( OUT, "# PROP Use_Debug_Libraries 0\n" );
+ fprintf ( OUT, "# PROP Use_Debug_Libraries 0\r\n" );
}
- fprintf ( OUT, "# PROP Output_Dir \"%s\"\n", output_dir.c_str() );
- fprintf ( OUT, "# PROP Intermediate_Dir \"%s\"\n", output_dir.c_str() );
-
- fprintf ( OUT, "# PROP Ignore_Export_Lib 0\n" if $dll;
- fprintf ( OUT, "# PROP Target_Dir \"\"\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" );
+ fprintf ( OUT, "# PROP Output_Dir \"%s\"\r\n", output_dir.c_str() );
+ fprintf ( OUT, "# PROP Intermediate_Dir \"%s\"\r\n", output_dir.c_str() );
+
+ if ( dll ) fprintf ( OUT, "# PROP Ignore_Export_Lib 0\r\n" );
+ fprintf ( OUT, "# PROP Target_Dir \"\"\r\n" );
+
if ( debug )
{
defines.push_back ( "_DEBUG" );
fprintf ( OUT, "# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od" );
defines.push_back ( "_WINDOWS" );
defines.push_back ( "_USRDLL" );
- defines.push_back ( string("\U") + module.name + "\E_EXPORTS" );
+ // TODO FIXME - wine hack?
+ //defines.push_back ( string("\U") + module.name + "\E_EXPORTS" );
}
}
else
fprintf ( OUT, "# ADD BASE CPP /nologo /MT /W3 /GX /O2" );
defines.push_back ( "_WINDOWS" );
defines.push_back ( "_USRDLL" );
- defines.push_back ( string("\U") + module.name + "\E_EXPORTS" );
+ // TODO FIXME - wine hack?
+ //defines.push_back ( string("\U") + module.name + "\E_EXPORTS" );
}
}
if ( lib || exe ) fprintf ( OUT, " " );
}
fprintf ( OUT, " /c" );
- fprintf ( OUT, "\n" );
+ 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)
+ vector<string> defines2 = defines;
+ if ( debug )
{
defines2.push_back ( "_DEBUG" );
if(lib)
}
}
- std::vector<std::string> includes;
+ // TODO FIXME - wine hack?
if ( wine )
{
- defines2.push_back ( string("_\U") + module.name + "\E_" );
- if ( module.name !~ /^(?:wine(?:build|test)|.*?_test)$/ )
- defines2.push_back ( "__WINESRC__" );
+ // TODO FIXME - wine hack?
+ //defines2.push_back ( string("_\U") + module.name + "\E_" );
+ // TODO FIXME - wine hack?
+ /*if ( module.name !~ /^(?:wine(?:build|test)|.*?_test)$/ )
+ defines2.push_back ( "__WINESRC__" );*/
if ( msvc_headers )
defines2.push_back ( "__WINE_USE_NATIVE_HEADERS" );
string output_dir2 = Replace(output_dir,"\\","\\\\");
defines2.push_back ( "_X86_" );
// TODO FIXME - wine hacks?
- /*if($project =~ /^gdi32_(?:enhmfdrv|mfdrv)$/) {
+ /*if(module.name =~ /^gdi32_(?:enhmfdrv|mfdrv)$/) {
push @includes, ".." );
}
- if ($project =~ /_test$/) {
- push @includes, "$msvc_wine_dir\\$output_dir" );
+ if ( strstr ( module.name.c_str(), "_test" )
+ {
+ include.push_back ( msvc_wine_dir + "\\" + output_dir );
}
- if (!$msvc_headers || $project eq "winetest") {
- push @includes, $wine_include_dir;
+ if (!msvc_headers || module.name == "winetest")
+ {
+ includes.push_back ( wine_include_dir );
}*/
}
- if ( wine )
+ //if ( wine )
{
- for ( i = 0; i < includes.size(); i++ );
+ for ( i = 0; i < includes.size(); i++ )
{
- string& include = includes[i];
- if ( strpbrk ( include.c_str(), "[\\\"]" ) )
+ const string& include = includes[i];
+ if ( strpbrk ( include.c_str(), "[\\\"]" ) || !strncmp ( include.c_str(), "../", 3 ) )
{
fprintf ( OUT, " /I \"%s\"", include.c_str() );
}
}
}
+ fprintf ( OUT, " /I \".\"" );
for ( i = 0; i < defines2.size(); i++ )
{
- string& define = defines2[i];
+ const string& define = defines2[i];
if ( strpbrk ( define.c_str(), "[\\\"]" ) )
{
fprintf ( OUT, " /D \"%s\"", define.c_str() );
}
}
if ( wine ) fprintf ( OUT, " /D inline=__inline" );
- //fprintf ( OUT, " /D \"__STDC__\"" if 0 && $wine;
+ if ( 0 && wine ) fprintf ( OUT, " /D \"__STDC__\"" );
fprintf ( OUT, lib ? " /YX" : " /FR" );
fprintf ( OUT, " /FD" );
if ( debug && lib ) fprintf ( OUT, " " );
fprintf ( OUT, " /c" );
if ( !no_cpp ) fprintf ( OUT, " /TP" );
- fprintf ( OUT, "\n" );
+ fprintf ( OUT, "\r\n" );
if ( debug )
{
- fprintf ( OUT, "# SUBTRACT CPP /X /YX\n" if $dll;
- fprintf ( OUT, "# ADD BASE MTL /nologo /D \"_DEBUG\" /mktyplib203 /win32\n" if $dll;
- fprintf ( OUT, "# ADD MTL /nologo /D \"_DEBUG\" /mktyplib203 /win32\n" if $dll;
- fprintf ( OUT, "# ADD BASE RSC /l 0x41d /d \"_DEBUG\"\n" );
+ if ( dll )
+ {
+ fprintf ( OUT, "# SUBTRACT CPP /X /YX\r\n" );
+ fprintf ( OUT, "# ADD BASE MTL /nologo /D \"_DEBUG\" /mktyplib203 /win32\r\n" );
+ fprintf ( OUT, "# ADD MTL /nologo /D \"_DEBUG\" /mktyplib203 /win32\r\n" );
+ }
+ 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() );
}
}
- fprintf ( OUT, " /d \"_DEBUG\"\n" );
+
+ for ( i = 0; i < defines.size(); i++ )
+ {
+ fprintf ( OUT, " /D \"%s\"", defines[i].c_str() );
+ }
+ fprintf ( OUT, " /d \"_DEBUG\"\r\n" );
}
else
{
if ( dll )
{
- fprintf ( OUT, "# SUBTRACT CPP /YX\n" );
- fprintf ( OUT, "# ADD BASE MTL /nologo /D \"NDEBUG\" /mktyplib203 /win32\n" );
- fprintf ( OUT, "# ADD MTL /nologo /D \"NDEBUG\" /mktyplib203 /win32\n" );
+ fprintf ( OUT, "# SUBTRACT CPP /YX\r\n" );
+ fprintf ( OUT, "# ADD BASE MTL /nologo /D \"NDEBUG\" /mktyplib203 /win32\r\n" );
+ fprintf ( OUT, "# ADD MTL /nologo /D \"NDEBUG\" /mktyplib203 /win32\r\n" );
}
- fprintf ( OUT, "# ADD BASE RSC /l 0x41d /d \"NDEBUG\"\n" );
+ fprintf ( OUT, "# ADD BASE RSC /l 0x41d /d \"NDEBUG\"\r\n" );
fprintf ( OUT, "# ADD RSC /l 0x41d" );
if ( wine )
{
for ( i = 0; i < includes.size(); i++ )
fprintf ( OUT, " /i \"%s\"", includes[i].c_str() );
- }
}
- fprintf ( OUT, "/d \"NDEBUG\"\n" );
+
+ for ( i = 0; i < defines.size(); i++ )
+ {
+ fprintf ( OUT, " /D \"%s\"", defines[i].c_str() );
+ }
+
+
+ fprintf ( OUT, "/d \"NDEBUG\"\r\n" );
}
- fprintf ( OUT, "BSC32=bscmake.exe\n" );
- fprintf ( OUT, "# ADD BASE BSC32 /nologo\n" );
- fprintf ( OUT, "# ADD BSC32 /nologo\n" );
+ fprintf ( OUT, "BSC32=bscmake.exe\r\n" );
+ fprintf ( OUT, "# ADD BASE BSC32 /nologo\r\n" );
+ fprintf ( OUT, "# ADD BSC32 /nologo\r\n" );
if ( exe || dll )
{
- fprintf ( OUT, "LINK32=link.exe\n" );
+ fprintf ( OUT, "LINK32=link.exe\r\n" );
fprintf ( OUT, "# ADD BASE LINK32 " );
- my @libraries = qw(kernel32.lib user32.lib gdi32.lib winspool.lib
- comdlg32.lib advapi32.lib shell32.lib ole32.lib
- oleaut32.lib uuid.lib odbc32.lib odbccp32.lib);
+
for ( i = 0; i < libraries.size(); i++ )
{
fprintf ( OUT, "%s ", libraries[i].c_str() );
if ( debug ) fprintf ( OUT, " /debug" );
fprintf ( OUT, " /machine:I386" );
if ( debug ) fprintf ( OUT, " /pdbtype:sept" );
- fprintf ( OUT, "\n" );
+ fprintf ( OUT, "\r\n" );
fprintf ( OUT, "# ADD LINK32" );
fprintf ( OUT, " /nologo" );
// TODO FIXME - do we need their kludge?
- //fprintf ( OUT, " libcmt.lib" if $project =~ /^ntdll$/; # FIXME: Kludge
+ //if ( module.name == "ntdll" ) fprintf ( OUT, " libcmt.lib" ); // FIXME: Kludge
for ( i = 0; i < imports.size(); i++ )
{
const string& import = imports[i];
if ( debug ) fprintf ( OUT, " /debug" );
fprintf ( OUT, " /machine:I386" );
// TODO FIXME - do we need their kludge?
- //fprintf ( OUT, " /nodefaultlib" if $project =~ /^ntdll$/; # FIXME: Kludge
- if ( dll ) fprintf ( OUT, " /def:\"%s.def\"", module.name.c_str() )
+ //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, "\n" );
+ fprintf ( OUT, "\r\n" );
}
else
{
- fprintf ( OUT, "LIB32=link.exe -lib\n" );
- fprintf ( OUT, "# ADD BASE LIB32 /nologo\n" );
- fprintf ( OUT, "# ADD LIB32 /nologo\n" );
+ fprintf ( OUT, "LIB32=link.exe -lib\r\n" );
+ fprintf ( OUT, "# ADD BASE LIB32 /nologo\r\n" );
+ fprintf ( OUT, "# ADD LIB32 /nologo\r\n" );
}
n++;
if ( cfgs.size() != 0 )
{
- fprintf ( OUT, "\n" );
- fprintf ( OUT, "!ENDIF \n" );
- fprintf ( OUT, "\n" );
+ fprintf ( OUT, "\r\n" );
+ fprintf ( OUT, "!ENDIF \r\n" );
+ fprintf ( OUT, "\r\n" );
}
-
+#if 0
if ( module.name == "winebuild" )
{
- fprintf ( OUT, "# Begin Special Build Tool\n" );
- fprintf ( OUT, "SOURCE=\"\$(InputPath)\"\n" );
- fprintf ( OUT, "PostBuild_Desc=Copying wine.dll and wine_unicode.dll ...\n" );
+ fprintf ( OUT, "# Begin Special Build Tool\r\n" );
+ fprintf ( OUT, "SOURCE=\"$(InputPath)\"\r\n" );
+ fprintf ( OUT, "PostBuild_Desc=Copying wine.dll and wine_unicode.dll ...\r\n" );
fprintf ( OUT, "PostBuild_Cmds=" );
- fprintf ( OUT, "copy ..\\..\\library\\$output_dir\\wine.dll \$(OutDir)\t" );
- fprintf ( OUT, "copy ..\\..\\unicode\\$output_dir\\wine_unicode.dll \$(OutDir)\n" );
- fprintf ( OUT, "# End Special Build Tool\n" );
+ fprintf ( OUT, "copy ..\\..\\library\\%s\\wine.dll $(OutDir)\t",
+ output_dir.c_str() );
+ fprintf ( OUT, "copy ..\\..\\unicode\\%s\\wine_unicode.dll $(OutDir)\r\n",
+ output_dir.c_str() );
+ fprintf ( OUT, "# End Special Build Tool\r\n" );
}
- fprintf ( OUT, "# Begin Target\n" );
- fprintf ( OUT, "\n" );
+#endif
+ fprintf ( OUT, "# Begin Target\r\n" );
+ fprintf ( OUT, "\r\n" );
for ( i = 0; i < cfgs.size(); i++ )
{
- fprintf ( OUT, "# Name \"%s\"\n", cfgs[i].c_str() );
+ fprintf ( OUT, "# Name \"%s\"\r\n", cfgs[i].c_str() );
}
- fprintf ( OUT, "# Begin Group \"Source Files\"\n" );
- fprintf ( OUT, "\n" );
- fprintf ( OUT, "# PROP Default_Filter \"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat\"\n" );
+ fprintf ( OUT, "# Begin Group \"Source Files\"\r\n" );
+ fprintf ( OUT, "\r\n" );
+ fprintf ( OUT, "# PROP Default_Filter \"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat\"\r\n" );
- for ( i = 0; i < source_files.size(); i++ )
+ for ( size_t isrcfile = 0; isrcfile < source_files.size(); isrcfile++ )
{
- string source_file = DosSeparators(source_files[i]);
+ string source_file = DosSeparator(source_files[isrcfile]);
if ( strncmp ( source_file.c_str(), ".\\", 2 ) )
{
- source_file = string(".\\") + source_file );
+ source_file = string(".\\") + source_file;
}
-
+#if 0
if ( !strcmp ( &source_file[source_file.size()-5], ".spec" ) )
{
- string basename = string ( source_file, source_file.size() - 5 );
+ string basename = string ( source_file.c_str(), source_file.size() - 5 );
- if ( $basename !~ /\..{1,3}$/; ) basename += string(".dll");
+ // TODO FIXME - not sure what this is doing? wine hack maybe?
+ //if ( basename !~ /\..{1,3}$/; ) basename += string(".dll");
string dbg_c_file = basename + ".dbg.c";
- fprintf ( OUT, "# Begin Source File\n" );
- fprintf ( OUT, "\n" );
- fprintf ( OUT, "SOURCE=%s\n", dbg_c_file.c_str() );
- fprintf ( OUT, "# End Source File\n" );
+ fprintf ( OUT, "# Begin Source File\r\n" );
+ fprintf ( OUT, "\r\n" );
+ 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" );
- fprintf ( OUT, "# Begin Source File\n" );
- fprintf ( OUT, "\n" );
-
- fprintf ( OUT, "SOURCE=%s\n", source_file.c_str() );
+ fprintf ( OUT, "SOURCE=%s\r\n", source_file.c_str() );
if ( !strcmp ( &source_file[source_file.size()-5], ".spec" ) )
{
- string basename = string ( source_file, source_file.size() - 5 );
+#if 0
+ string basename = string ( source_file.c_str(), source_file.size() - 5 );
string spec_file = source_file;
string def_file = basename + ".def";
- if ( $basename !~ /\..{1,3}$/; ) basename += ".dll";
+ // TODO FIXME - not sure what this is doing? wine hack maybe?
+ //if ( basename !~ /\..{1,3}$/; ) basename += ".dll";
string dbg_file = basename + ".dbg";
string dbg_c_file = basename + ".dbg.c";
string srcdir = "."; // FIXME: Is this really always correct?
- fprintf ( OUT, "# Begin Custom Build\n" );
- fprintf ( OUT, "InputPath=%s\n", spec_file.c_str() );
- fprintf ( OUT, "\n" );
- fprintf ( OUT, "BuildCmds= \\\n" );
- fprintf ( OUT, "\t..\\..\\tools\\winebuild\\%s\\winebuild.exe --def %s > %s \\\n",
+ fprintf ( OUT, "# Begin Custom Build\r\n" );
+ fprintf ( OUT, "InputPath=%s\r\n", spec_file.c_str() );
+ fprintf ( OUT, "\r\n" );
+ fprintf ( OUT, "BuildCmds= \\\r\n" );
+ fprintf ( OUT, "\t..\\..\\tools\\winebuild\\%s\\winebuild.exe --def %s > %s \\\r\n",
output_dir.c_str(),
spec_file.c_str(),
def_file.c_str() );
- if ( module.name =~ /^ntdll$/ )
+ if ( module.name == "ntdll" )
{
int n = 0;
for ( i = 0; i < c_srcs.size(); i++ )
const string& c_src = c_srcs[i];
if(n++ > 0)
{
- fprintf ( OUT, "\techo %s >> %s \\\n", c_src.c_str(), dbg_file.c_str() );
+ fprintf ( OUT, "\techo %s >> %s \\\r\n", c_src.c_str(), dbg_file.c_str() );
}
else
{
- fprintf ( OUT, "\techo %s > %s \\\n", c_src.c_str(), dbg_file.c_str() );
+ fprintf ( OUT, "\techo %s > %s \\\r\n", c_src.c_str(), dbg_file.c_str() );
}
}
fprintf ( OUT, "\t..\\..\\tools\\winebuild\\%s\\winebuild.exe",
output_dir.c_str() );
- fprintf ( OUT, " -o %s --debug -C%s %s \\\n",
+ fprintf ( OUT, " -o %s --debug -C%s %s \\\r\n",
dbg_c_file.c_str(),
srcdir.c_str(),
dbg_file.c_str() );
fprintf ( OUT, "\t..\\..\\tools\\winebuild\\%s\\winebuild.exe",
output_dir.c_str() );
- fprintf ( OUT, " -o %s --debug -C%s %s \\\n",
+ fprintf ( OUT, " -o %s --debug -C%s %s \\\r\n",
dbg_c_file.c_str(),
srcdir.c_str(),
sc_srcs.c_str() );
}
- fprintf ( OUT, "\t\n" );
- fprintf ( OUT, "\n" );
- fprintf ( OUT, "\"%s\" : \$(SOURCE) \"\$(INTDIR)\" \"\$(OUTDIR)\"\n", def_file.c_str() );
- fprintf ( OUT, " \$(BuildCmds)\n" );
- fprintf ( OUT, "\n" );
- fprintf ( OUT, "\"%s\" : \$(SOURCE) \"\$(INTDIR)\" \"\$(OUTDIR)\"\n", dbg_c_file.c_str() );
- fprintf ( OUT, " \$(BuildCmds)\n" );
- fprintf ( OUT, "# End Custom Build\n" );
+ fprintf ( OUT, "\t\r\n" );
+ fprintf ( OUT, "\r\n" );
+ fprintf ( OUT, "\"%s\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\r\n", def_file.c_str() );
+ fprintf ( OUT, " $(BuildCmds)\r\n" );
+ fprintf ( OUT, "\r\n" );
+ 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)$/ )
{
if($#cfgs == 0) {
# Nothing
} elsif($n == 0) {
- fprintf ( OUT, "!IF \"\$(CFG)\" == \"$cfg\"\n" );
- fprintf ( OUT, "\n" );
+ fprintf ( OUT, "!IF \"$(CFG)\" == \"$cfg\"\r\n" );
+ fprintf ( OUT, "\r\n" );
} else {
- fprintf ( OUT, "\n" );
- fprintf ( OUT, "!ELSEIF \"\$(CFG)\" == \"$cfg\"\n" );
- fprintf ( OUT, "\n" );
+ fprintf ( OUT, "\r\n" );
+ fprintf ( OUT, "!ELSEIF \"$(CFG)\" == \"$cfg\"\r\n" );
+ fprintf ( OUT, "\r\n" );
}
$output_dir = $cfg;
$output_dir = "$output_prefix_dir\\$output_dir" );
}
- fprintf ( OUT, "# Begin Custom Build\n" );
- fprintf ( OUT, "OutDir=%s\n", output_dir.c_str() );
- fprintf ( OUT, "InputPath=%s\n", source_file.c_str() );
- fprintf ( OUT, "\n" );
- fprintf ( OUT, "\"\$(OutDir)\\wine\\%s\" : \$(SOURCE) \"\$(INTDIR)\" \"\$(OUTDIR)\"\n", h_file.c_str() );
- fprintf ( OUT, "\tcopy \"\$(InputPath)\" \"\$(OutDir)\\wine\"\n" );
- fprintf ( OUT, "\n" );
- fprintf ( OUT, "# End Custom Build\n" );
+ fprintf ( OUT, "# Begin Custom Build\r\n" );
+ fprintf ( OUT, "OutDir=%s\r\n", output_dir.c_str() );
+ fprintf ( OUT, "InputPath=%s\r\n", source_file.c_str() );
+ fprintf ( OUT, "\r\n" );
+ fprintf ( OUT, "\"$(OutDir)\\wine\\%s\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\r\n", h_file.c_str() );
+ fprintf ( OUT, "\tcopy \"$(InputPath)\" \"$(OutDir)\\wine\"\r\n" );
+ fprintf ( OUT, "\r\n" );
+ fprintf ( OUT, "# End Custom Build\r\n" );
}
if ( cfgs.size() != 0)
{
- fprintf ( OUT, "\n" );
- fprintf ( OUT, "!ENDIF \n" );
- fprintf ( OUT, "\n" );
+ fprintf ( OUT, "\r\n" );
+ fprintf ( OUT, "!ENDIF \r\n" );
+ fprintf ( OUT, "\r\n" );
}
}*/
- fprintf ( OUT, "# End Source File\n" );
+ fprintf ( OUT, "# End Source File\r\n" );
}
- fprintf ( OUT, "# End Group\n" );
-
- fprintf ( OUT, "# Begin Group \"Header Files\"\n" );
- fprintf ( OUT, "\n" );
- fprintf ( OUT, "# PROP Default_Filter \"h;hpp;hxx;hm;inl\"\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" );
for ( i = 0; i < header_files.size(); i++ )
{
const string& header_file = header_files[i];
- fprintf ( OUT, "# Begin Source File\n" );
- fprintf ( OUT, "\n" );
- fprintf ( OUT, "SOURCE=.\\%s\n", header_file.c_str() );
- fprintf ( OUT, "# End Source File\n" );
+ fprintf ( OUT, "# Begin Source File\r\n" );
+ fprintf ( OUT, "\r\n" );
+ fprintf ( OUT, "SOURCE=.\\%s\r\n", header_file.c_str() );
+ fprintf ( OUT, "# End Source File\r\n" );
}
- fprintf ( OUT, "# End Group\n" );
+ fprintf ( OUT, "# End Group\r\n" );
- fprintf ( OUT, "# Begin Group \"Resource Files\"\n" );
- fprintf ( OUT, "\n" );
- fprintf ( OUT, "# PROP Default_Filter \"ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe\"\n" );
- for ( i = 0; i < resource_files.size(); i++ )
+ 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++ )
{
const string& resource_file = resource_files[i];
- fprintf ( OUT, "# Begin Source File\n" );
- fprintf ( OUT, "\n" );
- fprintf ( OUT, "SOURCE=.\\%s\n", resource_file.c_str() );
- fprintf ( OUT, "# End Source File\n" );
+ fprintf ( OUT, "# Begin Source File\r\n" );
+ fprintf ( OUT, "\r\n" );
+ fprintf ( OUT, "SOURCE=.\\%s\r\n", resource_file.c_str() );
+ fprintf ( OUT, "# End Source File\r\n" );
}
- fprintf ( OUT, "# End Group\n" );
+*/ fprintf ( OUT, "# End Group\r\n" );
- fprintf ( OUT, "# End Target\n" );
- fprintf ( OUT, "# End Project\n" );
+ fprintf ( OUT, "# End Target\r\n" );
+ fprintf ( OUT, "# End Project\r\n" );
fclose(OUT);
}
-#endif
+
void
MSVCBackend::_generate_dsw_header ( FILE* OUT )
{
- fprintf ( OUT, "Microsoft Developer Studio Workspace File, Format Version 6.00\n" );
- fprintf ( OUT, "# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\n" );
- fprintf ( OUT, "\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
std::string dsp_file,
const std::vector<Dependency*>& dependencies )
{
- dsp_file = std::string(".\\") + dsp_file;
- // TODO FIXME - what does next line do?
- //$dsp_file =~ y%/%\\%;
+ dsp_file = DosSeparator ( std::string(".\\") + dsp_file );
// TODO FIXME - must they be sorted?
//@dependencies = sort(@dependencies);
- fprintf ( OUT, "###############################################################################\n" );
- fprintf ( OUT, "\n" );
- fprintf ( OUT, "Project: \"%s\"=%s - Package Owner=<4>\n", module.name.c_str(), dsp_file.c_str() );
- fprintf ( OUT, "\n" );
- fprintf ( OUT, "Package=<5>\n" );
- fprintf ( OUT, "{{{\n" );
- fprintf ( OUT, "}}}\n" );
- fprintf ( OUT, "\n" );
- fprintf ( OUT, "Package=<4>\n" );
- fprintf ( OUT, "{{{\n" );
+ 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];
- fprintf ( OUT, " Begin Project Dependency\n" );
- fprintf ( OUT, " Project_Dep_Name %s\n", dependency.module.name.c_str() );
- fprintf ( OUT, " End Project Dependency\n" );
+ fprintf ( OUT, " Begin Project Dependency\r\n" );
+ fprintf ( OUT, " Project_Dep_Name %s\r\n", dependency.module.name.c_str() );
+ fprintf ( OUT, " End Project Dependency\r\n" );
}
- fprintf ( OUT, "}}}\n" );
- fprintf ( OUT, "\n" );
+ fprintf ( OUT, "}}}\r\n" );
+ fprintf ( OUT, "\r\n" );
}
void
MSVCBackend::_generate_dsw_footer ( FILE* OUT )
{
- fprintf ( OUT, "###############################################################################\n" );
- fprintf ( OUT, "\n" );
- fprintf ( OUT, "Global:\n" );
- fprintf ( OUT, "\n" );
- fprintf ( OUT, "Package=<5>\n" );
- fprintf ( OUT, "{{{\n" );
- fprintf ( OUT, "}}}\n" );
- fprintf ( OUT, "\n" );
- fprintf ( OUT, "Package=<3>\n" );
- fprintf ( OUT, "{{{\n" );
- fprintf ( OUT, "}}}\n" );
- fprintf ( OUT, "\n" );
- fprintf ( OUT, "###############################################################################\n" );
- fprintf ( OUT, "\n" );
+ fprintf ( OUT, "###############################################################################\r\n" );
+ fprintf ( OUT, "\r\n" );
+ fprintf ( OUT, "Global:\r\n" );
+ 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=<3>\r\n" );
+ fprintf ( OUT, "{{{\r\n" );
+ fprintf ( OUT, "}}}\r\n" );
+ fprintf ( OUT, "\r\n" );
+ fprintf ( OUT, "###############################################################################\r\n" );
+ fprintf ( OUT, "\r\n" );
}
void
_generate_dsw_header(OUT);
// TODO FIXME - is it necessary to sort them?
for ( size_t i = 0; i < ProjectNode.modules.size(); i++ )
- //foreach my $module (sort(keys(%modules)))
{
Module& module = *ProjectNode.modules[i];
- //my $project = module->{project};
std::string dsp_file = DspFileName ( module );
// TODO FIXME - more wine hacks?
- /*if($project =~ /^gdi32$/) {
- foreach my $dir (@gdi32_dirs) {
- my $dir2 = $dir;
+ /*if ( module.name == "gdi32" )
+ {
+ for ( size_t idir = 0; idir < gdi32_dirs.size(); idir++ )
+ {
+ string dir2 = gdi32_dirs[idir];
$dir2 =~ s%^.*?/([^/]+)$%$1%;
- my $module = "gdi32_$dir2";
- $module =~ s%/%_%g;
- push @dependencies, $module;
+ dependencies.push_back ( Replace ( "gdi32_" + dir2, "/", "_" ) );
}
}*/
projects / reactos.git / blobdiff