Android-x86
Fork
Faire un don

  • R/O
  • HTTP
  • SSH
  • HTTPS

external-mesa: Commit

external/mesa


Commit MetaInfo

Révision3892a101f1d0e7da9de0533bf56deb7126942321 (tree)
l'heure2012-04-06 12:30:02
AuteurChih-Wei Huang <cw_huang@htc....>
CommiterChih-Wei Huang

Message de Log

android: ensure building with stlport

Without adding the include path of stlport, it may include (incorrect)
headers from the toolchain.

Change Summary

Modification

--- a/Android.llvm.mk
+++ b/Android.llvm.mk
@@ -77,6 +77,7 @@ LLVM_ROOT_PATH := external/llvm
7777 include $(LLVM_ROOT_PATH)/llvm-device-build.mk
7878 endif
7979
80+include external/stlport/libstlport.mk
8081 # this is a shared library
8182 ifeq ($(strip $(LOCAL_MODULE_CLASS)),SHARED_LIBRARIES)
8283 LOCAL_SHARED_LIBRARIES += libstlport
--- a/src/glsl/Android.mk
+++ b/src/glsl/Android.mk
@@ -44,6 +44,7 @@ LOCAL_C_INCLUDES := \
4444
4545 LOCAL_MODULE := libmesa_glsl
4646
47+include external/stlport/libstlport.mk
4748 include $(LOCAL_PATH)/Android.gen.mk
4849 include $(MESA_COMMON_MK)
4950 include $(BUILD_STATIC_LIBRARY)
Afficher sur ancien navigateur de dépôt.