projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glsl: Allow vectors to be created from ir_constant().
[mesa.git]
/
src
/
mesa
/
program
/
Android.mk
diff --git
a/src/mesa/program/Android.mk
b/src/mesa/program/Android.mk
index 5eb04395526ff32bd9a209203fcc758edc8a7016..3f974ea27290be9e4b0bd5350b89567c81c6af4b 100644
(file)
--- a/
src/mesa/program/Android.mk
+++ b/
src/mesa/program/Android.mk
@@
-38,7
+38,7
@@
endef
# Import the following variables:
# PROGRAM_FILES
# Import the following variables:
# PROGRAM_FILES
-include $(MESA_TOP)/src/mesa/
sources.mak
+include $(MESA_TOP)/src/mesa/
Makefile.sources
include $(CLEAR_VARS)
include $(CLEAR_VARS)
@@
-49,7
+49,7
@@
intermediates := $(call local-intermediates-dir)
MESA_ENABLED_APIS := ES1 ES2
MESA_ENABLED_APIS := ES1 ES2
-# TODO(chadv): In
sources.mak
, move these vars to a different list so we can
+# TODO(chadv): In
Makefile.sources
, move these vars to a different list so we can
# remove this kludge.
generated_sources_basenames := \
lex.yy.c \
# remove this kludge.
generated_sources_basenames := \
lex.yy.c \
@@
-65,8
+65,8
@@
LOCAL_GENERATED_SOURCES := \
$(intermediates)/program/program_parse.tab.c: $(LOCAL_PATH)/program_parse.y
$(mesa_local-y-to-c-and-h)
$(intermediates)/program/program_parse.tab.c: $(LOCAL_PATH)/program_parse.y
$(mesa_local-y-to-c-and-h)
-$(intermediates)/program/program_parse.tab.h: $(
LOCAL_PATH)/program_parse.y
- $(mesa_local-y-to-c-and-h)
+$(intermediates)/program/program_parse.tab.h: $(
intermediates)/program/program_parse.tab.c
+ @
$(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program_lexer.l
$(local-l-to-c)
$(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program_lexer.l
$(local-l-to-c)