diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-02-24 15:08:27 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-02-24 15:08:27 +0100 |
| commit | 48f80c276be2abfc405aa619492a1d688baa0c82 (patch) | |
| tree | 05d6604cceba92a79b26b5ee4ea5c130740506d4 /src/Make_ming.mak | |
| parent | 25153e127df4b4540692aa4682163b567808e002 (diff) | |
| download | vim-git-48f80c276be2abfc405aa619492a1d688baa0c82.tar.gz | |
updated for version 7.2.372v7.2.372
Problem: Cross-compiling GvimExt and xxd doesn't work.
Solution: Change the build files. (Markus Heidelberg)
Diffstat (limited to 'src/Make_ming.mak')
| -rw-r--r-- | src/Make_ming.mak | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/Make_ming.mak b/src/Make_ming.mak index ae28a3d47..ca630de80 100644 --- a/src/Make_ming.mak +++ b/src/Make_ming.mak @@ -241,15 +241,15 @@ DEF_GUI=-DFEAT_GUI_W32 -DFEAT_CLIPBOARD DEFINES=-DWIN32 -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) \ -DHAVE_PATHDEF -DFEAT_$(FEATURES) ifeq ($(CROSS),yes) -# cross-compiler: -CC = i586-pc-mingw32msvc-gcc +# cross-compiler prefix: +CROSS_COMPILE = i586-pc-mingw32msvc- DEL = rm MKDIR = mkdir -p -WINDRES = i586-pc-mingw32msvc-windres +DIRSLASH = / else # normal (Windows) compilation: -CC = gcc ifneq (sh.exe, $(SHELL)) +CROSS_COMPILE = DEL = rm MKDIR = mkdir -p DIRSLASH = / @@ -258,8 +258,9 @@ DEL = del MKDIR = mkdir DIRSLASH = \\ endif -WINDRES = windres endif +CC := $(CROSS_COMPILE)gcc +WINDRES := $(CROSS_COMPILE)windres #>>>>> end of choices ########################################################################### @@ -549,10 +550,11 @@ upx: exes upx vim.exe xxd/xxd.exe: xxd/xxd.c - $(MAKE) -C xxd -f Make_cyg.mak + $(MAKE) -C xxd -f Make_cyg.mak CC=$(CC) GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h $(MAKE) -C GvimExt -f Make_ming.mak + $(MAKE) -C GvimExt -f Make_ming.mak CROSS=$(CROSS) CROSS_COMPILE=$(CROSS_COMPILE) clean: -$(DEL) $(OUTDIR)$(DIRSLASH)*.o |