diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 93b58d5757..8349349fbd 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,27 @@ The license applies to all entries newer than 2009-04-28. */ +2010-12-11 00:30 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/global.mk + * config/rules.mk + * contrib/hbpost.hbm + * INSTALL + + Renamed HB_BUILD_UNICODE to HB_BUILD_WINUNI. + Reasons many-fold, first it makes it clear this is a Windows + only setting, second it makes room for future UNICODE + setting which may mean a native UNICODE Harbour HVM, + third is to try to clear up the wide misunderstandings + surrounding this setting (several users thought this + will enable general UNICODE support in Harbour). + + Extended/changed description of option HB_BUILD_WINUNI, + explaining its purpose better, giving more precise details + for WinCE builds and builds on Win9x/ME hosts. + ; INCOMPATIBLE: If you use this setting, rename it on + your system. Note1: You don't have to set this + when doing WinCE builds (it's ignored). + Note2: Try UNICOWS, instead of overriding + this setting. It works. + 2010-12-10 20:18 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hblzf/tests/test.prg * contrib/hblzf/hblzf.c diff --git a/harbour/INSTALL b/harbour/INSTALL index 6253d1cff6..01c914ffcc 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -673,10 +673,14 @@ HARBOUR [all|bin|lib|no] Strip symbols and debug information from binaries. Default: no - HB_BUILD_OPTIM=no Enable C compiler optimizations. Default: yes - - HB_BUILD_UNICODE=yes Create Unicode build (on Windows/Windows CE). - Default: yes - Instead of turning it off, we recommend to use - UNICOWS solution to support Win9x/ME systems. + - HB_BUILD_WINUNI=yes Create Unicode build. Only affects Windows (win) targets. + Default: yes. (For Windows CE targets this is the + only accepted setting, any user override is ignored. + When building on Win9x/ME host, the default is 'no'.) + If enabled, it will make Harbour use the Unicode + ("wide") flavor of Windows API calls. If you need + your app to run on Win9x/ME systems, either disable + this option, or use UNICOWS solution (recommended). - HB_BUILD_MODE=[cpp|c] Change default build mode to C++ or C. Default: c, except for msvc* compilers, where it's cpp. - HB_BUILD_PARTS= diff --git a/harbour/config/global.mk b/harbour/config/global.mk index 7bb3a27650..151e16bc19 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -92,49 +92,49 @@ ifneq ($(HB_BUILD_NAME),) ifeq ($(HB_BUILD_NAME),.r) HB_BUILD_DEBUG := no HB_BUILD_OPTIM := yes - HB_BUILD_UNICODE := no + HB_BUILD_WINUNI := no HB_BUILD_MODE ?= c else ifeq ($(HB_BUILD_NAME),.ru) HB_BUILD_DEBUG := no HB_BUILD_OPTIM := yes - HB_BUILD_UNICODE := yes + HB_BUILD_WINUNI := yes HB_BUILD_MODE ?= c else ifeq ($(HB_BUILD_NAME),.rp) HB_BUILD_DEBUG := no HB_BUILD_OPTIM := yes - HB_BUILD_UNICODE := no + HB_BUILD_WINUNI := no HB_BUILD_MODE ?= cpp else ifeq ($(HB_BUILD_NAME),.rpu) HB_BUILD_DEBUG := no HB_BUILD_OPTIM := yes - HB_BUILD_UNICODE := yes + HB_BUILD_WINUNI := yes HB_BUILD_MODE ?= cpp else ifeq ($(HB_BUILD_NAME),.d) HB_BUILD_DEBUG := yes HB_BUILD_OPTIM := no - HB_BUILD_UNICODE := no + HB_BUILD_WINUNI := no HB_BUILD_MODE ?= c else ifeq ($(HB_BUILD_NAME),.du) HB_BUILD_DEBUG := yes HB_BUILD_OPTIM := no - HB_BUILD_UNICODE := yes + HB_BUILD_WINUNI := yes HB_BUILD_MODE ?= c else ifeq ($(HB_BUILD_NAME),.dp) HB_BUILD_DEBUG := yes HB_BUILD_OPTIM := no - HB_BUILD_UNICODE := no + HB_BUILD_WINUNI := no HB_BUILD_MODE ?= cpp else ifeq ($(HB_BUILD_NAME),.dpu) HB_BUILD_DEBUG := yes HB_BUILD_OPTIM := no - HB_BUILD_UNICODE := yes + HB_BUILD_WINUNI := yes HB_BUILD_MODE ?= cpp endif endif @@ -288,8 +288,8 @@ ifeq ($(HB_INIT_DONE),) ifneq ($(HB_BUILD_OPTIM),) $(info ! HB_BUILD_OPTIM: $(HB_BUILD_OPTIM)) endif - ifneq ($(HB_BUILD_UNICODE),) - $(info ! HB_BUILD_UNICODE: $(HB_BUILD_UNICODE)) + ifneq ($(HB_BUILD_WINUNI),) + $(info ! HB_BUILD_WINUNI: $(HB_BUILD_WINUNI)) endif ifneq ($(HB_BUILD_MODE),) $(info ! HB_BUILD_MODE: $(HB_BUILD_MODE)) @@ -411,9 +411,9 @@ ifeq ($(HB_HOST_PLAT),) ifeq ($(OS),) HB_HOST_PLAT_WIN9X := yes ifeq ($(HB_HOST_BIN),) - ifneq ($(HB_BUILD_UNICODE),no) - export HB_BUILD_UNICODE := no - $(info ! Win9x/ME host detected: HB_BUILD_UNICODE forced to 'no') + ifneq ($(HB_BUILD_WINUNI),no) + export HB_BUILD_WINUNI := no + $(info ! Win9x/ME host detected: HB_BUILD_WINUNI forced to 'no') endif endif endif diff --git a/harbour/config/rules.mk b/harbour/config/rules.mk index e0214ca553..215c3f6a9f 100644 --- a/harbour/config/rules.mk +++ b/harbour/config/rules.mk @@ -18,7 +18,7 @@ HB_CFLAGS := -DHB_LEGACY_TYPES_OFF $(HB_CFLAGS) # Handle it here, so that it can be disabled for individual libs ifeq ($(HB_PLATFORM),win) - ifneq ($(HB_BUILD_UNICODE),no) + ifneq ($(HB_BUILD_WINUNI),no) HB_CFLAGS += -DUNICODE endif endif diff --git a/harbour/contrib/hbpost.hbm b/harbour/contrib/hbpost.hbm index 3a28094a8e..31e591fb5c 100644 --- a/harbour/contrib/hbpost.hbm +++ b/harbour/contrib/hbpost.hbm @@ -28,7 +28,7 @@ {win&allmsvc&HB_COMP_VER>'1400'}-dflag=-dynamicbase -cflag=-DHB_LEGACY_TYPES_OFF -{allwin&!(HB_BUILD_UNICODE='no')}-cflag=-DUNICODE +{allwin&!(HB_BUILD_WINUNI='no')}-cflag=-DUNICODE {HB_BUILD_DEBUG}-prgflag=-l- {HB_BUILD_DEBUG}-debug