* 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.
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifdef _MSC_VER
imports.push_back ( module.non_if_data.libraries[i]->name );
}
- string module_type = GetExtension(module.GetTargetName());
+ string module_type = GetExtension(*module.output);
bool lib = (module_type == ".lib") || (module_type == ".a");
bool dll = (module_type == ".dll") || (module_type == ".cpl");
bool exe = (module_type == ".exe") || (module_type == ".scr");
//$output->progress("$dsp_file (file $progress_current of $progress_max)");
// 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;
+ vector<string> c_srcs, source_files, header_files, resource_files, includes, libraries;
StringSet common_defines;
vector<const IfableData*> ifs_list;
ifs_list.push_back ( &module.project.non_if_data );
{
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()];
+ if (files[i]->file.directory != SourceDirectory)
+ continue;
+
+ // We want the full path here for directory support later on
+ string path = Path::RelativeFromDirectory (
+ files[i]->file.relative_path,
+ module.output->relative_path );
+ string file = path + std::string("\\") + files[i]->file.name;
source_files.push_back ( file );
if ( !stricmp ( Right(file,2).c_str(), ".c" ) )
c_srcs.push_back ( file );
+ if ( !stricmp ( Right(file,2).c_str(), ".h" ) )
+ header_files.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() );
+ incs[i]->directory->relative_path,
+ module.output->relative_path );
includes.push_back ( path );
}
const vector<Library*>& libs = data.libraries;
}
// TODO FIXME - we don't include header files in our build system
//my @header_files = @{module->{header_files}};
- vector<string> header_files;
+ //vector<string> header_files;
// TODO FIXME - wine hack?
/*if (module.name !~ /^wine(?:_unicode|build|runtests|test)?$/ &&
output_dir.c_str(),
spec_file.c_str(),
def_file.c_str() );
-
+
if ( module.name == "ntdll" )
{
int n = 0;
void
MSVCBackend::_generate_dsw_header ( FILE* OUT )
{
- 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" );
+ 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 = DosSeparator ( std::string(".\\") + dsp_file );
-
+ dsp_file = DosSeparator ( std::string(".\\") + dsp_file );
+
// TODO FIXME - must they be sorted?
- //@dependencies = sort(@dependencies);
-
- 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" );
+ //@dependencies = sort(@dependencies);
+
+ 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];
{
_generate_dsw_header(OUT);
// TODO FIXME - is it necessary to sort them?
- for ( size_t i = 0; i < ProjectNode.modules.size(); i++ )
+ for( std::map<std::string, Module*>::const_iterator p = ProjectNode.modules.begin(); p != ProjectNode.modules.end(); ++ p )
{
- Module& module = *ProjectNode.modules[i];
+ Module& module = *p->second;
std::string dsp_file = DspFileName ( module );
// TODO FIXME - more wine hacks?
- /*if ( module.name == "gdi32" )
+ /*if ( module.name == "gdi32" )
{
for ( size_t idir = 0; idir < gdi32_dirs.size(); idir++ )
{
dependencies.push_back ( Replace ( "gdi32_" + dir2, "/", "_" ) );
}
- }*/
+ }*/
_generate_dsw_project ( OUT, module, dsp_file, module.dependencies );
- }
- _generate_dsw_footer ( OUT );
+ }
+ _generate_dsw_footer ( OUT );
}
projects / reactos.git / blobdiff