fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-08-26 10:35 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
- 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
This commit is contained in:
Viktor Szakats
2008-08-26 08:51:11 +00:00
parent afc82fc905
commit 0004a67873
33 changed files with 98 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
harbour/ChangeLog
View File

@@ -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

2
harbour/TODO
View File

@@ -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.

4
harbour/config/bsd/gcc.cf
View File

@@ -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

3
harbour/config/bsd/global.cf
View File

@@ -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),))

4
harbour/config/darwin/gcc.cf
View File

@@ -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

3
harbour/config/darwin/global.cf
View File

@@ -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),))

4
harbour/config/dos/global.cf
View File

@@ -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)

3
harbour/config/hpux/gcc.cf
View File

@@ -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

3
harbour/config/hpux/global.cf
View File

@@ -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),))

3
harbour/config/linux/gcc.cf
View File

@@ -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

3
harbour/config/linux/global.cf
View File

@@ -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),))

3
harbour/config/sunos/gcc.cf
View File

@@ -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

3
harbour/config/sunos/global.cf
View File

@@ -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),))

4
harbour/config/w32/global.cf
View File

@@ -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),))

1
harbour/contrib/Makefile
View File

@@ -35,6 +35,7 @@ DIRS=\
# contribs with external dependencies
DIRS +=\
gtalleg \
hbapollo \
hbcurl \
hbfbird \

29
harbour/contrib/gtalleg/Makefile Normal file
View File

@@ -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

0
harbour/source/rtl/gtalleg/common.mak → harbour/contrib/gtalleg/common.mak
View File

0
harbour/source/rtl/gtalleg/fixedth.sfc → harbour/contrib/gtalleg/fixedth.sfc
View File

0
harbour/source/rtl/gtalleg/gtalleg.c → harbour/contrib/gtalleg/gtalleg.c
View File

13
harbour/source/rtl/gtalleg/make_b32.bat → harbour/contrib/gtalleg/make_b32.bat
View File

@@ -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

2
harbour/source/rtl/gtalleg/make_gcc.sh → harbour/contrib/gtalleg/make_gcc.sh
View File

@@ -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

13
harbour/source/rtl/gtalleg/make_vc.bat → harbour/contrib/gtalleg/make_vc.bat
View File

@@ -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

0
harbour/source/rtl/gtalleg/ssf.c → harbour/contrib/gtalleg/ssf.c
View File

0
harbour/source/rtl/gtalleg/ssf.h → harbour/contrib/gtalleg/ssf.h
View File

1
harbour/contrib/make_b32_all.bat
View File

@@ -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

1
harbour/contrib/make_gcc_all.sh
View File

@@ -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;

1
harbour/contrib/make_vc_all.bat
View File

@@ -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

6
harbour/doc/dirstruc.txt
View File

@@ -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.

6
harbour/harbour-ce-spec
View File

@@ -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

6
harbour/harbour-w32-spec
View File

@@ -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

6
harbour/harbour.spec
View File

@@ -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}"

1
harbour/include/hbgtcore.h
View File

@@ -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 )

13
harbour/source/rtl/gtalleg/Makefile
View File

@@ -1,13 +0,0 @@
#
# $Id$
#
ROOT = ../../../
C_SOURCES=\
gtalleg.c \
ssf.c \
LIBNAME=gtalleg
include $(TOP)$(ROOT)config/lib.cf