diff --git a/harbour/ChangeLog b/harbour/ChangeLog index bbd990fdab..bc3fad79b0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,19 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-08-10 16:18 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * config/rules.cf + * make_b32.mak + * make_gcc.mak + * make_vcce.mak + * make_vc.mak + * -kM -> -km + ! Synced make_vcce.mak HBFLAGSCMN flag with make_vc.mak. + (-gc1 -> -gc0 -km) + + * make_xmingwce.sh + ! Minor typos. + 2008-08-10 16:17 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/bin/hb-func.sh * updated library list for wince harbour.dll linking diff --git a/harbour/config/rules.cf b/harbour/config/rules.cf index 11473eabe1..19e0d82c75 100644 --- a/harbour/config/rules.cf +++ b/harbour/config/rules.cf @@ -20,7 +20,7 @@ HB := $(HB_BIN_COMPILE)/ endif HB := $(HB)harbour$(EXE_EXT) -HB_FLAGS = -n -q0 -w3 -es2 -gc0 -kM -I$(TOP) -I$(HB_INC_COMPILE) +HB_FLAGS = -n -q0 -w3 -es2 -gc0 -km -I$(TOP) -I$(HB_INC_COMPILE) # The rule to link an executable. ifeq ($(LD_RULE),) diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak index 61c3287e50..916caa07b0 100644 --- a/harbour/make_b32.mak +++ b/harbour/make_b32.mak @@ -146,7 +146,7 @@ CEXEFLAGSDLL = -tWM $(CLIBFLAGSxxx) $(CEXEFLAGSDLL) #********************************************************** # Harbour Compiler Flags -HBFLAGSCMN = -i$(INCLUDE_DIR) -q0 -w3 -es2 -gc0 -kM $(PRG_USR) +HBFLAGSCMN = -i$(INCLUDE_DIR) -q0 -w3 -es2 -gc0 -km $(PRG_USR) HARBOURFLAGS = -n $(HBFLAGSCMN) $(HARBOURFLAGS) HARBOURFLAGSDLL= -D__EXPORT__ -n1 $(HBFLAGSCMN) $(HARBOURFLAGSDLL) diff --git a/harbour/make_gcc.mak b/harbour/make_gcc.mak index 3a0d2fb13d..14deba2c3d 100644 --- a/harbour/make_gcc.mak +++ b/harbour/make_gcc.mak @@ -204,7 +204,7 @@ endif # Harbour Compiler Flags #********************************************************** -HBFLAGSCMN := -i$(INCLUDE_DIR) -q0 -w3 -es2 -gc0 -kM $(PRG_USR) +HBFLAGSCMN := -i$(INCLUDE_DIR) -q0 -w3 -es2 -gc0 -km $(PRG_USR) HARBOURFLAGS := -n $(HBFLAGSCMN) $(HARBOURFLAGS) HARBOURFLAGSDLL:= -D__EXPORT__ -n1 -l $(HBFLAGSCMN) $(HARBOURFLAGSDLL) diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak index 6e71309e59..42073991b3 100644 --- a/harbour/make_vc.mak +++ b/harbour/make_vc.mak @@ -155,7 +155,7 @@ CEXEFLAGSDLL = -MT$(DBGMARKER) $(CLIBFLAGS) $(CEXEFLAGSDLL) #********************************************************** # Harbour Compiler Flags -HBFLAGSCMN = -i$(INCLUDE_DIR) -q0 -w3 -es2 -gc0 -kM $(PRG_USR) +HBFLAGSCMN = -i$(INCLUDE_DIR) -q0 -w3 -es2 -gc0 -km $(PRG_USR) HARBOURFLAGS = -n $(HBFLAGSCMN) $(HARBOURFLAGS) HARBOURFLAGSDLL= -D__EXPORT__ -n1 $(HBFLAGSCMN) $(HARBOURFLAGSDLL) diff --git a/harbour/make_vcce.mak b/harbour/make_vcce.mak index 2a52cf713f..f52e6104c3 100644 --- a/harbour/make_vcce.mak +++ b/harbour/make_vcce.mak @@ -170,7 +170,7 @@ CEXEFLAGSDLL = $(CLIBFLAGS) $(CEXEFLAGSDLL) #********************************************************** # Harbour Compiler Flags -HBFLAGSCMN = -DHB_WINCE -D__PLATFORM__WINCE -i$(INCLUDE_DIR) -q0 -w3 -es2 -gc1 $(PRG_USR) +HBFLAGSCMN = -DHB_WINCE -D__PLATFORM__WINCE -i$(INCLUDE_DIR) -q0 -w3 -es2 -gc0 -km $(PRG_USR) HARBOURFLAGS = -n $(HBFLAGSCMN) $(HARBOURFLAGS) HARBOURFLAGSDLL= -D__EXPORT__ -n1 $(HBFLAGSCMN) $(HARBOURFLAGSDLL) diff --git a/harbour/make_xmingwce.sh b/harbour/make_xmingwce.sh index 0fdf9527ba..75a46f131c 100755 --- a/harbour/make_xmingwce.sh +++ b/harbour/make_xmingwce.sh @@ -58,8 +58,8 @@ if [ -z "$CCPREFIX" ]; then export CCPREFIX="arm-mingw32ce-" else echo "cegcc compiler executable not found. Ensure you have cegcc package installed in" - echo "/opt/mingw32ce dir, or (alternativly) set environment variable CCPATH to a cegcc" - echo "instalation directory" + echo "/opt/mingw32ce dir, or (alternatively) set environment variable CCPATH to a cegcc" + echo "installation directory" exit 1 fi fi