d8ef95e7be
* harbour/config/rules.cf
* harbour/config/bsd/gcc.cf
* harbour/config/darwin/gcc.cf
* harbour/config/dos/bcc16.cf
* harbour/config/dos/djgpp.cf
* harbour/config/dos/owatcom.cf
* harbour/config/dos/rsx32.cf
* harbour/config/dos/watcom.cf
* harbour/config/linux/gcc.cf
* harbour/config/os2/gcc.cf
* harbour/config/os2/icc.cf
* harbour/config/sunos/gcc.cf
* harbour/config/w32/bcc32.cf
* harbour/config/w32/gcc.cf
* harbour/config/w32/global.cf
* harbour/config/w32/icc.cf
* harbour/config/w32/mingw32.cf
* harbour/config/w32/msvc.cf
* harbour/config/w32/rsxnt.cf
* harbour/config/w32/watcom.cf
* use F macro extension to extract file name from given macros.
It simplified some rules and allow to use vpath and differ file
locations in GNU Makefiles
* moved the BCC16 excpetion for C_RULE from global rules.cf to
DOS bcc16.cf file
* use mainstd library in MinGW build
* harbour/include/hbapi.h
+ added two new functions: hb_winmainArgInit() and hb_winmainArgGet()
to set/retrieve WinMain() parameters.
+ added hb_strMatchWildExact()
* harbour/source/pp/ppcore.c
* initialized variable to avoid compiler warning
* harbour/source/rtl/console.c
* cleaned comment
* harbour/source/rtl/hbffind.c
! Fixed invalid handle error in Windows when file() fails
(fix borrowed from xHarbour)
* harbour/source/rtl/strmatch.c
+ added hb_strMatchWildExact()
+ added 3-rd parameter <lExact> to WildMatch() - when it's TRUE
WildMatch() will check if given pattern cover the whole string.
Without it it check if pattern is valid prefix only.
* harbour/source/rtl/gtcrs/gtcrs.c
* harbour/source/rtl/gtcrs/gtcrs.h
* harbour/source/rtl/gtsln/mousesln.c
* do not call Gpm_GetSnapshot() to avoid stupid message on stderr
generated from GPM library - I lost the the hope that it will be
fixed ;-)
* harbour/source/rtl/gtpca/gtpca.c
* use select() in *nixes for cursor position terminal feedback.
* harbour/source/rtl/gtwin/gtwin.c
* try to always allocate console when compiled without
HB_NO_ALLOC_CONSOLE. It allow to use GTWIN also in real windows
programs.
+ harbour/source/rtl/gtwvt/Makefile
+ harbour/source/rtl/gtwvt/gtwvt.c
+ harbour/source/rtl/gtwvt/gtwvt.h
+ added new GT driver GTWVT - the core of this driver it's Peter Ress
work in xHarbour. In Harbour GTWVT contains only pure GT code without
local to GTWVT xHarbour extensions and GTWVT contrib libraries.
This extensions can be added but later but I want to keep them
separated from the core GTWVT code and add them as upper level GT
which can inherit from GTWVT. Just like I've implemented CTWIN.
Please update non GNU make files and test this GT in Windows.
The programs which want to use GTWVT should be compiled as standard
Windows GUI programs. GTWVT replaces window console code.
if you add to your code:
proc GTSYS()
request HB_GT_WIN
request HB_GT_WVT
return
then the final binaries will be linked with both GT drivers and you
can switch between them using //gt[:]<name> switch. F.e.:
./my_prog //gtwin
or
./my_prog //gtwvt
this feature works in all platforms.
People who works in shell environment (*nixes, MSYS, DJGPP) and use
hb* scripts does not have to use GTSYS() in source code but can simply
use -gt<name> switch in hblnk and hbmk.
* harbour/source/rtl/gtxwc/gtxwc.c
* some minor cleanups and code formatting
* harbour/source/vm/Makefile
+ harbour/source/vm/mainstd/Makefile
* moved mainstd.c to separate mainstd library for MinGW32 build.
Unfortunately MinGW always link main() function if it locate
it in libraries and ignores WinMain() what effectively makes
impossible to create Windows GUI programs if we have main() in
VM library. People who are using MinGW and wants to create only
pure console programs should now include mainstd library to linked
library list.
* harbour/source/vm/cmdarg.c
* harbour/source/vm/mainwin.c
+ added two new functions: hb_winmainArgInit() and hb_winmainArgGet()
to set/retrieve WinMain() parameters.
118 lines
2.5 KiB
CFEngine3
118 lines
2.5 KiB
CFEngine3
#
|
|
# $Id$
|
|
#
|
|
|
|
include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
|
|
|
|
ifeq ($(HB_COMPILER),gpp)
|
|
HB_CMP = g++
|
|
else
|
|
HB_CMP = $(HB_COMPILER)
|
|
endif
|
|
|
|
OBJ_EXT = .o
|
|
EXE_EXT =
|
|
LIB_PREF = lib
|
|
LIB_EXT = .a
|
|
|
|
CC = $(HB_CCACHE) $(HB_CMP)
|
|
CC_IN = -c
|
|
CC_OUT = -o
|
|
CPPFLAGS = -I. -I$(HB_INC_COMPILE)
|
|
|
|
# We are under linux
|
|
CFLAGS = -DHB_OS_LINUX -Wall -W -fsigned-char
|
|
|
|
# uncomment this if you want to farce relocateable code for .so libs
|
|
# it's necessary on some platforms but can reduce performance
|
|
#CFLAGS += -fPIC
|
|
|
|
ifeq ($(HB_LEX),SIMPLEX)
|
|
CFLAGS += -DSIMPLEX
|
|
endif
|
|
|
|
|
|
LD = $(HB_CCACHE) $(HB_CMP)
|
|
LD_OUT = -o
|
|
|
|
# Add all libraries specified in CONTRIBS and LIBS.
|
|
ifeq ($(HB_LIB_COMPILE),)
|
|
LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH))
|
|
LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(HB_ARCH))
|
|
else
|
|
LINKPATHS += -L$(HB_LIB_COMPILE)
|
|
endif
|
|
|
|
# our libs have a lot of cross referenced now and we have to group them
|
|
# untill we don't clean them
|
|
LINKLIBS += -Wl,--start-group
|
|
|
|
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
|
|
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
|
|
|
|
# If LIBS specifies the rdd library, add all DB drivers.
|
|
ifeq ($(findstring rdd,$(LIBS)),rdd)
|
|
LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH))
|
|
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
|
|
endif
|
|
|
|
# Add the specified GT driver library and other RTLs
|
|
ifeq ($(findstring rtl,$(LIBS)),rtl)
|
|
|
|
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)
|
|
LINKLIBS += -l$(HB_GT_LIB)
|
|
|
|
ifneq ($(HB_GT_DEFAULT),)
|
|
ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB))
|
|
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(ARCH)
|
|
LINKLIBS += -l$(HB_GT_DEFAULT)
|
|
endif
|
|
endif
|
|
|
|
# HB_SCREEN_LIB: empty, or one of ncurses, slang
|
|
ifeq ($(HB_GT_LIB),gtcrs)
|
|
HB_SCREEN_LIB:=ncurses
|
|
else
|
|
ifeq ($(HB_GT_LIB),gtsln)
|
|
HB_SCREEN_LIB:=slang
|
|
else
|
|
ifeq ($(HB_GT_LIB),gtalleg)
|
|
HB_GTALLEG:=yes
|
|
LINKLIBS += `allegro-config --static`
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
ifneq ($(HB_SCREEN_LIB),)
|
|
LINKLIBS += -l$(HB_SCREEN_LIB)
|
|
endif
|
|
|
|
ifeq ($(HB_GT_LIB),gtxvt)
|
|
LINKLIBS += -lX11
|
|
#LINKPATHS += -L/usr/X11R6/lib64
|
|
LINKPATHS += -L/usr/X11R6/lib
|
|
else
|
|
ifeq ($(HB_GT_LIB),gtxwc)
|
|
LINKLIBS += -lX11
|
|
#LINKPATHS += -L/usr/X11R6/lib64
|
|
LINKPATHS += -L/usr/X11R6/lib
|
|
endif
|
|
endif
|
|
|
|
# HB_GPM_MOUSE: use gpm mouse driver
|
|
ifeq ($(HB_GPM_MOUSE),yes)
|
|
LINKLIBS += -lgpm
|
|
endif
|
|
|
|
endif
|
|
|
|
LINKLIBS += -lm -Wl,--end-group
|
|
|
|
LDFLAGS = $(LINKPATHS)
|
|
|
|
AR = ar
|
|
ARFLAGS = $(A_USR)
|
|
AR_RULE = $(AR) $(ARFLAGS) cr $@ $(^F) || $(RM) $@
|
|
|
|
include $(TOP)$(ROOT)config/rules.cf
|