Pastebin launched a little side project called HostCabi.net, check it out ;-)Don't like ads? PRO users don't see any ads ;-)
Guest

Untitled

By: a guest on May 29th, 2013  |  syntax: Diff  |  size: 1.10 KB  |  hits: 4  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am
  2. index e11a17f..8ebe0a2 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,14 @@ builtin_compiler_SOURCES = \
  23.         $(top_srcdir)/src/mesa/program/symbol_table.c   \
  24.         $(BUILTIN_COMPILER_CXX_FILES)                   \
  25.         $(GLSL_COMPILER_CXX_FILES)
  26. +
  27. +if CROSS_COMPILING
  28. +builtin_compiler_SOURCES += \
  29. +       $(LIBGLCPP_GENERATED_FILES) \
  30. +       $(LIBGLCPP_FILES) \
  31. +       $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
  32. +       $(LIBGLSL_FILES)
  33. +builtin_compiler_CPPFLAGS = $(AM_CPPFLAGS)
  34. +else
  35.  builtin_compiler_LDADD = libglslcore.la libglcpp.la
  36. +endif