From 0e768820352cccdaf508ac475021b74124ba2570 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 21 Feb 2009 14:04:24 +0000 Subject: [PATCH] 2009-02-21 15:03 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + source/vm/fm + source/vm/fm/Makefile + source/vm/fmmt + source/vm/fmmt/Makefile * source/vm/Makefile + Added hbfm, hbfmmt lib generation which works for all compilers, not just gcc family. ; Please review. ; TOFIX: For some reason the locally added C flags appear twice. Couldn't find out why. --- harbour/ChangeLog | 12 ++++++++++++ harbour/source/vm/Makefile | 4 +++- harbour/source/vm/fm/Makefile | 19 +++++++++++++++++++ harbour/source/vm/fmmt/Makefile | 18 ++++++++++++++++++ 4 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 harbour/source/vm/fm/Makefile create mode 100644 harbour/source/vm/fmmt/Makefile diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c938f5b12d..a9e89c2b3d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,18 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-21 15:03 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + + source/vm/fm + + source/vm/fm/Makefile + + source/vm/fmmt + + source/vm/fmmt/Makefile + * source/vm/Makefile + + Added hbfm, hbfmmt lib generation which works for + all compilers, not just gcc family. + ; Please review. + ; TOFIX: For some reason the locally added C flags + appear twice. Couldn't find out why. + 2009-02-21 14:03 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * bin/hb-func.sh * utils/hbmk2/hbmk2.prg diff --git a/harbour/source/vm/Makefile b/harbour/source/vm/Makefile index 2cc28d67ea..836d3b7edf 100644 --- a/harbour/source/vm/Makefile +++ b/harbour/source/vm/Makefile @@ -65,13 +65,15 @@ PRG_SOURCES=\ LIBNAME=hbvm +DIRS+= fm + ifeq ($(HB_MT),) HB_MT=MT HB_USER_CFLAGS:=$(subst -DHB_MT_VM,,$(HB_USER_CFLAGS)) endif ifeq ($(HB_MT),MT) ifneq ($(HB_ARCHITECTURE),dos) - DIRS+= vmmt + DIRS+= vmmt fmmt endif endif diff --git a/harbour/source/vm/fm/Makefile b/harbour/source/vm/fm/Makefile new file mode 100644 index 0000000000..2e20ba66b0 --- /dev/null +++ b/harbour/source/vm/fm/Makefile @@ -0,0 +1,19 @@ +# +# $Id$ +# + +vpath %.c ../ + +ROOT = ../../../ + +C_SOURCES=\ + fm.c \ + +LIBNAME=hbfm + +HB_USER_CFLAGS :=$(subst -DHB_MT_VM,,$(HB_USER_CFLAGS)) +HB_USER_CFLAGS :=$(subst -DHB_FM_STATISTICS_OFF,,$(HB_USER_CFLAGS)) +HB_USER_CFLAGS :=$(subst -DHB_FM_STATISTICS_DYN_OFF,,$(HB_USER_CFLAGS)) +HB_USER_CFLAGS += -DHB_FM_STATISTICS + +include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/vm/fmmt/Makefile b/harbour/source/vm/fmmt/Makefile new file mode 100644 index 0000000000..f3f9d959d5 --- /dev/null +++ b/harbour/source/vm/fmmt/Makefile @@ -0,0 +1,18 @@ +# +# $Id$ +# + +vpath %.c ../ + +ROOT = ../../../ + +C_SOURCES=\ + fm.c \ + +LIBNAME=hbfmmt + +HB_USER_CFLAGS :=$(subst -DHB_FM_STATISTICS_OFF,,$(HB_USER_CFLAGS)) +HB_USER_CFLAGS :=$(subst -DHB_FM_STATISTICS_DYN_OFF,,$(HB_USER_CFLAGS)) +HB_USER_CFLAGS += -DHB_FM_STATISTICS -DHB_MT_VM + +include $(TOP)$(ROOT)config/lib.cf