* harbour/config/w32/bcc32.cf
* harbour/include/hbexprb.c
* harbour/include/hbpcode.h
* harbour/include/hbxvm.h
* harbour/source/compiler/genc.c
* harbour/source/compiler/gencc.c
* harbour/source/compiler/hbdead.c
* harbour/source/compiler/hbfix.c
* harbour/source/compiler/hblbl.c
* harbour/source/compiler/hbpcode.c
* harbour/source/compiler/hbstripl.c
* harbour/source/rtl/set.c
* harbour/source/rtl/gtsln/gtsln.c
* harbour/source/vm/hvm.c
* recent fixes from Beta1
* harbour/contrib/libct/Makefile
- harbour/contrib/libct/bit1.c
- harbour/contrib/libct/bit2.c
- harbour/contrib/libct/bit3.c
+ harbour/contrib/libct/bitnum.c
! rewritten bit functions
* harbour/contrib/libct/addascii.c
* cleanup
* harbour/contrib/odbc/Makefile
* harbour/contrib/odbc/odbc.c
* harbour/contrib/odbc/sql.ch
- harbour/contrib/odbc/sql.h
- harbour/contrib/odbc/sqlext.h
- harbour/contrib/odbc/sqltypes.h
* harbour/contrib/odbc/todbc.prg
! synced with xHarbour
* harbour/contrib/rdd_ads/ads1.c
! fixed typo in DBI_GETHEADERSIZE
* harbour/contrib/rdd_ads/adsfunc.c
+ added ADSDDREMOVEINDEXFILE - borrowed from xHarbour
* harbour/source/rtl/alert.prg
* minor cleanup
* harbour/source/rtl/gtfunc.c
* use HB_ERR_ARGS_BASEPARAMS in error messages
* harbour/source/rtl/transfrm.c
* casting
86 lines
2.1 KiB
CFEngine3
86 lines
2.1 KiB
CFEngine3
#
|
|
# $Id$
|
|
#
|
|
# The Harbour Project
|
|
# GNU MAKE file for Borland C/C++ 32bit (4.x, 5.x)
|
|
|
|
include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
|
|
|
|
OBJ_EXT = .obj
|
|
EXE_EXT = .exe
|
|
LIB_PREF =
|
|
LIB_EXT = .lib
|
|
|
|
CC = bcc32.exe
|
|
CC_IN = -c
|
|
CC_OUT = -o
|
|
CPPFLAGS = -I. -I$(TOP) -I$(TOP)$(ROOT)
|
|
CFLAGS = -O2 -d
|
|
|
|
ifneq ($(HB_INC_COMPILE),)
|
|
CPPFLAGS += -I$(HB_INC_COMPILE)
|
|
endif
|
|
|
|
LD = bcc32.exe
|
|
LDFLAGS = -O2
|
|
LD_OUT = -e
|
|
|
|
# Add all libraries specified in CONTRIBS and LIBS.
|
|
ifeq ($(HB_LIB_COMPILE),)
|
|
LINKLIBS += $(foreach lib, $(CONTRIBS), $(TOP)$(ROOT)/contrib/$(lib)/$(HB_ARCH)/$(subst lib,,$(lib))$(LIB_EXT))
|
|
LINKLIBS += $(foreach lib, $(LIBS), $(TOP)$(ROOT)/source/$(lib)/$(HB_ARCH)/$(lib)$(LIB_EXT))
|
|
else
|
|
LINKPATHS += -L$(HB_LIB_COMPILE)
|
|
LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(lib)$(LIB_EXT))
|
|
LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
|
|
endif
|
|
|
|
# If LIBS specifies the rdd library, add all DB drivers.
|
|
ifeq ($(findstring rdd,$(LIBS)),rdd)
|
|
ifeq ($(HB_LIB_COMPILE),)
|
|
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(TOP)$(ROOT)/source/rdd/$(drv)/$(HB_ARCH)/$(drv)$(LIB_EXT))
|
|
else
|
|
LINKPATHS += -L$(HB_LIB_COMPILE)
|
|
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(drv)$(LIB_EXT))
|
|
endif
|
|
endif
|
|
|
|
# Add the specified GT driver library
|
|
ifeq ($(findstring rtl,$(LIBS)),rtl)
|
|
LINKLIBS += $(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)/$(HB_GT_LIB)$(LIB_EXT)
|
|
|
|
ifneq ($(HB_GT_DEFAULT),)
|
|
ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB))
|
|
LINKLIBS += $(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)/$(HB_GT_DEFAULT)$(LIB_EXT)
|
|
endif
|
|
endif
|
|
|
|
endif
|
|
|
|
# HB_SCREEN_LIB: empty, or one of ncurses, slang
|
|
# HB_SCREEN_LIB=ncurses
|
|
# HB_SCREEN_LIB=slang
|
|
|
|
ifneq ($(HB_SCREEN_LIB),)
|
|
LINKLIBS += $(HB_SCREEN_LIB)
|
|
endif
|
|
|
|
# Add the optional user path(s)
|
|
ifneq ($(LNK_USR_PATH),)
|
|
LINKPATHS += $(foreach path, $(LNK_USR_PATH), -L$(path))
|
|
endif
|
|
|
|
# Add the optional user libarary (or libraries)
|
|
ifneq ($(LNK_USR_LIB),)
|
|
LINKLIBS += $(foreach lib, $(LNK_USR_LIB), $(lib)$(LIB_EXT))
|
|
endif
|
|
|
|
LDFLAGS = $(LINKPATHS)
|
|
|
|
AR = tlib.exe
|
|
ARFLAGS = $(A_USR)
|
|
AROBJS = $(foreach file, $(^F), -+$(file))
|
|
AR_RULE = $(AR) $(ARFLAGS) $@ $(AROBJS),,
|
|
|
|
include $(TOP)$(ROOT)config/rules.cf
|