Removed last fix to aclocal.m4
Fixed configure.in for Wine git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
25bb0f8980
commit
fb00f58d24
4
aclocal.m4
vendored
4
aclocal.m4
vendored
@ -1591,11 +1591,7 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
|
|||||||
PLATFORM_MACOS=1
|
PLATFORM_MACOS=1
|
||||||
;;
|
;;
|
||||||
* )
|
* )
|
||||||
if test "$wxUSE_WINE" = "yes"; then
|
|
||||||
PLATFORM_WIN32=1
|
|
||||||
else
|
|
||||||
PLATFORM_UNIX=1
|
PLATFORM_UNIX=1
|
||||||
fi
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
else
|
else
|
||||||
|
@ -6664,8 +6664,16 @@ case "$TOOLKIT" in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
if test "$wxUSE_WINE" = "yes"; then
|
||||||
|
BAKEFILE_FORCE_PLATFORM=win32
|
||||||
|
fi
|
||||||
|
|
||||||
AC_BAKEFILE([m4_include(autoconf_inc.m4)])
|
AC_BAKEFILE([m4_include(autoconf_inc.m4)])
|
||||||
|
|
||||||
|
if test "$wxUSE_WINE" = "yes"; then
|
||||||
|
RESCOMP=wrc
|
||||||
|
fi
|
||||||
|
|
||||||
if test "$wxUSE_SHARED" = "yes"; then
|
if test "$wxUSE_SHARED" = "yes"; then
|
||||||
|
|
||||||
dnl We get the shared build linker from bakefile, since it
|
dnl We get the shared build linker from bakefile, since it
|
||||||
|
Loading…
Reference in New Issue
Block a user