Alexandre Julliard : makefiles: Explicitly import libwine only for Windows builds.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Feb 24 11:01:42 CST 2016
Module: wine
Branch: master
Commit: 3ebbfd5b6b96877c06de5fab9ec88fd6252d7787
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ebbfd5b6b96877c06de5fab9ec88fd6252d7787
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Feb 24 13:17:37 2016 +0900
makefiles: Explicitly import libwine only for Windows builds.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
tools/makedep.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/makedep.c b/tools/makedep.c
index e1897bc..9da665a 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -2545,13 +2545,12 @@ static struct strarray output_sources( const struct makefile *make )
strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, 0 ));
strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->imports, 0 ));
add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */
- for (i = 0; i < make->delayimports.count; i++)
- strarray_add( &all_libs, strmake( "-Wb,-d%s", make->delayimports.str[i] ));
- strarray_add( &all_libs, "-lwine" );
strarray_addall( &all_libs, add_default_libraries( make, &dep_libs ));
if (*dll_ext)
{
+ for (i = 0; i < make->delayimports.count; i++)
+ strarray_add( &all_libs, strmake( "-Wb,-d%s", make->delayimports.str[i] ));
strarray_add( &all_targets, strmake( "%s%s", make->module, dll_ext ));
strarray_add( &all_targets, strmake( "%s.fake", make->module ));
add_install_rule( make, install_rules, make->module, strmake( "%s%s", make->module, dll_ext ),
@@ -2562,6 +2561,7 @@ static struct strarray output_sources( const struct makefile *make )
}
else
{
+ strarray_add( &all_libs, "-lwine" );
strarray_add( &all_targets, make->module );
add_install_rule( make, install_rules, make->module, make->module,
strmake( "p$(%s)/%s", spec_file ? "dlldir" : "bindir", make->module ));
More information about the wine-cvs
mailing list