Mercurial > vim

comparison src/Make_mvc.mak @ 7609:77a14f3bc18b v7.4.1104

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/4e640bd930d133889dbc9f9a77e29bab902e3b7d Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 16 16:20:38 2016 +0100 patch 7.4.1104 Problem: Various problems building with MzScheme/Racket. Solution: Make it work with new versions of Racket. (Yukihiro Nakadaira, Ken Takata)
author Christian Brabandt <cb@256bit.org>
date Sat, 16 Jan 2016 16:30:04 +0100
parents 4447dc38bc22
children 854302b82ff9
comparison
equal deleted inserted replaced
7608:161471eae904 7609:77a14f3bc18b
753 !ifdef MZSCHEME 753 !ifdef MZSCHEME
754 !message MzScheme requested - root dir is "$(MZSCHEME)" 754 !message MzScheme requested - root dir is "$(MZSCHEME)"
755 !ifndef MZSCHEME_VER 755 !ifndef MZSCHEME_VER
756 MZSCHEME_VER = 205_000 756 MZSCHEME_VER = 205_000
757 !endif 757 !endif
758 CFLAGS = $(CFLAGS) -DFEAT_MZSCHEME -I $(MZSCHEME)\include 758 !ifndef MZSCHEME_COLLECTS
759 !if EXIST("$(MZSCHEME)\collects\scheme\base.ss") \ 759 MZSCHEME_COLLECTS=$(MZSCHEME)\collects
760 || EXIST("$(MZSCHEME)\collects\scheme\base.rkt") \ 760 !endif
761 || EXIST("$(MZSCHEME)\collects\racket\base.rkt") 761 CFLAGS = $(CFLAGS) -DFEAT_MZSCHEME -I "$(MZSCHEME)\include"
762 # for MzScheme >= 4 we need to include byte code for basic Scheme stuff
763 MZSCHEME_EXTRA_DEP = mzscheme_base.c
764 CFLAGS = $(CFLAGS) -DINCLUDE_MZSCHEME_BASE
765 !endif
766 !if EXIST("$(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib") 762 !if EXIST("$(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib")
767 MZSCHEME_MAIN_LIB=mzsch 763 MZSCHEME_MAIN_LIB=mzsch
768 !else 764 !else
769 MZSCHEME_MAIN_LIB=racket 765 MZSCHEME_MAIN_LIB=racket
770 !endif 766 !endif
771 !if EXIST("$(MZSCHEME)\lib\msvc\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib") \ 767 !if (EXIST("$(MZSCHEME)\lib\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll") \
772 && !EXIST("$(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib") 768 && !EXIST("$(MZSCHEME)\lib\libmzgc$(MZSCHEME_VER).dll")) \
769 || (EXIST("$(MZSCHEME)\lib\msvc\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib") \
770 && !EXIST("$(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib"))
773 !message Building with Precise GC 771 !message Building with Precise GC
774 MZSCHEME_PRECISE_GC = yes 772 MZSCHEME_PRECISE_GC = yes
775 CFLAGS = $(CFLAGS) -DMZ_PRECISE_GC 773 CFLAGS = $(CFLAGS) -DMZ_PRECISE_GC
776 !endif 774 !endif
777 !if "$(DYNAMIC_MZSCHEME)" == "yes" 775 !if "$(DYNAMIC_MZSCHEME)" == "yes"
776 !message MzScheme DLLs will be loaded dynamically
777 CFLAGS = $(CFLAGS) -DDYNAMIC_MZSCHEME
778 !if "$(MZSCHEME_PRECISE_GC)" == "yes" 778 !if "$(MZSCHEME_PRECISE_GC)" == "yes"
779 !error MzScheme with Precise GC cannot be loaded dynamically 779 # Precise GC does not use separate dll
780 !endif 780 CFLAGS = $(CFLAGS) \
781 !message MzScheme DLLs will be loaded dynamically 781 -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" \
782 CFLAGS = $(CFLAGS) -DDYNAMIC_MZSCHEME \ 782 -DDYNAMIC_MZGC_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\"
783 -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" \ 783 !else
784 -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\" 784 CFLAGS = $(CFLAGS) \
785 -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" \
786 -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
787 !endif
785 !else 788 !else
786 !if "$(MZSCHEME_DEBUG)" == "yes" 789 !if "$(MZSCHEME_DEBUG)" == "yes"
787 CFLAGS = $(CFLAGS) -DMZSCHEME_FORCE_GC 790 CFLAGS = $(CFLAGS) -DMZSCHEME_FORCE_GC
788 !endif 791 !endif
789 !if "$(MZSCHEME_PRECISE_GC)" == "yes" 792 !if "$(MZSCHEME_PRECISE_GC)" == "yes"
790 # Precise GC does not use separate dll 793 # Precise GC does not use separate dll
791 MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib 794 !if EXIST("$(MZSCHEME)\lib\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).def")
792 !else 795 # create .lib from .def
793 MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib \ 796 MZSCHEME_LIB = lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib
794 $(MZSCHEME)\lib\msvc\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib 797 MZSCHEME_EXTRA_DEP = lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib
798 !else
799 MZSCHEME_LIB = "$(MZSCHEME)\lib\msvc\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib"
800 !endif
801 !else
802 MZSCHEME_LIB = "$(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib" \
803 "$(MZSCHEME)\lib\msvc\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib"
795 !endif 804 !endif
796 !endif 805 !endif
797 MZSCHEME_OBJ = $(OUTDIR)\if_mzsch.obj 806 MZSCHEME_OBJ = $(OUTDIR)\if_mzsch.obj
798 # increase stack size 807 # increase stack size
799 MZSCHEME_LIB = $(MZSCHEME_LIB) /STACK:8388608 808 MZSCHEME_LIB = $(MZSCHEME_LIB) /STACK:8388608
1057 - if exist if_perl.c del if_perl.c 1066 - if exist if_perl.c del if_perl.c
1058 - if exist dimm.h del dimm.h 1067 - if exist dimm.h del dimm.h
1059 - if exist dimm_i.c del dimm_i.c 1068 - if exist dimm_i.c del dimm_i.c
1060 - if exist dimm.tlb del dimm.tlb 1069 - if exist dimm.tlb del dimm.tlb
1061 - if exist dosinst.exe del dosinst.exe 1070 - if exist dosinst.exe del dosinst.exe
1062 - if exist mzscheme_base.c del mzscheme_base.c
1063 cd xxd 1071 cd xxd
1064 $(MAKE) /NOLOGO -f Make_mvc.mak clean 1072 $(MAKE) /NOLOGO -f Make_mvc.mak clean
1065 cd .. 1073 cd ..
1066 cd tee 1074 cd tee
1067 $(MAKE) /NOLOGO -f Make_mvc.mak clean 1075 $(MAKE) /NOLOGO -f Make_mvc.mak clean
1170 $(OUTDIR)/if_perlsfio.obj: $(OUTDIR) if_perlsfio.c $(INCL) 1178 $(OUTDIR)/if_perlsfio.obj: $(OUTDIR) if_perlsfio.c $(INCL)
1171 $(CC) $(CFLAGS) $(PERL_INC) if_perlsfio.c 1179 $(CC) $(CFLAGS) $(PERL_INC) if_perlsfio.c
1172 1180
1173 $(OUTDIR)/if_mzsch.obj: $(OUTDIR) if_mzsch.c if_mzsch.h $(INCL) $(MZSCHEME_EXTRA_DEP) 1181 $(OUTDIR)/if_mzsch.obj: $(OUTDIR) if_mzsch.c if_mzsch.h $(INCL) $(MZSCHEME_EXTRA_DEP)
1174 $(CC) $(CFLAGS) if_mzsch.c \ 1182 $(CC) $(CFLAGS) if_mzsch.c \
1175 -DMZSCHEME_COLLECTS=\"$(MZSCHEME:\=\\)\\collects\" 1183 -DMZSCHEME_COLLECTS="\"$(MZSCHEME_COLLECTS:\=\\)\""
1176 mzscheme_base.c: 1184
1177 !IF "$(MZSCHEME_MAIN_LIB)" == "racket" 1185 lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib:
1178 $(MZSCHEME)\raco ctool --c-mods mzscheme_base.c ++lib scheme/base 1186 lib /DEF:"$(MZSCHEME)\lib\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).def"
1179 !ELSE
1180 $(MZSCHEME)\mzc --c-mods mzscheme_base.c ++lib scheme/base
1181 !ENDIF
1182 1187
1183 $(OUTDIR)/if_python.obj: $(OUTDIR) if_python.c if_py_both.h $(INCL) 1188 $(OUTDIR)/if_python.obj: $(OUTDIR) if_python.c if_py_both.h $(INCL)
1184 $(CC) $(CFLAGS) $(PYTHON_INC) if_python.c 1189 $(CC) $(CFLAGS) $(PYTHON_INC) if_python.c
1185 1190
1186 $(OUTDIR)/if_python3.obj: $(OUTDIR) if_python3.c if_py_both.h $(INCL) 1191 $(OUTDIR)/if_python3.obj: $(OUTDIR) if_python3.c if_py_both.h $(INCL)