Mercurial > vim

comparison src/Make_mvc.mak @ 2329:ad2889f48843 vim73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added support for Python 3. (Roland Puntaier)
author Bram Moolenaar <bram@vim.org>
date Sat, 17 Jul 2010 21:19:38 +0200
parents 966a5609669e
children f6540762173d
comparison
equal deleted inserted replaced
2328:15379284e55a 2329:ad2889f48843
49 # 49 #
50 # Python interface: 50 # Python interface:
51 # PYTHON=[Path to Python directory] 51 # PYTHON=[Path to Python directory]
52 # DYNAMIC_PYTHON=yes (to load the Python DLL dynamically) 52 # DYNAMIC_PYTHON=yes (to load the Python DLL dynamically)
53 # PYTHON_VER=[Python version, eg 15, 20] (default is 22) 53 # PYTHON_VER=[Python version, eg 15, 20] (default is 22)
54 #
55 # Python3 interface:
56 # PYTHON3=[Path to Python3 directory]
57 # DYNAMIC_PYTHON3=yes (to load the Python3 DLL dynamically)
58 # PYTHON3_VER=[Python3 version, eg 30, 31] (default is 31)
54 # 59 #
55 # Ruby interface: 60 # Ruby interface:
56 # RUBY=[Path to Ruby directory] 61 # RUBY=[Path to Ruby directory]
57 # DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically) 62 # DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically)
58 # RUBY_VER=[Ruby version, eg 16, 17] (default is 18) 63 # RUBY_VER=[Ruby version, eg 16, 17] (default is 18)
163 !ifdef PERL 168 !ifdef PERL
164 OBJDIR = $(OBJDIR)L 169 OBJDIR = $(OBJDIR)L
165 !endif 170 !endif
166 !ifdef PYTHON 171 !ifdef PYTHON
167 OBJDIR = $(OBJDIR)Y 172 OBJDIR = $(OBJDIR)Y
173 !endif
174 !ifdef PYTHON3
175 OBJDIR = $(OBJDIR)H
168 !endif 176 !endif
169 !ifdef TCL 177 !ifdef TCL
170 OBJDIR = $(OBJDIR)T 178 OBJDIR = $(OBJDIR)T
171 !endif 179 !endif
172 !ifdef RUBY 180 !ifdef RUBY
639 !else 647 !else
640 LUA_LIB = "$(LUA)\lib\lua$(LUA_VER).lib" 648 LUA_LIB = "$(LUA)\lib\lua$(LUA_VER).lib"
641 !endif 649 !endif
642 !endif 650 !endif
643 651
652 !ifdef PYTHON
653 !ifdef PYTHON3
654 DYNAMIC_PYTHON=yes
655 DYNAMIC_PYTHON3=yes
656 !endif
657 !endif
658
644 # PYTHON interface 659 # PYTHON interface
645 !ifdef PYTHON 660 !ifdef PYTHON
646 !ifndef PYTHON_VER 661 !ifndef PYTHON_VER
647 PYTHON_VER = 22 662 PYTHON_VER = 22
648 !endif 663 !endif
657 CFLAGS = $(CFLAGS) -DDYNAMIC_PYTHON \ 672 CFLAGS = $(CFLAGS) -DDYNAMIC_PYTHON \
658 -DDYNAMIC_PYTHON_DLL=\"python$(PYTHON_VER).dll\" 673 -DDYNAMIC_PYTHON_DLL=\"python$(PYTHON_VER).dll\"
659 PYTHON_LIB = /nodefaultlib:python$(PYTHON_VER).lib 674 PYTHON_LIB = /nodefaultlib:python$(PYTHON_VER).lib
660 !else 675 !else
661 PYTHON_LIB = $(PYTHON)\libs\python$(PYTHON_VER).lib 676 PYTHON_LIB = $(PYTHON)\libs\python$(PYTHON_VER).lib
677 !endif
678 !endif
679
680 # PYTHON3 interface
681 !ifdef PYTHON3
682 !ifndef PYTHON3_VER
683 PYTHON3_VER = 31
684 !endif
685 !message Python3 requested (version $(PYTHON3_VER)) - root dir is "$(PYTHON3)"
686 !if "$(DYNAMIC_PYTHON3)" == "yes"
687 !message Python3 DLL will be loaded dynamically
688 !endif
689 CFLAGS = $(CFLAGS) -DFEAT_PYTHON3
690 PYTHON3_OBJ = $(OUTDIR)\if_python3.obj
691 PYTHON3_INC = /I "$(PYTHON3)\Include" /I "$(PYTHON3)\PC"
692 !if "$(DYNAMIC_PYTHON3)" == "yes"
693 CFLAGS = $(CFLAGS) -DDYNAMIC_PYTHON3 \
694 -DDYNAMIC_PYTHON3_DLL=\"python$(PYTHON3_VER).dll\"
695 PYTHON3_LIB = /nodefaultlib:python$(PYTHON3_VER).lib
696 !else
697 PYTHON3_LIB = $(PYTHON3)\libs\python$(PYTHON3_VER).lib
662 !endif 698 !endif
663 !endif 699 !endif
664 700
665 # MzScheme interface 701 # MzScheme interface
666 !ifdef MZSCHEME 702 !ifdef MZSCHEME
833 conflags = $(conflags) /map /mapinfo:lines 869 conflags = $(conflags) /map /mapinfo:lines
834 !ENDIF 870 !ENDIF
835 871
836 LINKARGS1 = $(linkdebug) $(conflags) 872 LINKARGS1 = $(linkdebug) $(conflags)
837 LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(LIBC) $(OLE_LIB) user32.lib $(SNIFF_LIB) \ 873 LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(LIBC) $(OLE_LIB) user32.lib $(SNIFF_LIB) \
838 $(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(RUBY_LIB) \ 874 $(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(RUBY_LIB) \
839 $(TCL_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(LINK_PDB) 875 $(TCL_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(LINK_PDB)
840 876
841 # Report link time code generation progress if used. 877 # Report link time code generation progress if used.
842 !ifdef NODEBUG 878 !ifdef NODEBUG
843 !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") 879 !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0")
849 885
850 all: $(VIM).exe vimrun.exe install.exe uninstal.exe xxd/xxd.exe \ 886 all: $(VIM).exe vimrun.exe install.exe uninstal.exe xxd/xxd.exe \
851 GvimExt/gvimext.dll 887 GvimExt/gvimext.dll
852 888
853 $(VIM).exe: $(OUTDIR) $(OBJ) $(GUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \ 889 $(VIM).exe: $(OUTDIR) $(OBJ) $(GUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \
854 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \ 890 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \
855 $(SNIFF_OBJ) $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(XPM_OBJ) \ 891 $(SNIFF_OBJ) $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(XPM_OBJ) \
856 version.c version.h 892 version.c version.h
857 $(CC) $(CFLAGS) version.c 893 $(CC) $(CFLAGS) version.c
858 $(link) $(LINKARGS1) -out:$(VIM).exe $(OBJ) $(GUI_OBJ) $(OLE_OBJ) \ 894 $(link) $(LINKARGS1) -out:$(VIM).exe $(OBJ) $(GUI_OBJ) $(OLE_OBJ) \
859 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(RUBY_OBJ) \ 895 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) \
860 $(TCL_OBJ) $(SNIFF_OBJ) $(CSCOPE_OBJ) $(NETBEANS_OBJ) \ 896 $(TCL_OBJ) $(SNIFF_OBJ) $(CSCOPE_OBJ) $(NETBEANS_OBJ) \
861 $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2) 897 $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2)
862 898
863 $(VIM): $(VIM).exe 899 $(VIM): $(VIM).exe
864 900
1013 mzscheme_base.c: 1049 mzscheme_base.c:
1014 $(MZSCHEME)\mzc --c-mods mzscheme_base.c ++lib scheme/base 1050 $(MZSCHEME)\mzc --c-mods mzscheme_base.c ++lib scheme/base
1015 1051
1016 $(OUTDIR)/if_python.obj: $(OUTDIR) if_python.c $(INCL) 1052 $(OUTDIR)/if_python.obj: $(OUTDIR) if_python.c $(INCL)
1017 $(CC) $(CFLAGS) $(PYTHON_INC) if_python.c 1053 $(CC) $(CFLAGS) $(PYTHON_INC) if_python.c
1054
1055 $(OUTDIR)/if_python3.obj: $(OUTDIR) if_python3.c $(INCL)
1056 $(CC) $(CFLAGS) $(PYTHON3_INC) if_python3.c
1018 1057
1019 $(OUTDIR)/if_ole.obj: $(OUTDIR) if_ole.cpp $(INCL) if_ole.h 1058 $(OUTDIR)/if_ole.obj: $(OUTDIR) if_ole.cpp $(INCL) if_ole.h
1020 1059
1021 $(OUTDIR)/if_ruby.obj: $(OUTDIR) if_ruby.c $(INCL) 1060 $(OUTDIR)/if_ruby.obj: $(OUTDIR) if_ruby.c $(INCL)
1022 $(CC) $(CFLAGS) $(RUBY_INC) if_ruby.c 1061 $(CC) $(CFLAGS) $(RUBY_INC) if_ruby.c