diff options
| -rwxr-xr-x | src/auto/configure | 4 | ||||
| -rw-r--r-- | src/configure.in | 7 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim.h | 3 |
4 files changed, 16 insertions, 0 deletions
diff --git a/src/auto/configure b/src/auto/configure index e93173fe1..4e29d0b53 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -12674,6 +12674,10 @@ $as_echo "yes" >&6; } { $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 LDFLAGS="$LDFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" diff --git a/src/configure.in b/src/configure.in index f1720ced5..2fe5a9d8e 100644 --- a/src/configure.in +++ b/src/configure.in @@ -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" diff --git a/src/version.c b/src/version.c index 5a99da411..10da53dfb 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1300, +/**/ 1299, /**/ 1298, @@ -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) |