ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefiles: Generate installation rules for static and import libraries. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2016-04-04 14:06:10 +09:00
parent 2f956a4e06
commit e0d89a4954
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/makedep.c
View File

@ -2836,6 +2836,8 @@ static struct strarray output_sources( const struct makefile *make )
output( "\t$(AR) $(ARFLAGS) $@" ); output( "\t$(AR) $(ARFLAGS) $@" );
output_filenames_obj_dir( make, object_files ); output_filenames_obj_dir( make, object_files );
output( "\n\t$(RANLIB) $@\n" ); output( "\n\t$(RANLIB) $@\n" );
add_install_rule( make, install_rules, make->staticlib, make->staticlib,
strmake( "d$(dlldir)/%s", make->staticlib ));
if (crosstarget && make->module) if (crosstarget && make->module)
{ {
char *name = replace_extension( make->staticlib, ".a", ".cross.a" ); char *name = replace_extension( make->staticlib, ".a", ".cross.a" );
@ -3461,7 +3463,12 @@ static void load_sources( struct makefile *make )
make->use_msvcrt = !strncmp( make->imports.str[i], "msvcr", 5 ) || make->use_msvcrt = !strncmp( make->imports.str[i], "msvcr", 5 ) ||
!strcmp( make->imports.str[i], "ucrtbase" ); !strcmp( make->imports.str[i], "ucrtbase" );
if (make->module && !make->install_lib.count) strarray_add( &make->install_lib, make->module ); if (make->module && !make->install_lib.count && !make->install_dev.count)
{
if (make->importlib) strarray_add( &make->install_dev, make->importlib );
if (make->staticlib) strarray_add( &make->install_dev, make->staticlib );
else strarray_add( &make->install_lib, make->module );
}
make->include_paths = empty_strarray; make->include_paths = empty_strarray;
make->define_args = empty_strarray; make->define_args = empty_strarray;