diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 00d783a1a9..f692d6c689 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,20 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-03-31 12:45 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * bin/hb-mkdyn.bat + + Added pocc64 support. + + * contrib/gtalleg/Makefile + ! Excluded for pocc64 due to compile errors. + + * contrib/hbsqlit3/Makefile + ! Excluded for pocc64 due to overflow. + + * contrib/hbqt/generator/hbqtgen.prg + * contrib/hbqt/Makefile + ! Excluded for pocc64. + 2009-03-31 12:23 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/xhb/dbf2txt.c ! Fixed for Win64. diff --git a/harbour/bin/hb-mkdyn.bat b/harbour/bin/hb-mkdyn.bat index 1840506c77..ed2d1f1d3d 100644 --- a/harbour/bin/hb-mkdyn.bat +++ b/harbour/bin/hb-mkdyn.bat @@ -30,6 +30,7 @@ if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_msvcce" goto DO_MSVC if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_bcc" goto DO_BCC if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_owatcom" goto DO_OWATCOM if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_pocc" goto DO_POCC +if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_pocc64" goto DO_POCC if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_poccce" goto DO_POCC echo Platform %HB_ARCHITECTURE% / %HB_COMPILER% isn't supported. @@ -364,10 +365,13 @@ cd .. if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_pocc" set _DST_NAME_ST=harbour-%HB_DLL_VERSION% if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_pocc" set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION% +if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_pocc64" set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-x64 +if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_pocc64" set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-x64 if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_poccce" set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-arm if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_poccce" set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-arm if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_pocc" set _SYSLIBS=user32.lib ws2_32.lib advapi32.lib gdi32.lib +if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_pocc64" set _SYSLIBS=user32.lib ws2_32.lib advapi32.lib gdi32.lib if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_poccce" set _SYSLIBS=wininet.lib ws2.lib echo Making %_DST_NAME_ST%.dll... && polink /nologo /dll /out:"%HB_BIN_INSTALL%\%_DST_NAME_ST%.dll" @_hboneut.txt @_hbost.txt %_SYSLIBS% diff --git a/harbour/contrib/gtalleg/Makefile b/harbour/contrib/gtalleg/Makefile index a5c9ac813b..291e0f104e 100644 --- a/harbour/contrib/gtalleg/Makefile +++ b/harbour/contrib/gtalleg/Makefile @@ -7,6 +7,7 @@ ROOT = ../../ LIBNAME=gtalleg ifneq ($(HB_COMPILER),pocc) +ifneq ($(HB_COMPILER),pocc64) ifneq ($(HB_COMPILER),poccce) ifneq ($(HB_COMPILER),xcc) ifneq ($(HB_COMPILER),dmc) @@ -52,3 +53,6 @@ endif else include $(TOP)$(ROOT)config/none.cf endif +else +include $(TOP)$(ROOT)config/none.cf +endif diff --git a/harbour/contrib/hbqt/Makefile b/harbour/contrib/hbqt/Makefile index f763143921..455e20f617 100644 --- a/harbour/contrib/hbqt/Makefile +++ b/harbour/contrib/hbqt/Makefile @@ -26,6 +26,9 @@ endif ifeq ($(HB_COMPILER),pocc) HB_WITH_QT=no endif +ifeq ($(HB_COMPILER),pocc64) +HB_WITH_QT=no +endif ifeq ($(HB_COMPILER),poccce) HB_WITH_QT=no endif @@ -225,4 +228,3 @@ endif else include $(TOP)$(ROOT)config/none.cf endif - diff --git a/harbour/contrib/hbqt/generator/hbqtgen.prg b/harbour/contrib/hbqt/generator/hbqtgen.prg index e3de8bc88a..3dac71f0af 100644 --- a/harbour/contrib/hbqt/generator/hbqtgen.prg +++ b/harbour/contrib/hbqt/generator/hbqtgen.prg @@ -978,6 +978,9 @@ STATIC FUNCTION Build_MakeFile( cpp_, prg_, cPathOut ) aadd( txt_, "ifeq ($(HB_COMPILER),pocc) " ) aadd( txt_, "HB_WITH_QT=no " ) aadd( txt_, "endif " ) + aadd( txt_, "ifeq ($(HB_COMPILER),pocc64) " ) + aadd( txt_, "HB_WITH_QT=no " ) + aadd( txt_, "endif " ) aadd( txt_, "ifeq ($(HB_COMPILER),poccce) " ) aadd( txt_, "HB_WITH_QT=no " ) aadd( txt_, "endif " ) diff --git a/harbour/contrib/hbsqlit3/Makefile b/harbour/contrib/hbsqlit3/Makefile index ba8a440918..e11d47af72 100644 --- a/harbour/contrib/hbsqlit3/Makefile +++ b/harbour/contrib/hbsqlit3/Makefile @@ -7,6 +7,7 @@ ROOT = ../../ LIBNAME=hbsqlit3 ifneq ($(HB_COMPILER),pocc) +ifneq ($(HB_COMPILER),pocc64) ifneq ($(HB_COMPILER),poccce) ifeq ($(HB_INC_SQLITE3),) @@ -49,3 +50,6 @@ endif else include $(TOP)$(ROOT)config/none.cf endif +else +include $(TOP)$(ROOT)config/none.cf +endif