Before for xxd and GvimExt the normal compiler was invoked.
Also introduce the CROSS_COMPILE variable for the cross-compiler prefix,
now you don't have to set CC, CXX and WINDRES separately any more, if it
differs from the default values.
---
src/GvimExt/Make_ming.mak | 8 ++------
src/Make_cyg.mak | 5 +++--
src/Make_ming.mak | 15 ++++++++-------
src/xxd/Make_cyg.mak | 2 +-
4 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/src/GvimExt/Make_ming.mak b/src/GvimExt/Make_ming.mak
index f10f730..5997e7e 100644
--- a/src/GvimExt/Make_ming.mak
+++ b/src/GvimExt/Make_ming.mak
@@ -20,17 +20,11 @@ MINGWOLD = no
ifeq ($(CROSS),yes)
DEL = rm
ifeq ($(MINGWOLD),yes)
-CXX = i586-mingw32msvc-g++
CXXFLAGS := -O2 -mno-cygwin -fvtable-thunks
-WINDRES = i586-mingw32msvc-windres
else
-CXX = i386-mingw32msvc-g++
CXXFLAGS := -O2 -mno-cygwin
-WINDRES = i386-mingw32msvc-windres
endif
else
-CXX := g++
-WINDRES := windres
CXXFLAGS := -O2 -mno-cygwin
ifneq (sh.exe, $(SHELL))
DEL = rm
@@ -38,6 +32,8 @@ else
DEL = del
endif
endif
+CXX := $(CROSS_COMPILE)g++
+WINDRES := $(CROSS_COMPILE)windres
LIBS := -luuid
RES := gvimext.res
DEFFILE = gvimext_ming.def
diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
index eaf7309..3eaf423 100644
--- a/src/Make_cyg.mak
+++ b/src/Make_cyg.mak
@@ -99,6 +99,7 @@ DEFINES = -DWIN32 -DHAVE_PATHDEF -DFEAT_$(FEATURES) \
INCLUDES = -march=$(ARCH) -Iproto
#>>>>> name of the compiler and linker, name of lib directory
+CROSS_COMPILE =
CC = gcc
RC = windres
@@ -446,10 +447,10 @@ $(EXE): $(OUTDIR) $(OBJ)
$(CC) $(CFLAGS) -o $(EXE) $(OBJ) $(LIBS) -luuid -lole32 $(EXTRA_LIBS)
xxd/xxd.exe: xxd/xxd.c
- $(MAKE) -C xxd -f Make_cyg.mak USEDLL=$(USEDLL)
+ $(MAKE) -C xxd -f Make_cyg.mak CC=$(CC) USEDLL=$(USEDLL)
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_COMPILE=$(CROSS_COMPILE)
vimrun.exe: vimrun.c
$(CC) $(CFLAGS) -o vimrun.exe vimrun.c $(LIBS)
diff --git a/src/Make_ming.mak b/src/Make_ming.mak
index 6d28e46..f935d0b 100644
--- a/src/Make_ming.mak
+++ b/src/Make_ming.mak
@@ -228,14 +228,14 @@ 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
+CROSS_COMPILE =
ifneq (sh.exe, $(SHELL))
DEL = rm
MKDIR = mkdir -p
@@ -245,8 +245,9 @@ DEL = del
MKDIR = mkdir
DIRSLASH = \\
endif
-WINDRES = windres
endif
+CC := $(CROSS_COMPILE)gcc
+WINDRES := $(CROSS_COMPILE)windres
#>>>>> end of choices
###########################################################################
@@ -529,10 +530,10 @@ 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
diff --git a/src/xxd/Make_cyg.mak b/src/xxd/Make_cyg.mak
index f04b7bf..01a3ae5 100644
--- a/src/xxd/Make_cyg.mak
+++ b/src/xxd/Make_cyg.mak
@@ -21,7 +21,7 @@ DEL = del
endif
xxd.exe: xxd.c
- gcc $(CFLAGS) -s -o xxd.exe xxd.c $(LIBS)
+ $(CC) $(CFLAGS) -s -o xxd.exe xxd.c $(LIBS)
clean:
-$(DEL) xxd.exe
--
1.6.2.1.139.g54e5
--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_dev" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---
