pyrox.dev
1diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj
2index 1c5ff47..677a2cc 100644
3--- a/src/MacVim/MacVim.xcodeproj/project.pbxproj
4+++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj
5@@ -437,6 +437,8 @@
6 /* Begin PBXProject section */
7 29B97313FDCFA39411CA2CEA /* Project object */ = {
8 isa = PBXProject;
9+ attributes = {
10+ };
11 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MacVim" */;
12 compatibilityVersion = "Xcode 2.4";
13 developmentRegion = English;
14@@ -632,6 +634,7 @@
15 INSTALL_PATH = "$(HOME)/Applications";
16 MACOSX_DEPLOYMENT_TARGET = "";
17 ONLY_ACTIVE_ARCH = YES;
18+ OTHER_LDFLAGS = "-headerpad_max_install_names";
19 PRODUCT_NAME = MacVim;
20 VERSIONING_SYSTEM = "apple-generic";
21 WARNING_CFLAGS = "-Wall";
22@@ -662,6 +665,7 @@
23 INSTALL_PATH = "$(HOME)/Applications";
24 MACOSX_DEPLOYMENT_TARGET = "";
25 ONLY_ACTIVE_ARCH = YES;
26+ OTHER_LDFLAGS = "-headerpad_max_install_names";
27 PRODUCT_NAME = MacVim;
28 VERSIONING_SYSTEM = "apple-generic";
29 WRAPPER_EXTENSION = app;
30
31diff --git a/src/vimtutor b/src/vimtutor
32index 70d9ec7..b565a1a 100755
33--- a/src/vimtutor
34+++ b/src/vimtutor
35@@ -16,7 +16,7 @@ seq="vim vim8 vim75 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi"
36 if test "$1" = "-g"; then
37 # Try to use the GUI version of Vim if possible, it will fall back
38 # on Vim if Gvim is not installed.
39- seq="gvim gvim8 gvim75 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq"
40+ seq="mvim gvim gvim8 gvim75 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq"
41 shift
42 fi
43
44
45diff --git a/src/auto/configure b/src/auto/configure
46index bc9f074..9b9125e 100755
47--- a/src/auto/configure
48+++ b/src/auto/configure
49@@ -2252,7 +2252,7 @@ rm -f conftest.val
50 as_fn_set_status $ac_retval
51
52 } # ac_fn_c_compute_int
53-cat >auto/config.log <<_ACEOF
54+cat >config.log <<_ACEOF
55 This file contains any messages produced by compilers while
56 running configure, to aid debugging if configure makes a mistake.
57
58@@ -2262,7 +2262,7 @@ generated by GNU Autoconf 2.69. Invocation command line was
59 $ $0 $@
60
61 _ACEOF
62-exec 5>>auto/config.log
63+exec 5>>config.log
64 {
65 cat <<_ASUNAME
66 ## --------- ##
67@@ -5377,10 +5377,7 @@ $as_echo "no" >&6; }
68 fi
69
70 if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
71- if test "x$MACOSX" = "xyes"; then
72- MZSCHEME_LIBS="-framework Racket"
73- MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
74- elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then
75+ if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then
76 MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"
77 MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
78 elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket3m.a"; then
79@@ -5716,23 +5713,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; }
80 fi
81
82 if test "x$MACOSX" = "xyes"; then
83- dir=/System/Library/Perl
84- darwindir=$dir/darwin
85- if test -d $darwindir; then
86- PERL=/usr/bin/perl
87- else
88- dir=/System/Library/Perl/5.8.1
89- darwindir=$dir/darwin-thread-multi-2level
90- if test -d $darwindir; then
91- PERL=/usr/bin/perl
92- fi
93- fi
94- if test -n "$PERL"; then
95- PERL_DIR="$dir"
96- PERL_CFLAGS="-DFEAT_PERL -I$darwindir/CORE"
97- PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o $darwindir/auto/DynaLoader/DynaLoader.a"
98- PERL_LIBS="-L$darwindir/CORE -lperl"
99- fi
100 PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'`
101 PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'`
102 fi
103@@ -5926,10 +5906,6 @@ __:
104 eof
105 eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
106 rm -f -- "${tmp_mkf}"
107- if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
108- "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
109- vi_cv_path_python_plibs="-framework Python"
110- else
111 if test "${vi_cv_var_python_version}" = "1.4"; then
112 vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
113 else
114@@ -5937,7 +5913,6 @@ eof
115 fi
116 vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
117 vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
118- fi
119
120 fi
121
122@@ -6004,13 +5979,6 @@ rm -f core conftest.err conftest.$ac_objext \
123 $as_echo "no" >&6; }
124 fi
125
126- if test -n "$MACSDK"; then
127- PYTHON_CFLAGS=
128- PYTHON_LIBS=-framework Python
129- PYTHON_CONFDIR=
130- PYTHON_GETPATH_CFLAGS=
131- fi
132-
133 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5
134 $as_echo_n "checking if compile and link flags for Python are sane... " >&6; }
135 cflags_save=$CFLAGS
136@@ -6853,11 +6821,7 @@ $as_echo "$tclver - OK" >&6; };
137
138 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5
139 $as_echo_n "checking for location of Tcl include... " >&6; }
140- if test "x$MACOSX" != "xyes"; then
141 tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver"
142- else
143- tclinc="/System/Library/Frameworks/Tcl.framework/Headers"
144- fi
145 TCL_INC=
146 for try in $tclinc; do
147 if test -f "$try/tcl.h"; then
148@@ -6875,12 +6839,8 @@ $as_echo "<not found>" >&6; }
149 if test -z "$SKIP_TCL"; then
150 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5
151 $as_echo_n "checking for location of tclConfig.sh script... " >&6; }
152- if test "x$MACOSX" != "xyes"; then
153 tclcnf=`echo $tclinc | sed s/include/lib/g`
154 tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
155- else
156- tclcnf="/System/Library/Frameworks/Tcl.framework"
157- fi
158 for try in $tclcnf; do
159 if test -f $try/tclConfig.sh; then
160 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5
161@@ -7050,10 +7010,6 @@ $as_echo "$rubyhdrdir" >&6; }
162 if test -f "$rubylibdir/$librubya"; then
163 librubyarg="$librubyarg"
164 RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
165- elif test -d "/System/Library/Frameworks/Ruby.framework"; then
166- RUBY_LIBS="-framework Ruby"
167- RUBY_CFLAGS="-DRUBY_VERSION=$rubyversion"
168- librubyarg=
169 fi
170
171 if test "X$librubyarg" != "X"; then
172@@ -14061,7 +14017,7 @@ fi
173
174 _ACEOF
175 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
176-exec 5>>auto/config.log
177+exec 5>>config.log
178 {
179 echo
180 sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
181@@ -14653,7 +14609,7 @@ if test "$no_create" != yes; then
182 ac_config_status_args="$ac_config_status_args --quiet"
183 exec 5>/dev/null
184 $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
185- exec 5>>auto/config.log
186+ exec 5>>config.log
187 # Use ||, not &&, to avoid exiting from the if with $? = 1, which
188 # would make configure fail if this is the last instruction.
189 $ac_cs_success || as_fn_exit 1
190
191diff --git a/src/Makefile b/src/Makefile
192index 1c4d104..fff2015 100644
193--- a/src/Makefile
194+++ b/src/Makefile
195@@ -1298,7 +1298,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \
196 MacVim/MacVim.m
197 MACVIMGUI_OBJ = objects/gui.o objects/gui_beval.o objects/pty.o \
198 objects/gui_macvim.o objects/MMBackend.o objects/MacVim.o
199-MACVIMGUI_DEFS = -DFEAT_GUI_MACVIM -Wall -Wno-unknown-pragmas -pipe
200+MACVIMGUI_DEFS = -DMACOS_X_UNIX -DFEAT_GUI_MACVIM -Wall -Wno-unknown-pragmas -pipe
201 MACVIMGUI_IPATH =
202 MACVIMGUI_LIBS_DIR =
203 MACVIMGUI_LIBS1 = -framework Cocoa -framework Carbon
204
205diff --git a/src/if_python.c b/src/if_python.c
206index b356bf7..b7bfa78 100644
207--- a/src/if_python.c
208+++ b/src/if_python.c
209@@ -55,11 +55,7 @@
210
211 #define PY_SSIZE_T_CLEAN
212
213-#ifdef FEAT_GUI_MACVIM
214-# include <Python/Python.h>
215-#else
216-# include <Python.h>
217-#endif
218+#include <Python.h>
219
220 #if !defined(PY_VERSION_HEX) || PY_VERSION_HEX < 0x02050000
221 # undef PY_SSIZE_T_CLEAN
222 MACVIMGUI_LIBS1 = -framework Cocoa -framework Carbon