diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-19 08:30:15 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-19 08:30:15 +0200 |
| commit | 89bc3ee988b62eb5e10284bac32a176955546410 (patch) | |
| tree | 186769abb7a48a7b04463706dee116795e07485f /mesalib/src/glsl/builtin_compiler | |
| parent | f5e157731e6b51421ac89cfefb666b8bbf971b03 (diff) | |
| download | vcxsrv-89bc3ee988b62eb5e10284bac32a176955546410.tar.gz vcxsrv-89bc3ee988b62eb5e10284bac32a176955546410.tar.bz2 vcxsrv-89bc3ee988b62eb5e10284bac32a176955546410.zip | |
mesa xkbcomp git update 19 Jul 2013
xkbcomp commit 0ebdf47fd4bc434ac3d2339544c022a869510738
esa commit 9f07ca11c1797ac12de1e1c6aef13cf58824b5f5
Diffstat (limited to 'mesalib/src/glsl/builtin_compiler')
| -rw-r--r-- | mesalib/src/glsl/builtin_compiler/Makefile.am | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mesalib/src/glsl/builtin_compiler/Makefile.am b/mesalib/src/glsl/builtin_compiler/Makefile.am index 823d546e1..5f1a995c3 100644 --- a/mesalib/src/glsl/builtin_compiler/Makefile.am +++ b/mesalib/src/glsl/builtin_compiler/Makefile.am @@ -65,6 +65,8 @@ AM_CXXFLAGS = $(AM_CFLAGS) include ../Makefile.sources noinst_PROGRAMS = builtin_compiler + +if !CROSS_COMPILING noinst_LTLIBRARIES = libglslcore.la libglcpp.la libglcpp_la_SOURCES = \ @@ -74,6 +76,7 @@ libglcpp_la_SOURCES = \ libglslcore_la_SOURCES = \ $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ $(LIBGLSL_FILES) +endif builtin_compiler_SOURCES = \ $(top_srcdir)/src/mesa/main/hash_table.c \ @@ -82,4 +85,14 @@ builtin_compiler_SOURCES = \ $(top_srcdir)/src/mesa/program/symbol_table.c \ $(BUILTIN_COMPILER_CXX_FILES) \ $(GLSL_COMPILER_CXX_FILES) + +if CROSS_COMPILING +builtin_compiler_SOURCES += \ + $(LIBGLCPP_GENERATED_FILES) \ + $(LIBGLCPP_FILES) \ + $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ + $(LIBGLSL_FILES) +builtin_compiler_CPPFLAGS = $(AM_CPPFLAGS) +else builtin_compiler_LDADD = libglslcore.la libglcpp.la +endif |