diff --git a/harbour/ChangeLog b/harbour/ChangeLog index fba74f7577..9727f2ed75 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,11 @@ +19991015-23:25 EDT Paul Tucker + * source/compiler/harbour.c + + || defined(_MSC_VER) around isatty() + This allows gnu make to compile harbour.exe + It doesn't seem to affect ms make + * doc/gmake.txt + * updated notes regarding MSVC + 19991015-23:15 EDT David G. Holm * include/set.h diff --git a/harbour/doc/gmake.txt b/harbour/doc/gmake.txt index 3a114593a7..5857d302d3 100644 --- a/harbour/doc/gmake.txt +++ b/harbour/doc/gmake.txt @@ -143,6 +143,15 @@ For gcc on Win95/WinNT with the Mingw32 library: HB_COMPILER mingw32 For MSVC on Win95/WinNT: + Notes: You must create an empty unistd.h in the include directory. + gnu make is case sensitive! If your editor converts + harbour.c to HARBOUR.C when it saves the file, then gnu make + _will_not_work. + If you have MAKE_MODE in your dos environment, make sure it is + not set to unix + + For best results, in your copy of make_tpl.bat, also set: + C_USR=-DHARBOUR_USE_WIN_GTAPI -TP HB_ARCHITECTURE win32 HB_COMPILER msvc diff --git a/harbour/source/compiler/harbour.c b/harbour/source/compiler/harbour.c index ef8d8adf59..ef942250fe 100644 --- a/harbour/source/compiler/harbour.c +++ b/harbour/source/compiler/harbour.c @@ -47,7 +47,7 @@ int main( int argc, char * argv[] ) return harbour_main( argc, argv ); } -#ifdef __IBMCPP__ +#if defined(__IBMCPP__) || defined(_MSC_VER) int isatty( int handle ) { return ( handle < 4 ) ? 1 : 0;