aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/Android.mk
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-02-01 08:36:02 +0100
committermarha <marha@users.sourceforge.net>2012-02-01 08:36:02 +0100
commit68320ff05946f092b6836754c6267b1dff2f4633 (patch)
tree424d73f509dff521d4cc22a95369594b7ee56dad /mesalib/src/glsl/Android.mk
parent71b5bea4d5ef75f50bd7bd7b93f47f8552c178e0 (diff)
parent58ff764d4111bfaa7360c57bc62dd620fbdce06f (diff)
downloadvcxsrv-68320ff05946f092b6836754c6267b1dff2f4633.tar.gz
vcxsrv-68320ff05946f092b6836754c6267b1dff2f4633.tar.bz2
vcxsrv-68320ff05946f092b6836754c6267b1dff2f4633.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/glsl/Android.mk')
-rw-r--r--mesalib/src/glsl/Android.mk18
1 files changed, 9 insertions, 9 deletions
diff --git a/mesalib/src/glsl/Android.mk b/mesalib/src/glsl/Android.mk
index d7d17dd6d..754f3cced 100644
--- a/mesalib/src/glsl/Android.mk
+++ b/mesalib/src/glsl/Android.mk
@@ -34,9 +34,9 @@ include $(LOCAL_PATH)/Makefile.sources
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
- $(LIBGLCPP_SOURCES) \
- $(LIBGLSL_SOURCES) \
- $(LIBGLSL_CXX_SOURCES)
+ $(LIBGLCPP_FILES) \
+ $(LIBGLSL_FILES) \
+ $(LIBGLSL_CXX_FILES)
LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \
@@ -55,11 +55,11 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
- $(LIBGLCPP_SOURCES) \
- $(LIBGLSL_SOURCES) \
- $(LIBGLSL_CXX_SOURCES) \
- $(BUILTIN_COMPILER_CXX_SOURCES) \
- $(GLSL_COMPILER_CXX_SOURCES)
+ $(LIBGLCPP_FILES) \
+ $(LIBGLSL_FILES) \
+ $(LIBGLSL_CXX_FILES) \
+ $(BUILTIN_COMPILER_CXX_FILES) \
+ $(GLSL_COMPILER_CXX_FILES)
LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \
@@ -82,7 +82,7 @@ include $(BUILD_HOST_EXECUTABLE)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
- $(GLSL_COMPILER_CXX_SOURCES)
+ $(GLSL_COMPILER_CXX_FILES)
LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \