Skip to content

Commit 96e7a6e

Browse files
brammoolbrammool
committed
patch 8.0.1141: MS-Windows build dependencies are incomplete
Problem: MS-Windows build dependencies are incomplete. Solution: Fix the dependencies. (Ken Takata)
1 parent bb3e641 commit 96e7a6e

File tree

5 files changed

+41
-42
lines changed

5 files changed

+41
-42
lines changed

‎src/Make_cyg.mak‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,5 @@ CROSS_COMPILE = i686-pc-mingw32-
5050
# Do not change this.
5151
UNDER_CYGWIN = yes
5252
include Make_cyg_ming.mak
53+
54+
# vim: set noet sw=8 ts=8 sts=0 wm=0 tw=0:

‎src/Make_cyg_ming.mak‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -913,74 +913,75 @@ endif
913913
$(MAKE) -C xxd -f Make_ming.mak clean
914914

915915
###########################################################################
916-
INCL = vim.h feature.h os_win32.h os_dos.h ascii.h keymap.h term.h macros.h \
917-
structs.h regexp.h option.h ex_cmds.h proto.h globals.h farsi.h \
918-
gui.h
916+
INCL = vim.h alloc.h arabic.h ascii.h ex_cmds.h farsi.h feature.h globals.h \
917+
keymap.h macros.h option.h os_dos.h os_win32.h proto.h regexp.h \
918+
spell.h structs.h term.h $(NBDEBUG_INCL)
919+
GUI_INCL = gui.h gui_beval.h
919920
CUI_INCL = iscygpty.h
920921

921-
$(OUTDIR)/if_python.o : if_python.c if_py_both.h $(INCL)
922+
$(OUTDIR)/if_python.o: if_python.c if_py_both.h $(INCL)
922923
$(CC) -c $(CFLAGS) $(PYTHONINC) $(PYTHON_HOME_DEF) $< -o $@
923924

924-
$(OUTDIR)/if_python3.o : if_python3.c if_py_both.h $(INCL)
925+
$(OUTDIR)/if_python3.o: if_python3.c if_py_both.h $(INCL)
925926
$(CC) -c $(CFLAGS) $(PYTHON3INC) $(PYTHON3_HOME_DEF) $< -o $@
926927

927928
$(OUTDIR)/%.o : %.c $(INCL)
928929
$(CC) -c $(CFLAGS) $< -o $@
929930

930-
$(OUTDIR)/vimrc.o: vim.rc version.h gui_w32_rc.h
931+
$(OUTDIR)/vimrc.o: vim.rc version.h gui_w32_rc.h
931932
$(WINDRES) $(WINDRES_FLAGS) $(DEFINES) \
932933
--input-format=rc --output-format=coff -i vim.rc -o $@
933934

934935
$(OUTDIR):
935936
$(MKDIR) $(OUTDIR)
936937

937-
$(OUTDIR)/channel.o: channel.c $(INCL)
938-
$(CC) -c $(CFLAGS) channel.c -o $(OUTDIR)/channel.o
939-
940-
$(OUTDIR)/ex_docmd.o: ex_docmd.c $(INCL) ex_cmds.h
941-
$(CC) -c $(CFLAGS) ex_docmd.c -o $(OUTDIR)/ex_docmd.o
942-
943-
$(OUTDIR)/ex_eval.o: ex_eval.c $(INCL) ex_cmds.h
944-
$(CC) -c $(CFLAGS) ex_eval.c -o $(OUTDIR)/ex_eval.o
945-
946938
$(OUTDIR)/gui_dwrite.o: gui_dwrite.cpp $(INCL) gui_dwrite.h
947939
$(CC) -c $(CFLAGS) $(CXXFLAGS) gui_dwrite.cpp -o $(OUTDIR)/gui_dwrite.o
948940

949-
$(OUTDIR)/gui_w32.o: gui_w32.c $(INCL)
941+
$(OUTDIR)/gui.o: gui.c $(INCL) $(GUI_INCL)
942+
$(CC) -c $(CFLAGS) gui.c -o $(OUTDIR)/gui.o
943+
944+
$(OUTDIR)/gui_beval.o: gui_beval.c $(INCL) $(GUI_INCL)
945+
$(CC) -c $(CFLAGS) gui_beval.c -o $(OUTDIR)/gui_beval.o
946+
947+
$(OUTDIR)/gui_w32.o: gui_w32.c $(INCL) $(GUI_INCL)
950948
$(CC) -c $(CFLAGS) gui_w32.c -o $(OUTDIR)/gui_w32.o
951949

952950
$(OUTDIR)/if_cscope.o: if_cscope.c $(INCL) if_cscope.h
953951
$(CC) -c $(CFLAGS) if_cscope.c -o $(OUTDIR)/if_cscope.o
954952

955-
$(OUTDIR)/if_mzsch.o: if_mzsch.c $(INCL) if_mzsch.h $(MZ_EXTRA_DEP)
953+
$(OUTDIR)/if_mzsch.o: if_mzsch.c $(INCL) $(MZSCHEME_INCL) $(MZ_EXTRA_DEP)
956954
$(CC) -c $(CFLAGS) if_mzsch.c -o $(OUTDIR)/if_mzsch.o
957955

958956
mzscheme_base.c:
959957
$(MZSCHEME)/mzc --c-mods mzscheme_base.c ++lib scheme/base
960958

961959
# Remove -D__IID_DEFINED__ for newer versions of the w32api
962-
$(OUTDIR)/if_ole.o: if_ole.cpp $(INCL)
960+
$(OUTDIR)/if_ole.o: if_ole.cpp $(INCL) if_ole.h
963961
$(CC) $(CFLAGS) $(CXXFLAGS) -c -o $(OUTDIR)/if_ole.o if_ole.cpp
964962

965-
if_perl.c: if_perl.xs typemap
963+
if_perl.c: if_perl.xs typemap
966964
$(XSUBPP) -prototypes -typemap \
967965
$(PERLTYPEMAP) if_perl.xs -output $@
968966

969-
$(OUTDIR)/if_ruby.o: if_ruby.c $(INCL)
967+
$(OUTDIR)/if_ruby.o: if_ruby.c $(INCL)
970968
ifeq (16, $(RUBY))
971969
$(CC) $(CFLAGS) -U_WIN32 -c -o $(OUTDIR)/if_ruby.o if_ruby.c
972970
endif
973971

974972
$(OUTDIR)/iscygpty.o: iscygpty.c $(CUI_INCL)
975973
$(CC) -c $(CFLAGS) iscygpty.c -o $(OUTDIR)/iscygpty.o -U_WIN32_WINNT -D_WIN32_WINNT=0x0600 -DUSE_DYNFILEID -DENABLE_STUB_IMPL
976974

977-
$(OUTDIR)/main.o: main.c $(INCL) $(CUI_INCL)
975+
$(OUTDIR)/main.o: main.c $(INCL) $(CUI_INCL)
978976
$(CC) -c $(CFLAGS) main.c -o $(OUTDIR)/main.o
979977

980978
$(OUTDIR)/netbeans.o: netbeans.c $(INCL) $(NBDEBUG_INCL) $(NBDEBUG_SRC)
981979
$(CC) -c $(CFLAGS) netbeans.c -o $(OUTDIR)/netbeans.o
982980

983-
$(OUTDIR)/regexp.o: regexp.c regexp_nfa.c $(INCL)
981+
$(OUTDIR)/os_win32.o: os_win32.c $(INCL) $(MZSCHEME_INCL)
982+
$(CC) -c $(CFLAGS) os_win32.c -o $(OUTDIR)/os_win32.o
983+
984+
$(OUTDIR)/regexp.o: regexp.c regexp_nfa.c $(INCL)
984985
$(CC) -c $(CFLAGS) regexp.c -o $(OUTDIR)/regexp.o
985986

986987
$(OUTDIR)/terminal.o: terminal.c $(INCL) $(TERM_DEPS)
@@ -1042,3 +1043,5 @@ else
10421043
@echo char_u *compiled_user = (char_u *)"$(USERNAME)"; >> pathdef.c
10431044
@echo char_u *compiled_sys = (char_u *)"$(USERDOMAIN)"; >> pathdef.c
10441045
endif
1046+
1047+
# vim: set noet sw=8 ts=8 sts=0 wm=0 tw=0:

‎src/Make_ming.mak‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,5 @@
4747
# Do not change this.
4848
UNDER_CYGWIN = no
4949
include Make_cyg_ming.mak
50+
51+
# vim: set noet sw=8 ts=8 sts=0 wm=0 tw=0:

‎src/Make_mvc.mak‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -673,9 +673,9 @@ CFLAGS = $(CFLAGS) /Zl /MTd
673673
! endif
674674
!endif # DEBUG
675675

676-
INCL = vim.h os_win32.h ascii.h feature.h globals.h keymap.h macros.h \
677-
proto.h option.h structs.h term.h $(CSCOPE_INCL) \
678-
$(NBDEBUG_INCL)
676+
INCL = vim.h alloc.h arabic.h ascii.h ex_cmds.h farsi.h feature.h globals.h \
677+
keymap.h macros.h option.h os_dos.h os_win32.h proto.h regexp.h \
678+
spell.h structs.h term.h $(NBDEBUG_INCL)
679679

680680
OBJ = \
681681
$(OUTDIR)\arabic.obj \
@@ -774,18 +774,7 @@ RCFLAGS = $(RCFLAGS) -DFEAT_GUI_W32
774774
VIM = g$(VIM)
775775
GUI_INCL = \
776776
gui.h \
777-
regexp.h \
778-
ascii.h \
779-
ex_cmds.h \
780-
farsi.h \
781-
feature.h \
782-
globals.h \
783-
gui_beval.h \
784-
keymap.h \
785-
macros.h \
786-
option.h \
787-
os_dos.h \
788-
os_win32.h
777+
gui_beval.h
789778
GUI_OBJ = \
790779
$(OUTDIR)\gui.obj \
791780
$(OUTDIR)\gui_beval.obj \
@@ -979,6 +968,7 @@ MZSCHEME_LIB = "$(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib" \
979968
MZSCHEME_OBJ = $(OUTDIR)\if_mzsch.obj
980969
# increase stack size
981970
MZSCHEME_LIB = $(MZSCHEME_LIB) /STACK:8388608
971+
MZSCHEME_INCL = if_mzsch.h
982972
!endif
983973

984974
# Perl interface
@@ -1318,9 +1308,9 @@ $(OUTDIR)/ex_cmds.obj: $(OUTDIR) ex_cmds.c $(INCL)
13181308

13191309
$(OUTDIR)/ex_cmds2.obj: $(OUTDIR) ex_cmds2.c $(INCL)
13201310

1321-
$(OUTDIR)/ex_docmd.obj: $(OUTDIR) ex_docmd.c $(INCL) ex_cmds.h
1311+
$(OUTDIR)/ex_docmd.obj: $(OUTDIR) ex_docmd.c $(INCL)
13221312

1323-
$(OUTDIR)/ex_eval.obj: $(OUTDIR) ex_eval.c $(INCL) ex_cmds.h
1313+
$(OUTDIR)/ex_eval.obj: $(OUTDIR) ex_eval.c $(INCL)
13241314

13251315
$(OUTDIR)/ex_getln.obj: $(OUTDIR) ex_getln.c $(INCL)
13261316

@@ -1344,7 +1334,7 @@ $(OUTDIR)/gui_w32.obj: $(OUTDIR) gui_w32.c $(INCL) $(GUI_INCL)
13441334

13451335
$(OUTDIR)/gui_dwrite.obj: $(OUTDIR) gui_dwrite.cpp $(INCL) $(GUI_INCL)
13461336

1347-
$(OUTDIR)/if_cscope.obj: $(OUTDIR) if_cscope.c $(INCL)
1337+
$(OUTDIR)/if_cscope.obj: $(OUTDIR) if_cscope.c $(INCL) if_cscope.h
13481338

13491339
$(OUTDIR)/if_lua.obj: $(OUTDIR) if_lua.c $(INCL)
13501340
$(CC) $(CFLAGS_OUTDIR) $(LUA_INC) if_lua.c
@@ -1359,7 +1349,7 @@ $(OUTDIR)/if_perl.obj: $(OUTDIR) if_perl.c $(INCL)
13591349
$(OUTDIR)/if_perlsfio.obj: $(OUTDIR) if_perlsfio.c $(INCL)
13601350
$(CC) $(CFLAGS_OUTDIR) $(PERL_INC) if_perlsfio.c
13611351

1362-
$(OUTDIR)/if_mzsch.obj: $(OUTDIR) if_mzsch.c if_mzsch.h $(INCL) $(MZSCHEME_EXTRA_DEP)
1352+
$(OUTDIR)/if_mzsch.obj: $(OUTDIR) if_mzsch.c $(MZSCHEME_INCL) $(INCL) $(MZSCHEME_EXTRA_DEP)
13631353
$(CC) $(CFLAGS_OUTDIR) if_mzsch.c \
13641354
-DMZSCHEME_COLLECTS="\"$(MZSCHEME_COLLECTS:\=\\)\""
13651355

@@ -1423,7 +1413,7 @@ $(OUTDIR)/terminal.obj: $(OUTDIR) terminal.c $(INCL) $(TERM_DEPS)
14231413

14241414
$(OUTDIR)/winclip.obj: $(OUTDIR) winclip.c $(INCL)
14251415

1426-
$(OUTDIR)/os_win32.obj: $(OUTDIR) os_win32.c $(INCL) os_win32.h
1416+
$(OUTDIR)/os_win32.obj: $(OUTDIR) os_win32.c $(INCL) $(MZSCHEME_INCL)
14271417

14281418
$(OUTDIR)/os_w32exe.obj: $(OUTDIR) os_w32exe.c $(INCL)
14291419

‎src/version.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,8 @@ static char *(features[]) =
761761

762762
static int included_patches[] =
763763
{ /* Add new patch number below this line */
764+
/**/
765+
1141,
764766
/**/
765767
1140,
766768
/**/

0 commit comments

Comments
 (0)