Mercurial > vim

comparison src/Make_ming.mak @ 2088:4ec11bb387a5 v7.2.372

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.2.372 Problem: Cross-compiling GvimExt and xxd doesn't work. Solution: Change the build files. (Markus Heidelberg)
author Bram Moolenaar <bram@zimbu.org>
date Wed, 24 Feb 2010 15:08:27 +0100
parents f234c87ac7e9
children 0e4631bf9441
comparison
equal deleted inserted replaced
2087:3112fcc89238 2088:4ec11bb387a5
239 # Any other defines can be included here. 239 # Any other defines can be included here.
240 DEF_GUI=-DFEAT_GUI_W32 -DFEAT_CLIPBOARD 240 DEF_GUI=-DFEAT_GUI_W32 -DFEAT_CLIPBOARD
241 DEFINES=-DWIN32 -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) \ 241 DEFINES=-DWIN32 -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) \
242 -DHAVE_PATHDEF -DFEAT_$(FEATURES) 242 -DHAVE_PATHDEF -DFEAT_$(FEATURES)
243 ifeq ($(CROSS),yes) 243 ifeq ($(CROSS),yes)
244 # cross-compiler: 244 # cross-compiler prefix:
245 CC = i586-pc-mingw32msvc-gcc 245 CROSS_COMPILE = i586-pc-mingw32msvc-
246 DEL = rm
247 MKDIR = mkdir -p
248 WINDRES = i586-pc-mingw32msvc-windres
249 else
250 # normal (Windows) compilation:
251 CC = gcc
252 ifneq (sh.exe, $(SHELL))
253 DEL = rm 246 DEL = rm
254 MKDIR = mkdir -p 247 MKDIR = mkdir -p
255 DIRSLASH = / 248 DIRSLASH = /
256 else 249 else
250 # normal (Windows) compilation:
251 ifneq (sh.exe, $(SHELL))
252 CROSS_COMPILE =
253 DEL = rm
254 MKDIR = mkdir -p
255 DIRSLASH = /
256 else
257 DEL = del 257 DEL = del
258 MKDIR = mkdir 258 MKDIR = mkdir
259 DIRSLASH = \\ 259 DIRSLASH = \\
260 endif 260 endif
261 WINDRES = windres 261 endif
262 endif 262 CC := $(CROSS_COMPILE)gcc
263 WINDRES := $(CROSS_COMPILE)windres
263 264
264 #>>>>> end of choices 265 #>>>>> end of choices
265 ########################################################################### 266 ###########################################################################
266 267
267 CFLAGS = -Iproto $(DEFINES) -pipe -w -march=$(ARCH) -Wall 268 CFLAGS = -Iproto $(DEFINES) -pipe -w -march=$(ARCH) -Wall
547 upx: exes 548 upx: exes
548 upx gvim.exe 549 upx gvim.exe
549 upx vim.exe 550 upx vim.exe
550 551
551 xxd/xxd.exe: xxd/xxd.c 552 xxd/xxd.exe: xxd/xxd.c
552 $(MAKE) -C xxd -f Make_cyg.mak 553 $(MAKE) -C xxd -f Make_cyg.mak CC=$(CC)
553 554
554 GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h 555 GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h
555 $(MAKE) -C GvimExt -f Make_ming.mak 556 $(MAKE) -C GvimExt -f Make_ming.mak
557 $(MAKE) -C GvimExt -f Make_ming.mak CROSS=$(CROSS) CROSS_COMPILE=$(CROSS_COMPILE)
556 558
557 clean: 559 clean:
558 -$(DEL) $(OUTDIR)$(DIRSLASH)*.o 560 -$(DEL) $(OUTDIR)$(DIRSLASH)*.o
559 -$(DEL) $(OUTDIR)$(DIRSLASH)*.res 561 -$(DEL) $(OUTDIR)$(DIRSLASH)*.res
560 -rmdir $(OUTDIR) 562 -rmdir $(OUTDIR)