aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Grill <xovo@users.sourceforge.net>2005-06-05 10:27:58 +0000
committerThomas Grill <xovo@users.sourceforge.net>2005-06-05 10:27:58 +0000
commit38c62f94d1bc0a65372077797fa95dac5bd85006 (patch)
tree8cd4e66ef238330a7b8a3a2cdf5f08f8c4013d16
parentee4b6fc5eacb14be2a2ce5cf15e06ff1d377a891 (diff)
small changes to flext build system
svn path=/trunk/; revision=3114
-rw-r--r--externals/grill/flext/buildsys/lnx/gnumake-gcc.inc8
-rw-r--r--externals/grill/flext/buildsys/lnx/gnumake-icc.inc8
-rw-r--r--externals/grill/flext/buildsys/mac/gnumake-gcc.inc12
3 files changed, 28 insertions, 0 deletions
diff --git a/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc b/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc
index 92b71ccf..49986233 100644
--- a/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc
+++ b/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc
@@ -1,9 +1,17 @@
##############################################
+ifndef FLEXTINC
FLEXTINC=$(FLEXTPREFIX)/include/flext
+endif
+ifndef FLEXTLIB
FLEXTLIB=$(FLEXTPREFIX)/lib
+endif
+ifndef FLEXTSYS
FLEXTSYS=$(FLEXTPREFIX)/lib/flext
+endif
+ifndef FLEXTBIN
FLEXTBIN=$(FLEXTPREFIX)/bin
+endif
##############################################
diff --git a/externals/grill/flext/buildsys/lnx/gnumake-icc.inc b/externals/grill/flext/buildsys/lnx/gnumake-icc.inc
index be58fc13..7e665db3 100644
--- a/externals/grill/flext/buildsys/lnx/gnumake-icc.inc
+++ b/externals/grill/flext/buildsys/lnx/gnumake-icc.inc
@@ -1,9 +1,17 @@
##############################################
+ifndef FLEXTINC
FLEXTINC=$(FLEXTPREFIX)/include/flext
+endif
+ifndef FLEXTLIB
FLEXTLIB=$(FLEXTPREFIX)/lib
+endif
+ifndef FLEXTSYS
FLEXTSYS=$(FLEXTPREFIX)/lib/flext
+endif
+ifndef FLEXTBIN
FLEXTBIN=$(FLEXTPREFIX)/bin
+endif
##############################################
diff --git a/externals/grill/flext/buildsys/mac/gnumake-gcc.inc b/externals/grill/flext/buildsys/mac/gnumake-gcc.inc
index 1c85ac76..2f8a1eba 100644
--- a/externals/grill/flext/buildsys/mac/gnumake-gcc.inc
+++ b/externals/grill/flext/buildsys/mac/gnumake-gcc.inc
@@ -5,14 +5,26 @@ FLEXTFRAMEWORK=$(FLEXTPREFIX)/flext.framework
endif
ifdef FLEXTFRAMEWORK
+ifndef FLEXTLIB
FLEXTLIB=$(FLEXTFRAMEWORK)
+endif
+ifndef FLEXTINC
FLEXTINC=$(FLEXTFRAMEWORK)/Headers
+endif
+ifndef FLEXTSYS
FLEXTSYS=$(FLEXTFRAMEWORK)/Resources
+endif
else
+ifndef FLEXTLIB
FLEXTLIB=$(FLEXTPREFIX)/lib
+endif
+ifndef FLEXTINC
FLEXTINC=$(FLEXTPREFIX)/include/flext
+endif
+ifndef FLEXTSYS
FLEXTSYS=$(FLEXTPREFIX)/lib/flext
endif
+endif
FLEXTBIN=$(FLEXTPREFIX)/bin