marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Use gcc -shared instead of dllwrap to build libwine.dll.

oldstable
Jacek Caban 2013-05-08 17:31:01 +02:00 committed by Alexandre Julliard
parent 08e940fb1d
commit 6c32033cdc
3 changed files with 2 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Make.vars.in
View File

@ -35,7 +35,6 @@ FAKEEXT = $(DLLEXT:.so=.fake)
TOOLSEXT = @TOOLSEXT@
IMPLIBEXT = @IMPLIBEXT@
DLLTOOL = @DLLTOOL@
DLLWRAP = @DLLWRAP@
AR = @AR@
ARFLAGS = @ARFLAGS@
RANLIB = @RANLIB@

98
configure vendored
View File

@ -696,7 +696,6 @@ IOKITLIB
COREFOUNDATIONLIB
LIBWINE_RULES
SOCKETLIBS
DLLWRAP
DLLTOOL
READELF
LDD
@ -6530,101 +6529,6 @@ else
DLLTOOL="$ac_cv_prog_DLLTOOL"
fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dllwrap", so it can be a program name with args.
set dummy ${ac_tool_prefix}dllwrap; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_prog_DLLWRAP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$DLLWRAP"; then
ac_cv_prog_DLLWRAP="$DLLWRAP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DLLWRAP="${ac_tool_prefix}dllwrap"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
DLLWRAP=$ac_cv_prog_DLLWRAP
if test -n "$DLLWRAP"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLWRAP" >&5
$as_echo "$DLLWRAP" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
fi
if test -z "$ac_cv_prog_DLLWRAP"; then
ac_ct_DLLWRAP=$DLLWRAP
# Extract the first word of "dllwrap", so it can be a program name with args.
set dummy dllwrap; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_prog_ac_ct_DLLWRAP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DLLWRAP"; then
ac_cv_prog_ac_ct_DLLWRAP="$ac_ct_DLLWRAP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DLLWRAP="dllwrap"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
ac_ct_DLLWRAP=$ac_cv_prog_ac_ct_DLLWRAP
if test -n "$ac_ct_DLLWRAP"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLWRAP" >&5
$as_echo "$ac_ct_DLLWRAP" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test "x$ac_ct_DLLWRAP" = x; then
DLLWRAP="false"
else
case $cross_compiling:$ac_tool_warned in
yes:)
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
DLLWRAP=$ac_ct_DLLWRAP
fi
else
DLLWRAP="$ac_cv_prog_DLLWRAP"
fi
if test "$DLLWRAP" = "false"; then
as_fn_error $? "dllwrap is needed to build a dll for Windows" "$LINENO" 5
fi
LIBEXT="dll"
IMPLIBEXT="a"
STATIC_IMPLIBEXT="a"
@ -6653,7 +6557,7 @@ libwine.a: wine.def
\$(DLLTOOL) -l \$@ -d \$(srcdir)/wine.def
libwine.dll: \$(OBJS) wine.def Makefile.in
\$(DLLWRAP) --def \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS)
\$(CC) -shared \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS)
install install-lib:: libwine.dll \$(DESTDIR)\$(libdir) dummy
\$(INSTALL_DATA) libwine.dll \$(DESTDIR)\$(libdir)/libwine.dll

6
configure.ac
View File

@ -686,10 +686,6 @@ WINE_PATH_SONAME_TOOLS
case $host_os in
cygwin*|mingw32*)
AC_CHECK_TOOL(DLLTOOL,dlltool,false)
AC_CHECK_TOOL(DLLWRAP,dllwrap,false)
if test "$DLLWRAP" = "false"; then
AC_MSG_ERROR([dllwrap is needed to build a dll for Windows])
fi
LIBEXT="dll"
IMPLIBEXT="a"
STATIC_IMPLIBEXT="a"
@ -720,7 +716,7 @@ libwine.a: wine.def
\$(DLLTOOL) -l \$@ -d \$(srcdir)/wine.def
libwine.dll: \$(OBJS) wine.def Makefile.in
\$(DLLWRAP) --def \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS)
\$(CC) -shared \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS)
install install-lib:: libwine.dll \$(DESTDIR)\$(libdir) dummy
\$(INSTALL_DATA) libwine.dll \$(DESTDIR)\$(libdir)/libwine.dll