diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b1e18531d0..cb8d2eeb9e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,24 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-09 01:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/global.cf + + Added build presets based on some predefined HB_BUILD_NAME values: + HB_BUILD_NAME=.r RELEASE + HB_BUILD_NAME=.rx RELEASE C++ + HB_BUILD_NAME=.ru RELEASE UNICODE + HB_BUILD_NAME=.rux RELEASE UNICODE C++ + HB_BUILD_NAME=.d DEBUG + HB_BUILD_NAME=.dx DEBUG C++ + HB_BUILD_NAME=.du DEBUG UNICODE + HB_BUILD_NAME=.dux DEBUG UNICODE C++ + ; Initial/experimental commit, names may change yet. + + * external/sqlite3/Makefile + * external/libhpdf/Makefile + * external/libpng/Makefile + % Minor opt. + 2009-08-09 01:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbwin/win_prt.c % Optimized out port name from port structure. 3KB runtime diff --git a/harbour/config/global.cf b/harbour/config/global.cf index d8c1a94a95..a8d56f6310 100644 --- a/harbour/config/global.cf +++ b/harbour/config/global.cf @@ -103,6 +103,61 @@ endif endef +# Some presets based on HB_BUILD_NAME +ifneq ($(HB_BUILD_NAME),) + ifeq ($(HB_BUILD_NAME),.r) + HB_BUILD_DEBUG := no + HB_BUILD_OPTIM := yes + HB_BUILD_MODE ?= c + else + ifeq ($(HB_BUILD_NAME),.rx) + HB_BUILD_DEBUG := no + HB_BUILD_OPTIM := yes + HB_BUILD_MODE ?= cpp + else + ifeq ($(HB_BUILD_NAME),.ru) + HB_USER_CFLAGS += -DUNICODE + HB_BUILD_DEBUG := no + HB_BUILD_OPTIM := yes + HB_BUILD_MODE ?= c + else + ifeq ($(HB_BUILD_NAME),.rux) + HB_USER_CFLAGS += -DUNICODE + HB_BUILD_DEBUG := no + HB_BUILD_OPTIM := yes + HB_BUILD_MODE ?= cpp + else + ifeq ($(HB_BUILD_NAME),.d) + HB_BUILD_DEBUG := yes + HB_BUILD_OPTIM := no + HB_BUILD_MODE ?= c + else + ifeq ($(HB_BUILD_NAME),.dx) + HB_BUILD_DEBUG := yes + HB_BUILD_OPTIM := no + HB_BUILD_MODE ?= cpp + else + ifeq ($(HB_BUILD_NAME),.du) + HB_USER_CFLAGS += -DUNICODE + HB_BUILD_DEBUG := yes + HB_BUILD_OPTIM := no + HB_BUILD_MODE ?= c + else + ifeq ($(HB_BUILD_NAME),.dux) + HB_USER_CFLAGS += -DUNICODE + HB_BUILD_DEBUG := yes + HB_BUILD_OPTIM := no + HB_BUILD_MODE ?= cpp + endif + endif + endif + endif + endif + endif + endif + endif +endif + ifeq ($(HB_CONFIG_SHOWN),) ifneq ($(MAKE_381),) diff --git a/harbour/external/libhpdf/Makefile b/harbour/external/libhpdf/Makefile index b14ff9a4b6..0daf06cc28 100644 --- a/harbour/external/libhpdf/Makefile +++ b/harbour/external/libhpdf/Makefile @@ -2,8 +2,8 @@ # $Id$ # -HB_BUILD_WARN = no -HB_BUILD_MODE = c +HB_BUILD_WARN := no +HB_BUILD_MODE := c HB_USER_CFLAGS += -I$(TOP)$(ROOT)source/hbzlib ROOT = ../../ diff --git a/harbour/external/libpng/Makefile b/harbour/external/libpng/Makefile index a3530cf42f..297db257da 100644 --- a/harbour/external/libpng/Makefile +++ b/harbour/external/libpng/Makefile @@ -2,7 +2,7 @@ # $Id$ # -HB_BUILD_WARN = no +HB_BUILD_WARN := no HB_USER_CFLAGS += -I$(TOP)$(ROOT)source/hbzlib ifeq ($(HB_COMPILER),djgpp) diff --git a/harbour/external/sqlite3/Makefile b/harbour/external/sqlite3/Makefile index d88b84cc82..fd236c5b65 100644 --- a/harbour/external/sqlite3/Makefile +++ b/harbour/external/sqlite3/Makefile @@ -2,8 +2,8 @@ # $Id$ # -HB_BUILD_WARN = no -HB_BUILD_MODE = c +HB_BUILD_WARN := no +HB_BUILD_MODE := c ifeq ($(HB_ARCHITECTURE),wce) HB_USER_CFLAGS += -D_WIN32_WCE