Mercurial > vim

comparison src/Make_mvc.mak @ 3722:a6ebae140d89 v7.3.620

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.620 Problem: Building with recent Ruby on Win32 doesn't work. Solution: Add a separate argument for the API version. (Yasuhiro Matsumoto)
author Bram Moolenaar <bram@vim.org>
date Thu, 02 Aug 2012 21:21:47 +0200
parents 045fdc5b6056
children 52247eb61511
comparison
equal deleted inserted replaced
3721:ba2679965d9c 3722:a6ebae140d89
61 # RUBY=[Path to Ruby directory] 61 # RUBY=[Path to Ruby directory]
62 # DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically) 62 # DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically)
63 # RUBY_VER=[Ruby version, eg 16, 17] (default is 18) 63 # RUBY_VER=[Ruby version, eg 16, 17] (default is 18)
64 # RUBY_VER_LONG=[Ruby version, eg 1.6, 1.7] (default is 1.8) 64 # RUBY_VER_LONG=[Ruby version, eg 1.6, 1.7] (default is 1.8)
65 # You must set RUBY_VER_LONG when change RUBY_VER. 65 # You must set RUBY_VER_LONG when change RUBY_VER.
66 # You must set RUBY_API_VER to RUBY_VER_LONG.
67 # Don't set ruby API version to RUBY_VER like 191.
66 # 68 #
67 # Tcl interface: 69 # Tcl interface:
68 # TCL=[Path to Tcl directory] 70 # TCL=[Path to Tcl directory]
69 # DYNAMIC_TCL=yes (to load the Tcl DLL dynamically) 71 # DYNAMIC_TCL=yes (to load the Tcl DLL dynamically)
70 # TCL_VER=[Tcl version, e.g. 80, 83] (default is 83) 72 # TCL_VER=[Tcl version, e.g. 80, 83] (default is 83)
805 RUBY_VER = 18 807 RUBY_VER = 18
806 !endif 808 !endif
807 !ifndef RUBY_VER_LONG 809 !ifndef RUBY_VER_LONG
808 RUBY_VER_LONG = 1.8 810 RUBY_VER_LONG = 1.8
809 !endif 811 !endif
812 !ifndef RUBY_API_VER
813 RUBY_API_VER = $(RUBY_VER_LONG:.=)
814 !endif
810 815
811 !if $(RUBY_VER) >= 18 816 !if $(RUBY_VER) >= 18
812 !ifndef RUBY_PLATFORM 817 !ifndef RUBY_PLATFORM
813 RUBY_PLATFORM = i386-mswin32 818 RUBY_PLATFORM = i386-mswin32
814 !endif 819 !endif
815 !ifndef RUBY_INSTALL_NAME 820 !ifndef RUBY_INSTALL_NAME
816 RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER) 821 RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_API_VER)
817 !endif 822 !endif
818 !else 823 !else
819 !ifndef RUBY_PLATFORM 824 !ifndef RUBY_PLATFORM
820 RUBY_PLATFORM = i586-mswin32 825 RUBY_PLATFORM = i586-mswin32
821 !endif 826 !endif
822 !ifndef RUBY_INSTALL_NAME 827 !ifndef RUBY_INSTALL_NAME
823 RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER) 828 RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER)
824 !endif 829 !endif
825 !endif # $(RUBY_VER) >= 18 830 !endif # $(RUBY_VER) >= 18
826 831
827 !message Ruby requested (version $(RUBY_VER)) - root dir is "$(RUBY)" 832 !message Ruby requested (version $(RUBY_VER)) - root dir is "$(RUBY)"
828 CFLAGS = $(CFLAGS) -DFEAT_RUBY 833 CFLAGS = $(CFLAGS) -DFEAT_RUBY
829 RUBY_OBJ = $(OUTDIR)\if_ruby.obj 834 RUBY_OBJ = $(OUTDIR)\if_ruby.obj
830 !if $(RUBY_VER) >= 190 835 !if $(RUBY_VER) >= 19
831 RUBY_INC = /I "$(RUBY)\include\ruby-$(RUBY_VER_LONG)\$(RUBY_PLATFORM)" /I "$(RUBY)\include\ruby-$(RUBY_VER_LONG)" 836 RUBY_INC = /I "$(RUBY)\lib\ruby\$(RUBY_VER_LONG)\$(RUBY_PLATFORM)" /I "$(RUBY)\include\ruby-$(RUBY_VER_LONG)" /I "$(RUBY)\include\ruby-$(RUBY_VER_LONG)\$(RUBY_PLATFORM)"
832 !else 837 !else
833 RUBY_INC = /I "$(RUBY)\lib\ruby\$(RUBY_VER_LONG)\$(RUBY_PLATFORM)" 838 RUBY_INC = /I "$(RUBY)\lib\ruby\$(RUBY_VER_LONG)\$(RUBY_PLATFORM)"
834 !endif 839 !endif
835 RUBY_LIB = $(RUBY)\lib\$(RUBY_INSTALL_NAME).lib 840 RUBY_LIB = $(RUBY)\lib\$(RUBY_INSTALL_NAME).lib
836 # Do we want to load Ruby dynamically? 841 # Do we want to load Ruby dynamically?