From 0004a678738611d850a16032d777c7faa0ba47b4 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 26 Aug 2008 08:51:11 +0000 Subject: [PATCH] 2008-08-26 10:35 UTC+0200 Viktor Szakats (harbour.01 syenar hu) - source/rtl/gtalleg + contrib/gtalleg * TODO * doc/dirstruc.txt * include/hbgtcore.h * contrib/gtalleg/Makefile * contrib/gtalleg/make_b32.bat * contrib/gtalleg/make_vc.bat * contrib/gtalleg/make_gcc.sh * contrib/make_b32_all.bat * contrib/make_vc_all.bat * contrib/make_gcc_all.sh * contrib/Makefile * config/hpux/gcc.cf * config/hpux/global.cf * config/darwin/gcc.cf * config/darwin/global.cf * config/dos/global.cf * config/linux/gcc.cf * config/linux/global.cf * config/sunos/gcc.cf * config/sunos/global.cf * config/bsd/gcc.cf * config/bsd/global.cf * config/w32/global.cf * harbour-ce-spec * harbour-w32-spec * harbour.spec * GTALLEG moved to contrib to make it possible to build using the non-GNU make system, also to align the build process with other 3rd party package dependent parts of Harbour. HB_INC_ALLEGRO or HB_DIR_ALLEGRO may be used to point to Allegro package directory. This is generally necessary on non-*nix systems. ; NOTE: Review and test build processes and modified files, and unmodified, but potentially related files: bin/hb-func.sh make_gnu.sh make_rpm.sh make_rpmce.sh make_rpmw32.sh --- harbour/ChangeLog | 44 +++++++++++++++++++ harbour/TODO | 2 +- harbour/config/bsd/gcc.cf | 4 -- harbour/config/bsd/global.cf | 3 -- harbour/config/darwin/gcc.cf | 4 -- harbour/config/darwin/global.cf | 3 -- harbour/config/dos/global.cf | 4 -- harbour/config/hpux/gcc.cf | 3 -- harbour/config/hpux/global.cf | 3 -- harbour/config/linux/gcc.cf | 3 -- harbour/config/linux/global.cf | 3 -- harbour/config/sunos/gcc.cf | 3 -- harbour/config/sunos/global.cf | 3 -- harbour/config/w32/global.cf | 4 -- harbour/contrib/Makefile | 1 + harbour/contrib/gtalleg/Makefile | 29 ++++++++++++ .../rtl => contrib}/gtalleg/common.mak | 0 .../rtl => contrib}/gtalleg/fixedth.sfc | 0 .../{source/rtl => contrib}/gtalleg/gtalleg.c | 0 .../rtl => contrib}/gtalleg/make_b32.bat | 13 +++--- .../rtl => contrib}/gtalleg/make_gcc.sh | 2 +- .../rtl => contrib}/gtalleg/make_vc.bat | 13 +++--- harbour/{source/rtl => contrib}/gtalleg/ssf.c | 0 harbour/{source/rtl => contrib}/gtalleg/ssf.h | 0 harbour/contrib/make_b32_all.bat | 1 + harbour/contrib/make_gcc_all.sh | 1 + harbour/contrib/make_vc_all.bat | 1 + harbour/doc/dirstruc.txt | 6 +-- harbour/harbour-ce-spec | 6 +-- harbour/harbour-w32-spec | 6 +-- harbour/harbour.spec | 6 +-- harbour/include/hbgtcore.h | 1 - harbour/source/rtl/gtalleg/Makefile | 13 ------ 33 files changed, 98 insertions(+), 87 deletions(-) create mode 100644 harbour/contrib/gtalleg/Makefile rename harbour/{source/rtl => contrib}/gtalleg/common.mak (100%) rename harbour/{source/rtl => contrib}/gtalleg/fixedth.sfc (100%) rename harbour/{source/rtl => contrib}/gtalleg/gtalleg.c (100%) rename harbour/{source/rtl => contrib}/gtalleg/make_b32.bat (73%) rename harbour/{source/rtl => contrib}/gtalleg/make_gcc.sh (92%) rename harbour/{source/rtl => contrib}/gtalleg/make_vc.bat (72%) rename harbour/{source/rtl => contrib}/gtalleg/ssf.c (100%) rename harbour/{source/rtl => contrib}/gtalleg/ssf.h (100%) delete mode 100644 harbour/source/rtl/gtalleg/Makefile diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 30662e0777..dc34b8e7c6 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,50 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-08-26 10:35 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + - source/rtl/gtalleg + + contrib/gtalleg + * TODO + * doc/dirstruc.txt + * include/hbgtcore.h + * contrib/gtalleg/Makefile + * contrib/gtalleg/make_b32.bat + * contrib/gtalleg/make_vc.bat + * contrib/gtalleg/make_gcc.sh + * contrib/make_b32_all.bat + * contrib/make_vc_all.bat + * contrib/make_gcc_all.sh + * contrib/Makefile + * config/hpux/gcc.cf + * config/hpux/global.cf + * config/darwin/gcc.cf + * config/darwin/global.cf + * config/dos/global.cf + * config/linux/gcc.cf + * config/linux/global.cf + * config/sunos/gcc.cf + * config/sunos/global.cf + * config/bsd/gcc.cf + * config/bsd/global.cf + * config/w32/global.cf + * harbour-ce-spec + * harbour-w32-spec + * harbour.spec + * GTALLEG moved to contrib to make it possible to build + using the non-GNU make system, also to align the build + process with other 3rd party package dependent parts + of Harbour. + HB_INC_ALLEGRO or HB_DIR_ALLEGRO may be used to point + to Allegro package directory. This is generally necessary + on non-*nix systems. + ; NOTE: Review and test build processes and modified files, + and unmodified, but potentially related files: + bin/hb-func.sh + make_gnu.sh + make_rpm.sh + make_rpmce.sh + make_rpmw32.sh + 2008-08-26 09:00 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * include/hbsetup.h + Added small table (partly from MS KB) about _MSC_VER diff --git a/harbour/TODO b/harbour/TODO index 25d4e85fd7..e3a34f8528 100644 --- a/harbour/TODO +++ b/harbour/TODO @@ -64,7 +64,7 @@ Status...: Open. Assign to: Przemek Detail...: Define multi platform platform API for GTs which can mix graphics objects with standard text output. Now it's - possible in GTXWC, GTWVT and GTALLEG. This I will discuss + possible in GTXWC, GTWVG and GTALLEG. This I will discuss yet also with xHarbour developers. Status...: Open. diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf index 4305b37c08..baf7365818 100644 --- a/harbour/config/bsd/gcc.cf +++ b/harbour/config/bsd/gcc.cf @@ -57,10 +57,6 @@ LINKLIBS += -l$(HB_CRS_LIB) endif endif -ifneq ($(findstring gtalleg, $(HB_GT_LIBS)),) -LINKLIBS += `allegro-config --static` -endif - ifneq ($(findstring gtxwc, $(HB_GT_LIBS)),) LINKLIBS += -lX11 #LINKPATHS += -L/usr/X11R6/lib64 diff --git a/harbour/config/bsd/global.cf b/harbour/config/bsd/global.cf index 62d1e36dfa..347a482396 100644 --- a/harbour/config/bsd/global.cf +++ b/harbour/config/bsd/global.cf @@ -23,9 +23,6 @@ endif ifneq ($(HB_WITHOUT_X11),yes) HB_GT_LIST += gtxwc endif -ifeq ($(HB_GTALLEG),yes) - HB_GT_LIST += gtalleg -endif # verify if GT drivers exist HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),)) diff --git a/harbour/config/darwin/gcc.cf b/harbour/config/darwin/gcc.cf index 7b454d2eda..1f3f577171 100644 --- a/harbour/config/darwin/gcc.cf +++ b/harbour/config/darwin/gcc.cf @@ -70,10 +70,6 @@ LINKLIBS += -l$(HB_CRS_LIB) endif endif -ifneq ($(findstring gtalleg, $(HB_GT_LIBS)),) -LINKLIBS += `allegro-config --static` -endif - ifneq ($(findstring gtxwc, $(HB_GT_LIBS)),) LINKLIBS += -lX11 #LINKPATHS += -L/usr/X11R6/lib64 diff --git a/harbour/config/darwin/global.cf b/harbour/config/darwin/global.cf index f496206a18..8142d3a16b 100644 --- a/harbour/config/darwin/global.cf +++ b/harbour/config/darwin/global.cf @@ -23,9 +23,6 @@ endif ifneq ($(HB_WITHOUT_X11),yes) HB_GT_LIST += gtxwc endif -ifeq ($(HB_GTALLEG),yes) - HB_GT_LIST += gtalleg -endif # verify if GT drivers exist HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),)) diff --git a/harbour/config/dos/global.cf b/harbour/config/dos/global.cf index 25f3c136bd..4d5d0f301e 100644 --- a/harbour/config/dos/global.cf +++ b/harbour/config/dos/global.cf @@ -15,10 +15,6 @@ HB_GT_LIST=\ # gtcrs \ # gtsln \ -ifeq ($(HB_GTALLEG),yes) - HB_GT_LIST += gtalleg -endif - # verify if GT drivers exist #HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),)) HB_GT_LIBS := $(HB_GT_LIST) diff --git a/harbour/config/hpux/gcc.cf b/harbour/config/hpux/gcc.cf index 0a775b23c5..15e00d241f 100644 --- a/harbour/config/hpux/gcc.cf +++ b/harbour/config/hpux/gcc.cf @@ -57,9 +57,6 @@ endif ifneq ($(findstring gtsln, $(HB_GT_LIBS)),) LINKLIBS += -lslang endif -ifneq ($(findstring gtalleg, $(HB_GT_LIBS)),) -LINKLIBS += `allegro-config --static` -endif ifneq ($(findstring gtxwc, $(HB_GT_LIBS)),) LINKLIBS += -lX11 #LINKPATHS += -L/usr/X11R6/lib64 diff --git a/harbour/config/hpux/global.cf b/harbour/config/hpux/global.cf index baf96f10ae..09cecb06ad 100644 --- a/harbour/config/hpux/global.cf +++ b/harbour/config/hpux/global.cf @@ -23,9 +23,6 @@ endif ifneq ($(HB_WITHOUT_X11),yes) # HB_GT_LIST += gtxwc endif -ifeq ($(HB_GTALLEG),yes) - HB_GT_LIST += gtalleg -endif # verify if GT drivers exist HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),)) diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf index 4de2c01167..0a03ada70f 100644 --- a/harbour/config/linux/gcc.cf +++ b/harbour/config/linux/gcc.cf @@ -63,9 +63,6 @@ endif ifneq ($(findstring gtsln, $(HB_GT_LIBS)),) LINKLIBS += -lslang endif -ifneq ($(findstring gtalleg, $(HB_GT_LIBS)),) -LINKLIBS += `allegro-config --static` -endif ifneq ($(findstring gtxwc, $(HB_GT_LIBS)),) LINKLIBS += -lX11 #LINKPATHS += -L/usr/X11R6/lib64 diff --git a/harbour/config/linux/global.cf b/harbour/config/linux/global.cf index f496206a18..8142d3a16b 100644 --- a/harbour/config/linux/global.cf +++ b/harbour/config/linux/global.cf @@ -23,9 +23,6 @@ endif ifneq ($(HB_WITHOUT_X11),yes) HB_GT_LIST += gtxwc endif -ifeq ($(HB_GTALLEG),yes) - HB_GT_LIST += gtalleg -endif # verify if GT drivers exist HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),)) diff --git a/harbour/config/sunos/gcc.cf b/harbour/config/sunos/gcc.cf index 71ae281b1e..e4c43576a7 100644 --- a/harbour/config/sunos/gcc.cf +++ b/harbour/config/sunos/gcc.cf @@ -53,9 +53,6 @@ endif ifneq ($(findstring gtsln, $(HB_GT_LIBS)),) LINKLIBS += -lslang endif -ifneq ($(findstring gtalleg, $(HB_GT_LIBS)),) -LINKLIBS += `allegro-config --static` -endif ifneq ($(findstring gtxwc, $(HB_GT_LIBS)),) LINKLIBS += -lX11 #LINKPATHS += -L/usr/X11R6/lib64 diff --git a/harbour/config/sunos/global.cf b/harbour/config/sunos/global.cf index baf96f10ae..09cecb06ad 100644 --- a/harbour/config/sunos/global.cf +++ b/harbour/config/sunos/global.cf @@ -23,9 +23,6 @@ endif ifneq ($(HB_WITHOUT_X11),yes) # HB_GT_LIST += gtxwc endif -ifeq ($(HB_GTALLEG),yes) - HB_GT_LIST += gtalleg -endif # verify if GT drivers exist HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),)) diff --git a/harbour/config/w32/global.cf b/harbour/config/w32/global.cf index bc427b4511..4df93df71b 100644 --- a/harbour/config/w32/global.cf +++ b/harbour/config/w32/global.cf @@ -15,10 +15,6 @@ HB_GT_LIST=\ # gtcrs \ # gtsln \ -ifeq ($(HB_GTALLEG),yes) - HB_GT_LIST += gtalleg -endif - # verify if GT drivers exist HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),)) diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile index 89024de07a..b3eb0738b0 100644 --- a/harbour/contrib/Makefile +++ b/harbour/contrib/Makefile @@ -35,6 +35,7 @@ DIRS=\ # contribs with external dependencies DIRS +=\ + gtalleg \ hbapollo \ hbcurl \ hbfbird \ diff --git a/harbour/contrib/gtalleg/Makefile b/harbour/contrib/gtalleg/Makefile new file mode 100644 index 0000000000..66ee65f42c --- /dev/null +++ b/harbour/contrib/gtalleg/Makefile @@ -0,0 +1,29 @@ +# +# $Id$ +# + +ROOT = ../../ + +LIBNAME=gtalleg + +ifeq ($(HB_INC_ALLEGRO),) +ifeq ($(HB_XBUILD),) +HB_INC_ALLEGRO = /usr/include +endif +endif + +HB_INC_ALLEGRO_OK += $(foreach d, $(HB_INC_ALLEGRO), $(if $(wildcard $(d)/allegro.h),$(d),)) + +ifneq ($(strip $(HB_INC_ALLEGRO_OK)),) + +C_USR += $(foreach d, $(HB_INC_ALLEGRO_OK), -I$(d)) + +C_SOURCES=\ + gtalleg.c \ + ssf.c \ + +include $(TOP)$(ROOT)config/lib.cf + +else +include $(TOP)$(ROOT)config/none.cf +endif diff --git a/harbour/source/rtl/gtalleg/common.mak b/harbour/contrib/gtalleg/common.mak similarity index 100% rename from harbour/source/rtl/gtalleg/common.mak rename to harbour/contrib/gtalleg/common.mak diff --git a/harbour/source/rtl/gtalleg/fixedth.sfc b/harbour/contrib/gtalleg/fixedth.sfc similarity index 100% rename from harbour/source/rtl/gtalleg/fixedth.sfc rename to harbour/contrib/gtalleg/fixedth.sfc diff --git a/harbour/source/rtl/gtalleg/gtalleg.c b/harbour/contrib/gtalleg/gtalleg.c similarity index 100% rename from harbour/source/rtl/gtalleg/gtalleg.c rename to harbour/contrib/gtalleg/gtalleg.c diff --git a/harbour/source/rtl/gtalleg/make_b32.bat b/harbour/contrib/gtalleg/make_b32.bat similarity index 73% rename from harbour/source/rtl/gtalleg/make_b32.bat rename to harbour/contrib/gtalleg/make_b32.bat index 620f1514fb..1c76b77092 100644 --- a/harbour/source/rtl/gtalleg/make_b32.bat +++ b/harbour/contrib/gtalleg/make_b32.bat @@ -3,9 +3,6 @@ rem rem $Id$ rem -set HB_ROOT=..\..\.. -set HB_MAKEFILE=..\..\..\contrib\mtpl_b32.mak - if not "%HB_INC_ALLEGRO%%HB_DIR_ALLEGRO%" == "" goto DIR_OK echo --------------------------------------------------------------- @@ -27,7 +24,7 @@ if exist "%HB_DIR_ALLEGRO%\bin\%_HB_DLL_NAME%.dll" set _HB_DLL_DIR=%HB_DIR_ALLEG rem --------------------------------------------------------------- -call ..\..\..\contrib\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 +call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 rem --------------------------------------------------------------- @@ -47,20 +44,20 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib -a ..\..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib "%_HB_DLL_DIR%\%_HB_DLL_NAME%.dll" >> %_HB_MAKELOG% + implib -a ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib "%_HB_DLL_DIR%\%_HB_DLL_NAME%.dll" >> %_HB_MAKELOG% goto POST_EXIT :POST_CLEAN - if exist ..\..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib del ..\..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul - if exist ..\..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp del ..\..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp > nul if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_INSTALL if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib - if exist ..\..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy ..\..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib %_HB_LIB_INSTALL% + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT :POST_EXIT diff --git a/harbour/source/rtl/gtalleg/make_gcc.sh b/harbour/contrib/gtalleg/make_gcc.sh similarity index 92% rename from harbour/source/rtl/gtalleg/make_gcc.sh rename to harbour/contrib/gtalleg/make_gcc.sh index 3262a776a5..81bfbe4d1a 100755 --- a/harbour/source/rtl/gtalleg/make_gcc.sh +++ b/harbour/contrib/gtalleg/make_gcc.sh @@ -21,5 +21,5 @@ export CFLAGS="" for I in ${HB_INC_ALLEGRO}; do CFLAGS="${CFLAGS} -I${I}" done -../../../contrib/mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9 +../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9 unset CFLAGS diff --git a/harbour/source/rtl/gtalleg/make_vc.bat b/harbour/contrib/gtalleg/make_vc.bat similarity index 72% rename from harbour/source/rtl/gtalleg/make_vc.bat rename to harbour/contrib/gtalleg/make_vc.bat index 1a38eaae75..3fe819b199 100644 --- a/harbour/source/rtl/gtalleg/make_vc.bat +++ b/harbour/contrib/gtalleg/make_vc.bat @@ -3,9 +3,6 @@ rem rem $Id$ rem -set HB_ROOT=..\..\.. -set HB_MAKEFILE=..\..\..\contrib\mtpl_vc.mak - if not "%HB_INC_ALLEGRO%%HB_DIR_ALLEGRO%" == "" goto DIR_OK echo --------------------------------------------------------------- @@ -27,7 +24,7 @@ if exist "%HB_DIR_ALLEGRO%\lib\%_HB_DLL_NAME%.lib" set _HB_DLL_DIR=%HB_DIR_ALLEG rem --------------------------------------------------------------- -call ..\..\..\contrib\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 +call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 rem --------------------------------------------------------------- @@ -48,20 +45,20 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD rem Use supplied .lib file. - if not exist ..\..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy "%_HB_DLL_DIR%\%_HB_DLL_NAME%.lib" ..\..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul + if not exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy "%_HB_DLL_DIR%\%_HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_CLEAN - if exist ..\..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib del ..\..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul - if exist ..\..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp del ..\..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp > nul if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_INSTALL if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib - if exist ..\..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy ..\..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib %_HB_LIB_INSTALL% + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT :POST_EXIT diff --git a/harbour/source/rtl/gtalleg/ssf.c b/harbour/contrib/gtalleg/ssf.c similarity index 100% rename from harbour/source/rtl/gtalleg/ssf.c rename to harbour/contrib/gtalleg/ssf.c diff --git a/harbour/source/rtl/gtalleg/ssf.h b/harbour/contrib/gtalleg/ssf.h similarity index 100% rename from harbour/source/rtl/gtalleg/ssf.h rename to harbour/contrib/gtalleg/ssf.h diff --git a/harbour/contrib/make_b32_all.bat b/harbour/contrib/make_b32_all.bat index e9193e4e5a..af3df03240 100644 --- a/harbour/contrib/make_b32_all.bat +++ b/harbour/contrib/make_b32_all.bat @@ -51,6 +51,7 @@ set _HB_DIRS=hbtip hbtpathy hbvpdf hbw32 for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 set _HB_DIRS=rddado xhb +if not "%HB_INC_ALLEGRO%%HB_DIR_ALLEGRO%" == "" set _HB_DIRS=%_HB_DIRS% gtalleg if not "%HB_INC_APOLLO%%HB_DIR_APOLLO%" == "" set _HB_DIRS=%_HB_DIRS% hbapollo if not "%HB_INC_CURL%%HB_DIR_CURL%" == "" set _HB_DIRS=%_HB_DIRS% hbcurl if not "%HB_INC_FIREBIRD%%HB_DIR_FIREBIRD%" == "" set _HB_DIRS=%_HB_DIRS% hbfbird diff --git a/harbour/contrib/make_gcc_all.sh b/harbour/contrib/make_gcc_all.sh index 2e8462ddc8..bc5f2a5543 100755 --- a/harbour/contrib/make_gcc_all.sh +++ b/harbour/contrib/make_gcc_all.sh @@ -51,6 +51,7 @@ case "$HB_ARCHITECTURE" in _HB_DIRS_ADD=;; esac +if [ "${HB_INC_ALLEGRO}" != "" ]; then _HB_DIRS="${_HB_DIRS} gtalleg"; fi; if [ "${HB_INC_APOLLO}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbapollo"; fi; if [ "${HB_INC_CURL}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbcurl "; fi; if [ "${HB_INC_FIREBIRD}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbfbird "; fi; diff --git a/harbour/contrib/make_vc_all.bat b/harbour/contrib/make_vc_all.bat index 76dd6be1ed..09ff94fbc7 100644 --- a/harbour/contrib/make_vc_all.bat +++ b/harbour/contrib/make_vc_all.bat @@ -51,6 +51,7 @@ set _HB_DIRS=hbtip hbtpathy hbvpdf hbw32 for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 set _HB_DIRS=rddado xhb +if not "%HB_INC_ALLEGRO%%HB_DIR_ALLEGRO%" == "" set _HB_DIRS=%_HB_DIRS% gtalleg if not "%HB_INC_APOLLO%%HB_DIR_APOLLO%" == "" set _HB_DIRS=%_HB_DIRS% hbapollo if not "%HB_INC_CURL%%HB_DIR_CURL%" == "" set _HB_DIRS=%_HB_DIRS% hbcurl if not "%HB_INC_FIREBIRD%%HB_DIR_FIREBIRD%" == "" set _HB_DIRS=%_HB_DIRS% hbfbird diff --git a/harbour/doc/dirstruc.txt b/harbour/doc/dirstruc.txt index fff6d625b9..fb999b4c6d 100644 --- a/harbour/doc/dirstruc.txt +++ b/harbour/doc/dirstruc.txt @@ -58,6 +58,9 @@ track of all files (read the FAQ if you don't know what SVN is). | | | | | +---rdddbt - DBFDBT RDD. | | +| |---gtalleg - GT subsystem based on Allegro with graphic +| | extensions. +| | | +---gtwvg - GT subsystem for Win32 GUI using GDI functions. | | | | | +---tests - Demo program and sample images. @@ -302,9 +305,6 @@ track of all files (read the FAQ if you don't know what SVN is). | +---rtl - Run-Time libraries functions and various General | | | Terminal (GT) implementation | | | -| | +---gtalleg - GT subsystem based on Allegro with graphic -| | | extensions. -| | | | | +---gtcgi - GT subsystem aimed at cgi-bin applications. | | | | | +---gtcrs - GT subsystem based on ncurses. diff --git a/harbour/harbour-ce-spec b/harbour/harbour-ce-spec index 9c16a404ca..34346eedf2 100644 --- a/harbour/harbour-ce-spec +++ b/harbour/harbour-ce-spec @@ -117,8 +117,7 @@ export HB_GT_LIB=gtwvt export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/%{name} export HB_LIB_INSTALL=%{_libdir}/%{name} -export HB_GTALLEG=%{?_with_allegro:yes} -export HB_CONTRIBLIBS="hbct hbmzip hbtip xhb hbbtree hbmisc hbvpdf hbgt hbbmcdx hbclipsm gtwvg hbw32 rddado %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" +export HB_CONTRIBLIBS="hbct hbmzip hbtip xhb hbbtree hbmisc hbvpdf hbgt hbbmcdx hbclipsm gtwvg hbw32 rddado %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" make -r @@ -149,8 +148,7 @@ export HB_GT_LIB=gtwvt export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/%{name} export HB_LIB_INSTALL=%{_libdir}/%{name} -export HB_GTALLEG=%{?_with_allegro:yes} -export HB_CONTRIBLIBS="hbct hbmzip hbtip xhb hbbtree hbmisc hbvpdf hbgt hbbmcdx hbclipsm gtwvg hbw32 rddado %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" +export HB_CONTRIBLIBS="hbct hbmzip hbtip xhb hbbtree hbmisc hbvpdf hbgt hbbmcdx hbclipsm gtwvg hbw32 rddado %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" export _DEFAULT_BIN_DIR=$HB_BIN_INSTALL export _DEFAULT_INC_DIR=$HB_INC_INSTALL diff --git a/harbour/harbour-w32-spec b/harbour/harbour-w32-spec index 6a6deb9708..9dc1776df1 100644 --- a/harbour/harbour-w32-spec +++ b/harbour/harbour-w32-spec @@ -117,8 +117,7 @@ export HB_GT_LIB=gtwin export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/%{name} export HB_LIB_INSTALL=%{_libdir}/%{name} -export HB_GTALLEG=%{?_with_allegro:yes} -export HB_CONTRIBLIBS="hbct hbmzip hbtip xhb hbbtree hbmisc hbvpdf hbgt hbbmcdx hbclipsm gtwvg hbw32 rddado %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" +export HB_CONTRIBLIBS="hbct hbmzip hbtip xhb hbbtree hbmisc hbvpdf hbgt hbbmcdx hbclipsm gtwvg hbw32 rddado %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" make -r @@ -149,8 +148,7 @@ export HB_GT_LIB=gtwin export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/%{name} export HB_LIB_INSTALL=%{_libdir}/%{name} -export HB_GTALLEG=%{?_with_allegro:yes} -export HB_CONTRIBLIBS="hbct hbmzip hbtip xhb hbbtree hbmisc hbvpdf hbgt hbbmcdx hbclipsm gtwvg hbw32 rddado %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" +export HB_CONTRIBLIBS="hbct hbmzip hbtip xhb hbbtree hbmisc hbvpdf hbgt hbbmcdx hbclipsm gtwvg hbw32 rddado %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" export _DEFAULT_BIN_DIR=$HB_BIN_INSTALL export _DEFAULT_INC_DIR=$HB_INC_INSTALL diff --git a/harbour/harbour.spec b/harbour/harbour.spec index 1358f2444c..717d32f273 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -79,10 +79,9 @@ %define hb_bdir export HB_BIN_INSTALL=%{_bindir} %define hb_idir export HB_INC_INSTALL=%{_includedir}/%{name} %define hb_ldir export HB_LIB_INSTALL=%{_libdir}/%{name} -%define hb_opt export HB_GTALLEG=%{?_with_allegro:yes} %define hb_cmrc export HB_COMMERCE=%{?_without_gpllib:yes} -%define hb_ctrb export HB_CONTRIBLIBS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmsql hbmzip hbsqlit3 hbtip hbtpathy hbvpdf xhb %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_hbhpdf:hbhpdf} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" -%define hb_env %{hb_arch} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_mt} ; %{hb_gt} ; %{hb_defgt} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_opt} ; %{hb_ctrb} ; %{hb_cmrc} +%define hb_ctrb export HB_CONTRIBLIBS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmsql hbmzip hbsqlit3 hbtip hbtpathy hbvpdf xhb %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_hbhpdf:hbhpdf} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" +%define hb_env %{hb_arch} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_mt} ; %{hb_gt} ; %{hb_defgt} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_ctrb} ; %{hb_cmrc} %define hb_host www.harbour-project.org %define readme README.RPM ###################################################################### @@ -423,7 +422,6 @@ EOF # check if we should rebuild tools with shared libs if [ "%{!?_with_static:1}" ] then - unset HB_GTALLEG export L_USR="${CC_L_USR} -L${HB_LIB_INSTALL} -l%{name} %{!?_without_gtcrs:-lncurses} %{!?_without_gtsln:-lslang} %{!?_without_gpm:-lgpm} %{!?_without_x11:-L/usr/X11R6/%{_lib} -lX11}" export PRG_USR="\"-D_DEFAULT_INC_DIR='${_DEFAULT_INC_DIR}'\" ${PRG_USR}" diff --git a/harbour/include/hbgtcore.h b/harbour/include/hbgtcore.h index 4999fbb046..2bce019b6d 100644 --- a/harbour/include/hbgtcore.h +++ b/harbour/include/hbgtcore.h @@ -86,7 +86,6 @@ HB_EXTERN_BEGIN #define HB_GT_xvt HB_GT_XVT #define HB_GT_xwc HB_GT_XWC #define HB_GT_gui HB_GT_GUI -#define HB_GT_alleg HB_GT_ALLEG /* These hacks are needed to force preprocessing if id/x is also a macro */ #define _HB_GT_PREF_( id ) _HB_GT_PREF__( id ) diff --git a/harbour/source/rtl/gtalleg/Makefile b/harbour/source/rtl/gtalleg/Makefile deleted file mode 100644 index 6eb4e23728..0000000000 --- a/harbour/source/rtl/gtalleg/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# -# $Id$ -# - -ROOT = ../../../ - -C_SOURCES=\ - gtalleg.c \ - ssf.c \ - -LIBNAME=gtalleg - -include $(TOP)$(ROOT)config/lib.cf