4f7bb3e481
+ harbour/config/linux/icc.cf
* harbour/config/linux/gcc.cf
* harbour/bin/hb-func.sh
* harbour/bin/postinst.sh
* harbour/source/common/hbver.c
+ added support for Intel(R) C/C++ compiler
* harbour/bin/postinst.sh
% use hb-mkdyn symlink instead of regenerating it as hb-mkslib
It will work also in DOS/Windows (MSys/DJGPP emulates ln -s ...)
* harbour/source/vm/thread.c
* removed all references to HB_THREAD_EQUAL()/HB_THREAD_SELF() in
non MT builds
* harbour/source/rtl/console.c
! fixed default color setting in hb_dispOutAtBox()
* harbour/contrib/gtwvg/wvggui.h
* harbour/contrib/gtwvg/wvgwin.c
* harbour/contrib/gtwvg/wincallb.c
* harbour/contrib/gtwvg/wvgsink.c
! fixes for C++ compilation:
- this is reserved word in C++ - do not use it as variable name
- class is reserved word in C++ - do not use it as variable name
- use macros to hide differences between C and C++ WinAPI
- casting
98 lines
2.0 KiB
CFEngine3
98 lines
2.0 KiB
CFEngine3
#
|
|
# $Id$
|
|
#
|
|
|
|
include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
|
|
|
|
# set compiler name to icc or icpc
|
|
HB_CMP = $(HB_COMPILER)
|
|
|
|
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)
|
|
|
|
#CFLAGS = -fast
|
|
#CFLAGS = -xHOST
|
|
CFLAGS = -O3 -D_GNU_SOURCE
|
|
#CFLAGS += -std=c99
|
|
#CFLAGS += -w2 -Wall
|
|
|
|
|
|
# uncomment this if you want to force relocateable code for .so libs
|
|
# it's necessary on some platforms but can reduce performance
|
|
#CFLAGS += -fPIC
|
|
|
|
LD = $(HB_CCACHE) $(HB_CMP)
|
|
LD_OUT = -o
|
|
|
|
# Add all libraries specified in CONTRIBS and LIBS.
|
|
ifeq ($(HB_LIB_COMPILE),)
|
|
LINKPATHS += -L$(LIB_DIR)
|
|
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)
|
|
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
|
|
endif
|
|
|
|
# Add the specified GT driver library and other RTLs
|
|
ifeq ($(findstring rtl,$(LIBS)),rtl)
|
|
|
|
LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt))
|
|
|
|
# screen driver libraries
|
|
ifeq ($(HB_CRS_LIB),)
|
|
HB_CRS_LIB=ncurses
|
|
endif
|
|
ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),)
|
|
LINKLIBS += -l$(HB_CRS_LIB)
|
|
endif
|
|
ifneq ($(findstring gtsln, $(HB_GT_LIBS)),)
|
|
LINKLIBS += -lslang
|
|
endif
|
|
ifneq ($(findstring gtxwc, $(HB_GT_LIBS)),)
|
|
LINKLIBS += -lX11
|
|
#LINKPATHS += -L/usr/X11R6/lib64
|
|
LINKPATHS += -L/usr/X11R6/lib
|
|
endif
|
|
|
|
# HB_GPM_MOUSE: use gpm mouse driver
|
|
ifeq ($(HB_GPM_MOUSE),yes)
|
|
LINKLIBS += -lgpm
|
|
endif
|
|
|
|
endif
|
|
|
|
ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
|
|
LINKLIBS += -lpcre
|
|
endif
|
|
|
|
ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
|
|
LINKLIBS += -lz
|
|
endif
|
|
|
|
LINKLIBS += -lm -lrt -ldl -Wl,--end-group
|
|
|
|
LDFLAGS = $(LINKPATHS)
|
|
|
|
AR = xiar
|
|
ARFLAGS = $(HB_USER_AFLAGS)
|
|
AR_RULE = $(AR) $(ARFLAGS) crs $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
|
|
|
|
include $(TOP)$(ROOT)config/rules.cf
|