diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-10 10:38:33 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-10 10:42:30 +0200 |
| commit | 2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7 (patch) | |
| tree | a32e3d5f8bb662ba5c14a72d97a553c4927c0b76 /mesalib/src/glsl/Android.mk | |
| parent | d53900c52abc2402f978b72278712e4bcdbde9f2 (diff) | |
| parent | 889d7dd8e94a5538f388cc619115bf5c0b6fc0b7 (diff) | |
| download | vcxsrv-2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7.tar.gz vcxsrv-2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7.tar.bz2 vcxsrv-2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 libXmu libxcb mesa xserver git update 10 Sep 2013
Conflicts:
mesalib/src/glsl/.gitignore
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/winclipboardwndproc.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winsetsp.c
Diffstat (limited to 'mesalib/src/glsl/Android.mk')
| -rw-r--r-- | mesalib/src/glsl/Android.mk | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/mesalib/src/glsl/Android.mk b/mesalib/src/glsl/Android.mk index f088e67cb..8a3942652 100644 --- a/mesalib/src/glsl/Android.mk +++ b/mesalib/src/glsl/Android.mk @@ -50,32 +50,6 @@ include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) # --------------------------------------- -# Build mesa_builtin_compiler for host -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(LIBGLCPP_FILES) \ - $(LIBGLSL_FILES) \ - $(BUILTIN_COMPILER_CXX_FILES) \ - $(GLSL_COMPILER_CXX_FILES) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa - -LOCAL_STATIC_LIBRARIES := libmesa_glsl_utils - -LOCAL_MODULE := mesa_builtin_compiler - -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true -include $(LOCAL_PATH)/Android.gen.mk -include $(MESA_COMMON_MK) -include $(BUILD_HOST_EXECUTABLE) - -# --------------------------------------- # Build glsl_compiler # --------------------------------------- |