diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ad6f483539..5001763af0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,29 @@ The license applies to all entries newer than 2009-04-28. */ +2010-11-01 22:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * src/pp/ppcore.c + ! Fixed regression in 2010-11-01 16:42 UTC+0200. + Forgot to set value for __PLATFORM__* macros. + INCOMPATIBLE: So far the value returned by __PLATFORM__* + macros were the version part from the string + also returned by OS(), but only in non-cross + platform situations. Now they are defined + without any value, which means now the returned + value is consistent regardless of build-situation + and OS version. If you relied on this feature, + change your code to extract OS version from value + return by OS() function. + + * src/vm/mainwin.c + % Do not include windows header. + + * src/vm/cmdarg.c + - Undone some (innocent) part of patch in 2010-11-01 13:53 UTC+0200. + + * INSTALL + * Moved around cygwin inside example section. + 2010-11-01 16:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * include/hbapi.h * src/common/hbver.c @@ -118,7 +141,7 @@ * utils/hbmk2/hbmk2.prg * INSTALL * Updated to reflect that cygwin is now distinct platform. - (TODO: examples) + (TODO: examples [DONE]) 2010-10-29 10:22 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * include/hb_io.h diff --git a/harbour/INSTALL b/harbour/INSTALL index 7fbd8926fc..a4ec8f36b4 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -897,11 +897,6 @@ HARBOUR win-make --- - --- Cygwin GCC using Cygwin shell - set PATH=C:\cygwin\bin - sh -c make - --- - --- Intel(R) C++ call "%ProgramFiles%\Intel\Compiler\C++\10.1.014\IA32\Bin\iclvars.bat" win-make @@ -1006,6 +1001,11 @@ HARBOUR win-make --- + --- Cygwin GCC using Cygwin shell + set PATH=C:\cygwin\bin + sh -c make + --- + --8<-- rem ; Add these *before* above sample scripts to configure 3rd party dependencies. rem When using MSYS or Cygwin shell you'll have to use forward slashes and diff --git a/harbour/config/global.mk b/harbour/config/global.mk index 96f36228f0..c1c0c74d14 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -926,29 +926,34 @@ ifeq ($(HB_COMPILER),) ifneq ($(HB_COMP_PATH),) HB_COMPILER := xcc else - # mingw-w64 build - HB_COMP_PATH := $(call find_in_path,i686-w64-mingw32-gcc) + HB_COMP_PATH := $(call find_in_path_raw,dmc.exe) ifneq ($(HB_COMP_PATH),) - HB_COMPILER := mingw64 - HB_CCPREFIX := i686-w64-mingw32- - HB_CPU := x86_64 - ifneq ($(wildcard $(dir $(HB_COMP_PATH))$(HB_CCPREFIX)gcc-4.5*),) - HB_COMPILER_VER := 45 - endif + HB_COMPILER := dmc else - ifeq ($(HB_HOST_CPU),x86_64) - # mingw-w64 build - HB_COMP_PATH := $(call find_in_path,x86_64-w64-mingw32-gcc) - ifneq ($(HB_COMP_PATH),) - HB_COMPILER := mingw64 - HB_CCPREFIX := x86_64-w64-mingw32- - HB_CPU := x86_64 - ifneq ($(wildcard $(dir $(HB_COMP_PATH))$(HB_CCPREFIX)gcc-4.6*),) - HB_COMPILER_VER := 46 - else - ifneq ($(wildcard $(dir $(HB_COMP_PATH))$(HB_CCPREFIX)gcc-4.5*),) - HB_COMPILER_VER := 45 - endif + # mingw-w64 build + HB_COMP_PATH := $(call find_in_path,i686-w64-mingw32-gcc) + ifneq ($(HB_COMP_PATH),) + HB_COMPILER := mingw64 + HB_CCPREFIX := i686-w64-mingw32- + HB_CPU := x86_64 + ifneq ($(wildcard $(dir $(HB_COMP_PATH))$(HB_CCPREFIX)gcc-4.5*),) + HB_COMPILER_VER := 45 + endif + else + ifeq ($(HB_HOST_CPU),x86_64) + # mingw-w64 build + HB_COMP_PATH := $(call find_in_path,x86_64-w64-mingw32-gcc) + ifneq ($(HB_COMP_PATH),) + HB_COMPILER := mingw64 + HB_CCPREFIX := x86_64-w64-mingw32- + HB_CPU := x86_64 + ifneq ($(wildcard $(dir $(HB_COMP_PATH))$(HB_CCPREFIX)gcc-4.6*),) + HB_COMPILER_VER := 46 + else + ifneq ($(wildcard $(dir $(HB_COMP_PATH))$(HB_CCPREFIX)gcc-4.5*),) + HB_COMPILER_VER := 45 + endif + endif endif endif endif diff --git a/harbour/src/pp/ppcore.c b/harbour/src/pp/ppcore.c index be99a0214a..5ff761fdc1 100644 --- a/harbour/src/pp/ppcore.c +++ b/harbour/src/pp/ppcore.c @@ -5543,15 +5543,15 @@ void hb_pp_initDynDefines( PHB_PP_STATE pState, HB_BOOL fArchDefs ) if( hb_verPlatformMacro() ) { hb_snprintf( szDefine, sizeof( szDefine ), szPlatform, hb_verPlatformMacro() ); - hb_pp_addDefine( pState, szDefine, szResult ); + hb_pp_addDefine( pState, szDefine, NULL ); } #if defined( HB_OS_UNIX ) hb_snprintf( szDefine, sizeof( szDefine ), szPlatform, "UNIX" ); - hb_pp_addDefine( pState, szDefine, szResult ); + hb_pp_addDefine( pState, szDefine, NULL ); #endif #if defined( HB_OS_WIN_CE ) hb_snprintf( szDefine, sizeof( szDefine ), szPlatform, "WINDOWS" ); - hb_pp_addDefine( pState, szDefine, szResult ); + hb_pp_addDefine( pState, szDefine, NULL ); #endif hb_snprintf( szResult, sizeof( szResult ), "%d", ( int ) sizeof( void * ) ); diff --git a/harbour/src/vm/cmdarg.c b/harbour/src/vm/cmdarg.c index 69e81343d2..c8d53a1631 100644 --- a/harbour/src/vm/cmdarg.c +++ b/harbour/src/vm/cmdarg.c @@ -178,8 +178,6 @@ void hb_cmdargUpdate( void ) PHB_FNAME pFName = hb_fsFNameSplit( s_argv[ 0 ] ); HB_BOOL fInPath = HB_FALSE; - HB_SYMBOL_UNUSED( s_lpAppName ); - if( ! pFName->szPath ) { char * pszPATH = hb_getenv( "PATH" ); diff --git a/harbour/src/vm/mainwin.c b/harbour/src/vm/mainwin.c index 29d9527f4b..0d4c83d46e 100644 --- a/harbour/src/vm/mainwin.c +++ b/harbour/src/vm/mainwin.c @@ -57,8 +57,6 @@ #if defined( HB_OS_WIN ) || defined( HB_OS_CYGWIN ) -#include - #define HB_VM_STARTUP #include "hbwmain.c"