diff options
| author | Christian König <deathsimple@vodafone.de> | 2011-05-21 16:43:12 +0200 |
|---|---|---|
| committer | Christian König <deathsimple@vodafone.de> | 2011-05-21 16:43:12 +0200 |
| commit | aa63ebc48a2ee1ee9afbf2112d4d25e8a9a8d1e8 (patch) | |
| tree | c97d505614f1fd84d498484a45156e0064daf649 /configs | |
| parent | 120b55a96e30f1f74ba3448665cef3d724fed647 (diff) | |
| parent | 3c5e74186244f2d77cc711d2b487283459ed06ad (diff) | |
Merge remote-tracking branch 'origin/master' into pipe-video
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/autoconf.in | 4 | ||||
| -rw-r--r-- | configs/default | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index d493d64f80..5876727388 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -58,6 +58,10 @@ INSTALL = @INSTALL@ PYTHON2 = @PYTHON2@ PYTHON_FLAGS = -t -O -O +# Flex and Bison for GLSL compiler +FLEX = @FLEX@ +BISON = @BISON@ + # Library names (base name) GL_LIB = GL GLU_LIB = GLU diff --git a/configs/default b/configs/default index 0582a0210a..b7acfd2f1a 100644 --- a/configs/default +++ b/configs/default @@ -38,6 +38,8 @@ MKLIB_OPTIONS = MKDEP = makedepend MKDEP_OPTIONS = -fdepend MAKE = make +FLEX = flex +BISON = bison # Use MINSTALL for installing libraries, INSTALL for everything else MINSTALL = $(SHELL) $(TOP)/bin/minstall |