2014-07-07 04:07:19 +00:00
|
|
|
diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj
|
|
|
|
|
index 1c5ff47..677a2cc 100644
|
|
|
|
|
--- a/src/MacVim/MacVim.xcodeproj/project.pbxproj
|
|
|
|
|
+++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj
|
|
|
|
|
@@ -437,6 +437,8 @@
|
|
|
|
|
/* Begin PBXProject section */
|
|
|
|
|
29B97313FDCFA39411CA2CEA /* Project object */ = {
|
|
|
|
|
isa = PBXProject;
|
|
|
|
|
+ attributes = {
|
|
|
|
|
+ };
|
|
|
|
|
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MacVim" */;
|
|
|
|
|
compatibilityVersion = "Xcode 2.4";
|
|
|
|
|
developmentRegion = English;
|
|
|
|
|
@@ -632,6 +634,7 @@
|
|
|
|
|
INSTALL_PATH = "$(HOME)/Applications";
|
|
|
|
|
MACOSX_DEPLOYMENT_TARGET = "";
|
|
|
|
|
ONLY_ACTIVE_ARCH = YES;
|
|
|
|
|
+ OTHER_LDFLAGS = "-headerpad_max_install_names";
|
|
|
|
|
PRODUCT_NAME = MacVim;
|
|
|
|
|
VERSIONING_SYSTEM = "apple-generic";
|
|
|
|
|
WARNING_CFLAGS = "-Wall";
|
|
|
|
|
@@ -662,6 +665,7 @@
|
|
|
|
|
INSTALL_PATH = "$(HOME)/Applications";
|
|
|
|
|
MACOSX_DEPLOYMENT_TARGET = "";
|
|
|
|
|
ONLY_ACTIVE_ARCH = YES;
|
|
|
|
|
+ OTHER_LDFLAGS = "-headerpad_max_install_names";
|
|
|
|
|
PRODUCT_NAME = MacVim;
|
|
|
|
|
VERSIONING_SYSTEM = "apple-generic";
|
|
|
|
|
WRAPPER_EXTENSION = app;
|
|
|
|
|
|
2014-06-06 21:45:22 +00:00
|
|
|
diff --git a/src/vimtutor b/src/vimtutor
|
|
|
|
|
index 70d9ec7..b565a1a 100755
|
|
|
|
|
--- a/src/vimtutor
|
|
|
|
|
+++ b/src/vimtutor
|
|
|
|
|
@@ -16,7 +16,7 @@ seq="vim vim8 vim75 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi"
|
|
|
|
|
if test "$1" = "-g"; then
|
|
|
|
|
# Try to use the GUI version of Vim if possible, it will fall back
|
|
|
|
|
# on Vim if Gvim is not installed.
|
|
|
|
|
- seq="gvim gvim8 gvim75 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq"
|
|
|
|
|
+ seq="mvim gvim gvim8 gvim75 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq"
|
|
|
|
|
shift
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/auto/configure b/src/auto/configure
|
|
|
|
|
index bc9f074..9b9125e 100755
|
|
|
|
|
--- a/src/auto/configure
|
|
|
|
|
+++ b/src/auto/configure
|
|
|
|
|
@@ -2252,7 +2252,7 @@ rm -f conftest.val
|
|
|
|
|
as_fn_set_status $ac_retval
|
|
|
|
|
|
|
|
|
|
} # ac_fn_c_compute_int
|
|
|
|
|
-cat >auto/config.log <<_ACEOF
|
|
|
|
|
+cat >config.log <<_ACEOF
|
|
|
|
|
This file contains any messages produced by compilers while
|
|
|
|
|
running configure, to aid debugging if configure makes a mistake.
|
|
|
|
|
|
|
|
|
|
@@ -2262,7 +2262,7 @@ generated by GNU Autoconf 2.69. Invocation command line was
|
|
|
|
|
$ $0 $@
|
|
|
|
|
|
|
|
|
|
_ACEOF
|
|
|
|
|
-exec 5>>auto/config.log
|
|
|
|
|
+exec 5>>config.log
|
|
|
|
|
{
|
|
|
|
|
cat <<_ASUNAME
|
|
|
|
|
## --------- ##
|
|
|
|
|
@@ -5377,10 +5377,7 @@ $as_echo "no" >&6; }
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
|
|
|
|
|
- if test "x$MACOSX" = "xyes"; then
|
|
|
|
|
- MZSCHEME_LIBS="-framework Racket"
|
|
|
|
|
- MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
|
|
|
|
|
- elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then
|
|
|
|
|
+ if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then
|
|
|
|
|
MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"
|
|
|
|
|
MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
|
|
|
|
|
elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket3m.a"; then
|
|
|
|
|
@@ -5716,23 +5713,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; }
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if test "x$MACOSX" = "xyes"; then
|
|
|
|
|
- dir=/System/Library/Perl
|
|
|
|
|
- darwindir=$dir/darwin
|
|
|
|
|
- if test -d $darwindir; then
|
|
|
|
|
- PERL=/usr/bin/perl
|
|
|
|
|
- else
|
|
|
|
|
- dir=/System/Library/Perl/5.8.1
|
|
|
|
|
- darwindir=$dir/darwin-thread-multi-2level
|
|
|
|
|
- if test -d $darwindir; then
|
|
|
|
|
- PERL=/usr/bin/perl
|
|
|
|
|
- fi
|
|
|
|
|
- fi
|
|
|
|
|
- if test -n "$PERL"; then
|
|
|
|
|
- PERL_DIR="$dir"
|
|
|
|
|
- PERL_CFLAGS="-DFEAT_PERL -I$darwindir/CORE"
|
|
|
|
|
- PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o $darwindir/auto/DynaLoader/DynaLoader.a"
|
|
|
|
|
- PERL_LIBS="-L$darwindir/CORE -lperl"
|
|
|
|
|
- fi
|
|
|
|
|
PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'`
|
|
|
|
|
PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'`
|
|
|
|
|
fi
|
|
|
|
|
@@ -5926,10 +5906,6 @@ __:
|
|
|
|
|
eof
|
|
|
|
|
eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
|
|
|
|
|
rm -f -- "${tmp_mkf}"
|
|
|
|
|
- if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
|
|
|
|
|
- "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
|
|
|
|
|
- vi_cv_path_python_plibs="-framework Python"
|
|
|
|
|
- else
|
|
|
|
|
if test "${vi_cv_var_python_version}" = "1.4"; then
|
|
|
|
|
vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
|
|
|
|
|
else
|
|
|
|
|
@@ -5937,7 +5913,6 @@ eof
|
|
|
|
|
fi
|
|
|
|
|
vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
|
|
|
|
|
vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
|
|
|
|
|
- fi
|
|
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
@@ -6004,13 +5979,6 @@ rm -f core conftest.err conftest.$ac_objext \
|
|
|
|
|
$as_echo "no" >&6; }
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
- if test -n "$MACSDK"; then
|
|
|
|
|
- PYTHON_CFLAGS=
|
|
|
|
|
- PYTHON_LIBS=-framework Python
|
|
|
|
|
- PYTHON_CONFDIR=
|
|
|
|
|
- PYTHON_GETPATH_CFLAGS=
|
|
|
|
|
- fi
|
|
|
|
|
-
|
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5
|
|
|
|
|
$as_echo_n "checking if compile and link flags for Python are sane... " >&6; }
|
|
|
|
|
cflags_save=$CFLAGS
|
|
|
|
|
@@ -6853,11 +6821,7 @@ $as_echo "$tclver - OK" >&6; };
|
|
|
|
|
|
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5
|
|
|
|
|
$as_echo_n "checking for location of Tcl include... " >&6; }
|
|
|
|
|
- if test "x$MACOSX" != "xyes"; then
|
|
|
|
|
tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver"
|
|
|
|
|
- else
|
|
|
|
|
- tclinc="/System/Library/Frameworks/Tcl.framework/Headers"
|
|
|
|
|
- fi
|
|
|
|
|
TCL_INC=
|
|
|
|
|
for try in $tclinc; do
|
|
|
|
|
if test -f "$try/tcl.h"; then
|
|
|
|
|
@@ -6875,12 +6839,8 @@ $as_echo "<not found>" >&6; }
|
|
|
|
|
if test -z "$SKIP_TCL"; then
|
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5
|
|
|
|
|
$as_echo_n "checking for location of tclConfig.sh script... " >&6; }
|
|
|
|
|
- if test "x$MACOSX" != "xyes"; then
|
|
|
|
|
tclcnf=`echo $tclinc | sed s/include/lib/g`
|
|
|
|
|
tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
|
|
|
|
|
- else
|
|
|
|
|
- tclcnf="/System/Library/Frameworks/Tcl.framework"
|
|
|
|
|
- fi
|
|
|
|
|
for try in $tclcnf; do
|
|
|
|
|
if test -f $try/tclConfig.sh; then
|
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5
|
|
|
|
|
@@ -7050,10 +7010,6 @@ $as_echo "$rubyhdrdir" >&6; }
|
|
|
|
|
if test -f "$rubylibdir/$librubya"; then
|
|
|
|
|
librubyarg="$librubyarg"
|
|
|
|
|
RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
|
|
|
|
|
- elif test -d "/System/Library/Frameworks/Ruby.framework"; then
|
|
|
|
|
- RUBY_LIBS="-framework Ruby"
|
|
|
|
|
- RUBY_CFLAGS="-DRUBY_VERSION=$rubyversion"
|
|
|
|
|
- librubyarg=
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if test "X$librubyarg" != "X"; then
|
|
|
|
|
@@ -14061,7 +14017,7 @@ fi
|
|
|
|
|
|
|
|
|
|
_ACEOF
|
|
|
|
|
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
|
|
|
-exec 5>>auto/config.log
|
|
|
|
|
+exec 5>>config.log
|
|
|
|
|
{
|
|
|
|
|
echo
|
|
|
|
|
sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
|
|
|
|
|
@@ -14653,7 +14609,7 @@ if test "$no_create" != yes; then
|
|
|
|
|
ac_config_status_args="$ac_config_status_args --quiet"
|
|
|
|
|
exec 5>/dev/null
|
|
|
|
|
$SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
|
|
|
|
|
- exec 5>>auto/config.log
|
|
|
|
|
+ exec 5>>config.log
|
|
|
|
|
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
|
|
|
|
|
# would make configure fail if this is the last instruction.
|
|
|
|
|
$ac_cs_success || as_fn_exit 1
|
2014-10-18 05:15:45 +00:00
|
|
|
|
|
|
|
|
diff --git a/src/Makefile b/src/Makefile
|
|
|
|
|
index 1c4d104..fff2015 100644
|
|
|
|
|
--- a/src/Makefile
|
|
|
|
|
+++ b/src/Makefile
|
|
|
|
|
@@ -1298,7 +1298,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \
|
|
|
|
|
MacVim/MacVim.m
|
|
|
|
|
MACVIMGUI_OBJ = objects/gui.o objects/gui_beval.o objects/pty.o \
|
|
|
|
|
objects/gui_macvim.o objects/MMBackend.o objects/MacVim.o
|
|
|
|
|
-MACVIMGUI_DEFS = -DFEAT_GUI_MACVIM -Wall -Wno-unknown-pragmas -pipe
|
|
|
|
|
+MACVIMGUI_DEFS = -DMACOS_X_UNIX -DFEAT_GUI_MACVIM -Wall -Wno-unknown-pragmas -pipe
|
|
|
|
|
MACVIMGUI_IPATH =
|
|
|
|
|
MACVIMGUI_LIBS_DIR =
|
|
|
|
|
MACVIMGUI_LIBS1 = -framework Cocoa -framework Carbon
|
|
|
|
|
|
|
|
|
|
diff --git a/src/if_python.c b/src/if_python.c
|
|
|
|
|
index b356bf7..b7bfa78 100644
|
|
|
|
|
--- a/src/if_python.c
|
|
|
|
|
+++ b/src/if_python.c
|
|
|
|
|
@@ -55,11 +55,7 @@
|
|
|
|
|
|
|
|
|
|
#define PY_SSIZE_T_CLEAN
|
|
|
|
|
|
|
|
|
|
-#ifdef FEAT_GUI_MACVIM
|
|
|
|
|
-# include <Python/Python.h>
|
|
|
|
|
-#else
|
|
|
|
|
-# include <Python.h>
|
|
|
|
|
-#endif
|
|
|
|
|
+#include <Python.h>
|
|
|
|
|
|
|
|
|
|
#if !defined(PY_VERSION_HEX) || PY_VERSION_HEX < 0x02050000
|
|
|
|
|
# undef PY_SSIZE_T_CLEAN
|
|
|
|
|
MACVIMGUI_LIBS1 = -framework Cocoa -framework Carbon
|
