1
0
forked from aniani/vim

updated for version 7.3.1300

Problem:    Mac: tiny and small build fails.
Solution:   Don't include os_macosx.m in tiny build. Include mouse support in
            small build. (Kazunobu Kuriyama)
This commit is contained in:
Bram Moolenaar
2013-07-03 19:52:53 +02:00
parent 32ac8cdaaa
commit 3437b91102
4 changed files with 16 additions and 0 deletions

4
src/auto/configure vendored
View File

@@ -12673,6 +12673,10 @@ $as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test "x$features" = "xtiny"; then
OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_macosx.m++'`
OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_macosx.o++'`
fi
fi
if test "x$MACARCH" = "xboth" && test "x$GUITYPE" = "xCARBONGUI"; then

View File

@@ -3698,6 +3698,13 @@ if test "x$MACOSX" = "xyes"; then
else
AC_MSG_RESULT(no)
fi
dnl As mentioned above, tiny build implies os_macosx.m isn't needed.
dnl Exclude it from OS_EXTRA_SRC so that linker won't complain about
dnl missing Objective-C symbols.
if test "x$features" = "xtiny"; then
OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_macosx.m++'`
OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_macosx.o++'`
fi
fi
if test "x$MACARCH" = "xboth" && test "x$GUITYPE" = "xCARBONGUI"; then
LDFLAGS="$LDFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"

View File

@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1300,
/**/
1299,
/**/

View File

@@ -101,6 +101,9 @@
# endif
# ifndef FEAT_CLIPBOARD
# define FEAT_CLIPBOARD
# if defined(FEAT_SMALL) && !defined(FEAT_MOUSE)
# define FEAT_MOUSE
# endif
# endif
#endif
#if defined(MACOS_X) || defined(MACOS_CLASSIC)