Rebase against 4fb840b614691a787c76659f02c163d922f88fba.

This commit is contained in:
Sebastian Lackner
2015-10-22 20:18:05 +02:00
parent 8d0e6ea5c8
commit e64c3bff30
5 changed files with 182 additions and 182 deletions

View File

@@ -627,14 +627,14 @@ index 54aab45..c9f48fe 100644
+ {
+ for (i = 0; i < resource_dlls.count; i++)
+ {
+ output( "%s/Makefile: dummy\n", resource_dlls.str[i] );
+ output( "%s/Makefile:\n", resource_dlls.str[i] );
+ output( "\t@cd %s && $(MAKE) %s/Makefile\n", make->top_obj_dir,
+ base_dir_path( make, resource_dlls.str[i] ) );
+ }
+
+ for (i = 0; i < resource_dlls.count; i++)
+ {
+ output( "%s/%s%s: %s/Makefile dummy\n", resource_dlls.str[i],
+ output( "%s/%s%s: %s/Makefile\n", resource_dlls.str[i],
+ resource_dlls.str[i], dll_ext, resource_dlls.str[i] );
+ output( "\t@cd %s && $(MAKE) %s%s\n", resource_dlls.str[i],
+ resource_dlls.str[i], dll_ext );
@@ -660,7 +660,7 @@ index 54aab45..c9f48fe 100644
+ for (i = 0; i < resource_dlls.count; i++)
+ {
+ char *name = prepend_extension( resource_dlls.str[i], "_crossres", ".dll" );
+ output( "%s/%s: %s/Makefile dummy\n", resource_dlls.str[i], name, resource_dlls.str[i] );
+ output( "%s/%s: %s/Makefile\n", resource_dlls.str[i], name, resource_dlls.str[i] );
+ output( "\t@cd %s && $(MAKE) %s\n", resource_dlls.str[i], name );
+ free( name );
+ }