makefiles: Don't use libwine for Windows builds.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2019-04-03 15:02:12 +02:00
parent 69da21f120
commit f689c723a2
6 changed files with 5 additions and 141 deletions

View File

@ -80,7 +80,6 @@ WINELOADER_DEPENDS = @WINELOADER_DEPENDS@
WINELOADER_LDFLAGS = @WINELOADER_LDFLAGS@
WINEPRELOADER_LDFLAGS = @WINEPRELOADER_LDFLAGS@
LIBWINE_SHAREDLIB = @LIBWINE_SHAREDLIB@
LIBWINE_IMPORTLIB = @LIBWINE_IMPORTLIB@
LIBWINE_LDFLAGS = @LIBWINE_LDFLAGS@
LIBWINE_DEPENDS = @LIBWINE_DEPENDS@
DISABLED_SUBDIRS = @DISABLED_SUBDIRS@

18
configure vendored
View File

@ -704,8 +704,11 @@ PTHREAD_LIBS
CROSSCFLAGS
CROSSCC
CROSSTARGET
LIBWINE_DEPENDS
PRELINK
WINELOADER_DEPENDS
LIBWINE_LDFLAGS
LIBWINE_SHAREDLIB
METAL_LIBS
CARBON_LIBS
QUICKTIME_LIBS
@ -724,10 +727,6 @@ OBJCPP
ac_ct_OBJC
OBJCFLAGS
OBJC
LIBWINE_DEPENDS
LIBWINE_LDFLAGS
LIBWINE_IMPORTLIB
LIBWINE_SHAREDLIB
DLLTOOL
WINELOADER_PROGRAMS
CONFIGURE_TARGETS
@ -8161,17 +8160,6 @@ fi
enable_server=${enable_server:-no}
with_x=${with_x:-no}
with_pthread=${with_pthread:-no}
LIBWINE_SHAREDLIB="libwine.dll"
LIBWINE_IMPORTLIB="libwine.a"
LIBWINE_LDFLAGS="-shared \$(srcdir)/wine.def"
LIBWINE_DEPENDS="wine.def"
TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.dll"
TOP_INSTALL_DEV="$TOP_INSTALL_DEV libs/wine/libwine.a"
;;
darwin*|macosx*)

View File

@ -731,13 +731,6 @@ case $host_os in
dnl Disable dependencies that are not useful on Windows
with_x=${with_x:-no}
with_pthread=${with_pthread:-no}
AC_SUBST(LIBWINE_SHAREDLIB,"libwine.dll")
AC_SUBST(LIBWINE_IMPORTLIB,"libwine.a")
AC_SUBST(LIBWINE_LDFLAGS,"-shared \$(srcdir)/wine.def")
AC_SUBST(LIBWINE_DEPENDS,"wine.def")
TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.dll"
TOP_INSTALL_DEV="$TOP_INSTALL_DEV libs/wine/libwine.a"
;;
darwin*|macosx*)

View File

@ -19,7 +19,6 @@ config_EXTRADEFS = \
-DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\"
SHAREDLIB = $(LIBWINE_SHAREDLIB)
IMPORTLIB = $(LIBWINE_IMPORTLIB)
libwine_LDFLAGS = $(LIBWINE_LDFLAGS)
libwine_DEPS = $(LIBWINE_DEPENDS)

View File

@ -1,94 +0,0 @@
LIBRARY libwine.dll
EXPORTS
__wine_dbg_get_channel_flags PRIVATE
__wine_dbg_set_channel_flags
__wine_dbg_set_functions
__wine_dll_register
__wine_main_argc
__wine_main_argv
__wine_main_environ
__wine_main_wargv
atoiW
atolW
get_char_typeW
isalnumW
isalphaW
iscntrlW
isdigitW
isgraphW
islowerW
isprintW
ispunctW
isspaceW
isupperW
isxdigitW
memchrW
memicmpW
memrchrW
snprintfW
sprintfW
strcatW
strchrW
strcmpW
strcmpiW
strcpyW
strcspnW
strlenW
strlwrW
strncmpW
strncmpiW
strpbrkW
strrchrW
strspnW
strstrW
strtolW
strtoulW
struprW
tolowerW
toupperW
vsnprintfW
vsprintfW
wine_call_on_stack
wine_casemap_lower
wine_casemap_upper
wine_compare_string
wine_cp_enum_table
wine_cp_get_table
wine_cp_mbstowcs
wine_cp_wcstombs
wine_cpsymbol_mbstowcs
wine_cpsymbol_wcstombs
wine_dbg_log
wine_dbg_printf
wine_dbg_sprintf
wine_dbgstr_an
wine_dbgstr_wn
wine_dlclose
wine_dll_enum_load_path
wine_dll_get_owner
wine_dll_load
wine_dll_load_main_exe
wine_dll_set_callback
wine_dll_unload
wine_dlopen
wine_dlsym
wine_exec_wine_binary
wine_fold_string
wine_get_build_dir
wine_get_build_id
wine_get_config_dir
wine_get_data_dir
wine_get_server_dir
wine_get_sortkey
wine_get_user_name
wine_get_version
wine_init
wine_init_argv0_path
wine_is_dbcs_leadbyte
wine_pthread_get_functions
wine_pthread_set_functions
wine_switch_to_stack
wine_utf8_mbstowcs
wine_utf8_wcstombs
wine_wctype_table

View File

@ -3095,7 +3095,6 @@ static void output_module( struct makefile *make )
}
else
{
strarray_add( &all_libs, "-lwine" );
strarray_add( &make->all_targets, make->module );
add_install_rule( make, make->module, make->module,
strmake( "p$(%s)/%s", spec_file ? "dlldir" : "bindir", make->module ));
@ -3245,22 +3244,6 @@ static void output_shared_lib( struct makefile *make )
}
/*******************************************************************
* output_import_lib
*/
static void output_import_lib( struct makefile *make )
{
char *def_file = replace_extension( make->importlib, ".a", ".def" );
/* stand-alone import lib (for libwine) */
if (!strncmp( def_file, "lib", 3 )) def_file += 3;
output( "%s: %s\n", obj_dir_path( make, make->importlib ), src_dir_path( make, def_file ));
output( "\t%s -l $@ -d %s\n", dlltool, src_dir_path( make, def_file ));
add_install_rule( make, make->importlib, make->importlib, strmake( "d$(libdir)/%s", make->importlib ));
strarray_add( &make->all_targets, make->importlib );
}
/*******************************************************************
* output_test_module
*/
@ -3713,12 +3696,8 @@ static void output_sources( struct makefile *make )
if (make->staticlib) output_static_lib( make );
else if (make->module) output_module( make );
else if (make->testdll) output_test_module( make );
else
{
if (make->importlib) output_import_lib( make );
if (make->sharedlib) output_shared_lib( make );
if (make->programs.count) output_programs( make );
}
else if (make->sharedlib) output_shared_lib( make );
else if (make->programs.count) output_programs( make );
for (i = 0; i < make->scripts.count; i++)
add_install_rule( make, make->scripts.str[i], make->scripts.str[i],