34f14f481e
* config/global.cf
* config/rules.cf
* config/dos/watcom.cf
* config/win/watcom.cf
* config/os2/watcom.cf
% Using HB_PRGFLAGS instead of HB_FLAGSEXTRA.
% Using HB_CFLAGS and HB_PRGFLAGS instead of HB_CDBG.
% Using HB_CFLAGS instead of HB_CUNICODE.
% Moved all flags from HB_RULE to HB_FLAGS (except HB_USER_PRGFLAGS).
This only affects dos/watcom, more cmdlines will be put in HARBOURCMD.
* external/sqlite3/Makefile
* external/libhpdf/Makefile
* external/libpng/Makefile
* source/vm/maindllh/Makefile
* source/vm/maindllp/Makefile
* source/vm/vmmt/Makefile
* source/rtl/gtxwc/Makefile
* source/rtl/gtcrs/Makefile
* source/rtl/gttrm/Makefile
* source/rtl/gtsln/Makefile
* contrib/gtalleg/Makefile
* contrib/hbmysql/Makefile
* contrib/hbodbc/Makefile
* contrib/hbsqlit3/Makefile
* contrib/hbqt/Makefile
* contrib/hbfbird/Makefile
* contrib/hbcurl/hbcurls/Makefile
* contrib/hbcurl/Makefile
* contrib/gtqtc/Makefile
* contrib/rddsql/sddmy/Makefile
* contrib/rddsql/sddpg/Makefile
* contrib/rddsql/sddfb/Makefile
* contrib/rddsql/sddodbc/Makefile
* contrib/hbhpdf/Makefile
* contrib/hbpgsql/Makefile
* contrib/rddads/Makefile
* contrib/hbfimage/Makefile
* contrib/hbgd/Makefile
* contrib/hbtip/hbtipssl/Makefile
* contrib/hbssl/Makefile
! Using HB_CFLAGS/HB_PRGFLAGS to specify Makefile local
compiler settings instead of modifying HB_USER_*FLAGS.
This way the double defines are gone.
+ Included global.cf to all Makefiles which needs to modify
HB_CFLAGS/HB_PRGFLAGS. Probably we should move global.cf
inclusion to the top of all Makefiles as a convention.
Not terribly elegant, but solves a few problems and
more efficient.
% Changed ', -I$(d))' to ',-I$(d))' along the way. This avoids
wasting an extra space in command line.
; NOTE: It'd still be beneficial to find a way to get rid of
'descend' rule. It could make cmdlines cleaner/shorter
and whole build process simpler/faster. I didn't manage
so far.
* source/vm/Makefile
* Deleted 'HB_USER_CFLAGS := $(subst -DHB_MT_VM,,$(HB_USER_CFLAGS))'
(since it's no longer supported practice to modify user supplied flags)
I'm not sure if it's important enough to have. AFAIK there is no
reason users use HB_MT_VM define, it's not a public setting, so we
shouldn't go too much far in trying to protect against its presence.
If it's needed, we should add 'HB_CFLAGS += -DHB_ST_VM' and handle
HB_ST_VM as the reverse of HB_MT_VM inside the source.
* source/rdd/dbffpt/dbffpt1.c
* source/rdd/dbffpt/Makefile
* Optimizations are now disabled using #pragma for __XCC__ instead of
deleting them from HB_USER_CFLAGS. Please test, and see above on
modifying HB_USER_CFLAGS in our make files.
* bin/postinst.cmd
! Deleted double quote from target dir in xcopy commands.
Blind change.
* utils/hbtest/rt_main.ch
* utils/hbtest/hbtest.hbp
* utils/hbtest/Makefile
+ Changed to use #pragma to turn on line numbers instead of
using HB_USER_PRGFLAGS (or HB_PRGFLAGS). This way there is
no need for Makefile hack/tweaks and it works with all make methods
automatically.
* config/instsh.cf
! Partially restored a few things which were lost without comments
in prev OS/2 commit:
- Formatting
- '@' prefixes
- '-' prefixes
127 lines
1.8 KiB
Makefile
127 lines
1.8 KiB
Makefile
#
|
|
# $Id$
|
|
#
|
|
|
|
ROOT := ../../
|
|
|
|
include $(TOP)$(ROOT)config/global.cf
|
|
|
|
ifeq ($(HB_HVM_ALL),)
|
|
|
|
HB_HVM_ALL := yes
|
|
ifeq ($(HB_COMPILER),watcom)
|
|
HB_HVM_ALL := no
|
|
endif
|
|
ifeq ($(HB_COMPILER),bcc)
|
|
HB_HVM_ALL := no
|
|
endif
|
|
ifeq ($(HB_COMPILER),pocc)
|
|
HB_HVM_ALL := no
|
|
endif
|
|
ifeq ($(HB_COMPILER),pocc64)
|
|
HB_HVM_ALL := no
|
|
endif
|
|
ifeq ($(HB_COMPILER),poccarm)
|
|
HB_HVM_ALL := no
|
|
endif
|
|
ifeq ($(HB_COMPILER),xcc)
|
|
HB_HVM_ALL := no
|
|
endif
|
|
ifeq ($(HB_COMPILER),dmc)
|
|
HB_HVM_ALL := no
|
|
endif
|
|
export HB_HVM_ALL
|
|
endif
|
|
|
|
DIRS :=
|
|
|
|
ifeq ($(HB_ARCHITECTURE),win)
|
|
ifeq ($(HB_COMPILER),mingw)
|
|
C_MAIN := mainwin.c
|
|
else
|
|
C_MAIN := mainstd.c mainwin.c
|
|
endif
|
|
DIRS := mainstd mainwin maindllh maindllp
|
|
else
|
|
ifeq ($(HB_ARCHITECTURE),wce)
|
|
C_MAIN := mainwin.c
|
|
DIRS := mainstd mainwin maindllh maindllp
|
|
else
|
|
ifeq ($(HB_ARCHITECTURE),os2)
|
|
C_MAIN := mainstd.c
|
|
else
|
|
C_MAIN := main.c
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
ifeq ($(HB_HVM_ALL),yes)
|
|
|
|
C_SOURCES := \
|
|
hvmall.c \
|
|
|
|
else
|
|
|
|
C_SOURCES := \
|
|
hvm.c \
|
|
arrays.c \
|
|
classes.c \
|
|
dynsym.c \
|
|
codebloc.c \
|
|
estack.c \
|
|
extend.c \
|
|
fm.c \
|
|
garbage.c \
|
|
hashes.c \
|
|
itemapi.c \
|
|
macro.c \
|
|
memvars.c \
|
|
set.c \
|
|
thread.c \
|
|
|
|
endif
|
|
|
|
C_SOURCES += \
|
|
arrayshb.c \
|
|
asort.c \
|
|
break.c \
|
|
cmdarg.c \
|
|
debug.c \
|
|
dynlibhb.c \
|
|
eval.c \
|
|
evalhb.c \
|
|
extrap.c \
|
|
hashfunc.c \
|
|
initexit.c \
|
|
initsymb.c \
|
|
memvclip.c \
|
|
pcount.c \
|
|
pvalue.c \
|
|
proc.c \
|
|
runner.c \
|
|
vm.c \
|
|
$(C_MAIN) \
|
|
|
|
PRG_SOURCES := \
|
|
harbinit.prg \
|
|
|
|
LIBNAME := hbvm
|
|
|
|
ifneq ($(HB_MT),yes)
|
|
ifeq ($(HB_ARCHITECTURE),dos)
|
|
ifneq ($(HB_COMPILER),djgpp)
|
|
ifneq ($(HB_COMPILER),watcom)
|
|
HB_MT := no
|
|
endif
|
|
endif
|
|
endif
|
|
endif
|
|
ifneq ($(HB_MT),no)
|
|
DIRS += vmmt
|
|
endif
|
|
|
|
include $(TOP)$(ROOT)config/lib.cf
|
|
ifneq ($(DIRS),)
|
|
include $(TOP)$(ROOT)config/dir.cf
|
|
endif
|