Advertisement
Guest User

Untitled

a guest
May 29th, 2013
39
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.15 KB | None | 0 0
  1. diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am
  2. index e11a17f..e60c58d 100644
  3. --- a/src/glsl/builtin_compiler/Makefile.am
  4. +++ b/src/glsl/builtin_compiler/Makefile.am
  5. @@ -64,6 +64,8 @@ AM_CXXFLAGS = $(AM_CFLAGS)
  6.  include ../Makefile.sources
  7.  
  8.  noinst_PROGRAMS = builtin_compiler
  9. +
  10. +if !CROSS_COMPILING
  11.  noinst_LTLIBRARIES = libglslcore.la libglcpp.la
  12.  
  13.  libglcpp_la_SOURCES =                  \
  14. @@ -73,6 +75,7 @@ libglcpp_la_SOURCES =                 \
  15.  libglslcore_la_SOURCES =               \
  16.     $(BUILTIN_COMPILER_GENERATED_CXX_FILES)     \
  17.     $(LIBGLSL_FILES)
  18. +endif
  19.  
  20.  builtin_compiler_SOURCES = \
  21.     $(top_srcdir)/src/mesa/main/hash_table.c    \
  22. @@ -81,4 +84,15 @@ builtin_compiler_SOURCES = \
  23.     $(top_srcdir)/src/mesa/program/symbol_table.c   \
  24.     $(BUILTIN_COMPILER_CXX_FILES)           \
  25.     $(GLSL_COMPILER_CXX_FILES)
  26. +builtin_compiler_CPPFLAGS = $(AM_CPPFLAGS)
  27. +
  28. +if CROSS_COMPILING
  29. +builtin_compiler_SOURCES += \
  30. +   $(LIBGLCPP_GENERATED_FILES) \
  31. +   $(LIBGLCPP_FILES) \
  32. +   $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
  33. +   $(LIBGLSL_FILES)
  34. +builtin_compiler_CPPFLAGS = $(AM_CPPFLAGS)
  35. +else
  36.  builtin_compiler_LDADD = libglslcore.la libglcpp.la
  37. +endif
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement