Mercurial > vim

comparison src/Make_cyg.mak @ 4124:448a6e7cf32e v7.3.815

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.815 Problem: Building with Cygwin and Ruby doesn't work. Solution: Copy some things from the MingW build file. (Ken Takata)
author Bram Moolenaar <bram@vim.org>
date Wed, 13 Feb 2013 17:06:11 +0100
parents a6e60677aea7
children 4936ee89b4bc
comparison
equal deleted inserted replaced
4123:8815a4cf0650 4124:448a6e7cf32e
45 # CPUNR No longer supported, use ARCH. 45 # CPUNR No longer supported, use ARCH.
46 # ARCH i386 through pentium4: select -march argument to compile with 46 # ARCH i386 through pentium4: select -march argument to compile with
47 # (i386) 47 # (i386)
48 # USEDLL no or yes: set to yes to use the Runtime library DLL (no) 48 # USEDLL no or yes: set to yes to use the Runtime library DLL (no)
49 # For USEDLL=yes the cygwin1.dll is required to run Vim. 49 # For USEDLL=yes the cygwin1.dll is required to run Vim.
50 # "no" does not work with latest version of Cygwin, use 50 # For "no" the mingw-gcc-g++ package or the mingw64-i686-gcc-g++
51 # Make_ming.mak instead. Or set CC to gcc-3 and add 51 # package is required to complie Vim. Or set CC to gcc-3 and add
52 # -L/lib/w32api to EXTRA_LIBS. 52 # -L/lib/w32api to EXTRA_LIBS.
53 # POSTSCRIPT no or yes: set to yes for PostScript printing (no) 53 # POSTSCRIPT no or yes: set to yes for PostScript printing (no)
54 # FEATURES TINY, SMALL, NORMAL, BIG or HUGE (BIG) 54 # FEATURES TINY, SMALL, NORMAL, BIG or HUGE (BIG)
55 # WINVER Lowest Win32 version to support. (0x0500) 55 # WINVER Lowest Win32 version to support. (0x0500)
56 # CSCOPE no or yes: to include cscope interface support (yes) 56 # CSCOPE no or yes: to include cscope interface support (yes)
112 DEFINES = -DWIN32 -DHAVE_PATHDEF -DFEAT_$(FEATURES) \ 112 DEFINES = -DWIN32 -DHAVE_PATHDEF -DFEAT_$(FEATURES) \
113 -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) 113 -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER)
114 INCLUDES = -march=$(ARCH) -Iproto 114 INCLUDES = -march=$(ARCH) -Iproto
115 115
116 #>>>>> name of the compiler and linker, name of lib directory 116 #>>>>> name of the compiler and linker, name of lib directory
117 CROSS_COMPILE = 117 ifeq (yes, $(USEDLL))
118 # CROSS_COMPILE is used for the gvimext DLL.
119 CROSS_COMPILE = i686-pc-mingw32-
118 CC = gcc 120 CC = gcc
119 RC = windres 121 RC = windres
122 else
123 # i686-pc-mingw32-gcc, i686-w64-mingw32-gcc or gcc-3 can be used.
124 CROSS_COMPILE = i686-pc-mingw32-
125 CC = $(CROSS_COMPILE)gcc
126 RC = $(CROSS_COMPILE)windres
127 endif
120 128
121 ############################## 129 ##############################
122 # DYNAMIC_PERL=yes and no both work 130 # DYNAMIC_PERL=yes and no both work
123 ############################## 131 ##############################
124 ifdef PERL 132 ifdef PERL
191 # DYNAMIC_RUBY=yes works. 199 # DYNAMIC_RUBY=yes works.
192 # DYNAMIC_RUBY=no does not (process exits). 200 # DYNAMIC_RUBY=no does not (process exits).
193 ############################## 201 ##############################
194 ifdef RUBY 202 ifdef RUBY
195 203
204 ifndef DYNAMIC_RUBY
205 DYNAMIC_RUBY=yes
206 endif
207 # Set default value
196 ifndef RUBY_VER 208 ifndef RUBY_VER
197 RUBY_VER=16 209 RUBY_VER = 16
198 endif 210 endif
199
200 ifndef RUBY_VER_LONG 211 ifndef RUBY_VER_LONG
201 RUBY_VER_LONG=1.6 212 RUBY_VER_LONG = 1.6
202 endif 213 endif
203 214 ifndef RUBY_API_VER
204 ifndef DYNAMIC_RUBY 215 RUBY_API_VER = $(subst .,,$(RUBY_VER_LONG))
205 DYNAMIC_RUBY = yes 216 endif
206 endif 217
207 218 ifndef RUBY_PLATFORM
208 ifeq ($(RUBY_VER), 16) 219 ifeq ($(RUBY_VER), 16)
209 ifndef RUBY_PLATFORM
210 RUBY_PLATFORM = i586-mswin32 220 RUBY_PLATFORM = i586-mswin32
211 endif 221 else
222 ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32),)
223 RUBY_PLATFORM = i386-mingw32
224 else
225 RUBY_PLATFORM = i386-mswin32
226 endif
227 endif
228 endif
229
212 ifndef RUBY_INSTALL_NAME 230 ifndef RUBY_INSTALL_NAME
213 RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER) 231 ifeq ($(RUBY_VER), 16)
214 endif 232 RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER)
215 else 233 else
216 ifndef RUBY_PLATFORM 234 RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_API_VER)
217 RUBY_PLATFORM = i386-mswin32
218 endif
219 ifndef RUBY_INSTALL_NAME
220 RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER)
221 endif 235 endif
222 endif 236 endif
223 237
224 ifeq (19, $(word 1,$(sort 19 $(RUBY_VER)))) 238 ifeq (19, $(word 1,$(sort 19 $(RUBY_VER))))
225 RUBY_19_OR_LATER = 1 239 RUBY_19_OR_LATER = 1
226 endif 240 endif
227 241
228 DEFINES += -DFEAT_RUBY 242 DEFINES += -DFEAT_RUBY
243 ifneq ($(findstring w64-mingw32,$(CC)),)
244 # A workaround for mingw-w64
245 DEFINES += -DHAVE_STRUCT_TIMESPEC -DHAVE_STRUCT_TIMEZONE
246 endif
229 INCLUDES += -I$(RUBY)/lib/ruby/$(RUBY_VER_LONG)/$(RUBY_PLATFORM) 247 INCLUDES += -I$(RUBY)/lib/ruby/$(RUBY_VER_LONG)/$(RUBY_PLATFORM)
230 ifdef RUBY_19_OR_LATER 248 ifdef RUBY_19_OR_LATER
231 INCLUDES += -I$(RUBY)/include/ruby-$(RUBY_VER_LONG) -I$(RUBY)/include/ruby-$(RUBY_VER_LONG)/$(RUBY_PLATFORM) 249 INCLUDES += -I$(RUBY)/include/ruby-$(RUBY_VER_LONG) -I$(RUBY)/include/ruby-$(RUBY_VER_LONG)/$(RUBY_PLATFORM)
232 endif 250 endif
233 EXTRA_OBJS += $(OUTDIR)/if_ruby.o 251 EXTRA_OBJS += $(OUTDIR)/if_ruby.o