diff --git a/harbour/ChangeLog b/harbour/ChangeLog index df69348652..744dd3696c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,14 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-06-22 10:58 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/mtpl_b32.mak + * contrib/mtpl_gcc.mak + * contrib/mtpl_vc.mak + + Added HB envvar harbour.exe override. This is currently + useful in VC only to create cross-platform builds. + [1.0.0RC1] + 2008-06-22 10:24 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * ChangeLog + Marked changes merged with 1.0.0RC1. diff --git a/harbour/contrib/mtpl_b32.mak b/harbour/contrib/mtpl_b32.mak index 274b190201..476643d09b 100644 --- a/harbour/contrib/mtpl_b32.mak +++ b/harbour/contrib/mtpl_b32.mak @@ -91,7 +91,9 @@ INCLUDE_DIR = $(HB_ROOT)\include # Macros to access Harbour executable and other goodies #********************************************************** -HARBOUR_EXE = $(BIN_DIR)harbour.exe +!ifndef HB +HB = $(BIN_DIR)harbour.exe +!endif #********************************************************** # C compiler definition and C flags. These should never have to change. @@ -166,7 +168,7 @@ $(OBJ_DIR);\ #********************************************************** # General *.prg --> *.obj COMPILE rule for STATIC Libraries {$(ALL_LIB_SRC_DIRS)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $** + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $** $(CC) $(CLIBFLAGS) -o$@ $(OBJ_DIR)\$&.c #********************************************************** diff --git a/harbour/contrib/mtpl_gcc.mak b/harbour/contrib/mtpl_gcc.mak index 78e04a819e..92c48611b4 100644 --- a/harbour/contrib/mtpl_gcc.mak +++ b/harbour/contrib/mtpl_gcc.mak @@ -98,7 +98,9 @@ INCLUDE_DIR = $(HB_ROOT)/include # Macros to access Harbour executable and other goodies #********************************************************** -HARBOUR_EXE = $(BIN_DIR)harbour +!ifndef HB +HB = $(BIN_DIR)harbour +!endif #********************************************************** # C compiler definition and C flags. These should never have to change. @@ -144,7 +146,7 @@ $(OBJ_DIR)%$(OBJEXT) : %.cpp #********************************************************** # General *.prg --> *.obj COMPILE rule for STATIC Libraries $(OBJ_DIR)%$(OBJEXT) : %.prg - $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)/ $< + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)/ $< $(CC) $(CLIBFLAGS) -o$@ $(OBJ_DIR)/$( *.obj COMPILE rule for STATIC Libraries {.}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #**********************************************************