Changeset 5027 for pjproject/trunk


Ignore:
Timestamp:
Mar 26, 2015 5:08:40 AM (10 years ago)
Author:
nanang
Message:

Re #1822: Updated build script to auto define PJMEDIA_VIDEO_DEV_HAS_ANDROID.

Location:
pjproject/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk/aconfigure

    r4966 r5027  
    61986198$as_echo "Checking if OpenGL ES 2 is available... no" >&6; } 
    61996199        fi 
     6200        ac_android_cflags="$ac_android_cflags -DPJMEDIA_VIDEO_DEV_HAS_ANDROID=1" 
    62006201        ;; 
    62016202  arm-apple-darwin*) 

  • pjproject/trunk/aconfigure.ac

    r4966 r5027  
    723723          AC_MSG_RESULT([Checking if OpenGL ES 2 is available... no]) 
    724724        fi 
     725        ac_android_cflags="$ac_android_cflags -DPJMEDIA_VIDEO_DEV_HAS_ANDROID=1" 
    725726        ;; 
    726727  arm-apple-darwin*) 

  • pjproject/trunk/pjmedia/build/Makefile

    r4994 r5027  
    107107export PJMEDIA_VIDEODEV_SRCDIR = ../src/pjmedia-videodev 
    108108export PJMEDIA_VIDEODEV_OBJS +=  errno.o videodev.o avi_dev.o ffmpeg_dev.o \ 
    109                                 colorbar_dev.o v4l2_dev.o opengl_dev.o \ 
    110                                 android_opengl.o android_dev.o 
     109                                colorbar_dev.o v4l2_dev.o opengl_dev.o 
    111110export PJMEDIA_VIDEODEV_CFLAGS += $(_CFLAGS) 
    112111export PJMEDIA_VIDEODEV_CXXFLAGS += $(_CXXFLAGS) 

  • pjproject/trunk/pjmedia/build/os-auto.mak.in

    r4993 r5027  
    55#   - mac_os 
    66#   - iphone_os 
     7#   - android_os 
    78AC_PJMEDIA_VIDEO = @ac_pjmedia_video@ 
    89 
    … …  
    233234 
    234235# 
     236# Android video device 
     237# 
     238ifeq ($(AC_PJMEDIA_VIDEO),andriod_os) 
     239export PJMEDIA_VIDEODEV_OBJS += android_dev.o android_opengl.o 
     240endif 
     241 
     242# 
    235243# Determine whether we should compile the obj-c version of a particular source code 
    236244# 

  • pjproject/trunk/pjmedia/include/pjmedia-videodev/config.h

    r4994 r5027  
    197197 * This setting controls whether Android support should be included. 
    198198 * 
    199  * Default: 0 
     199 * Default: 0 (or detected by configure) 
    200200 */ 
    201201#ifndef PJMEDIA_VIDEO_DEV_HAS_ANDROID 
Note: See TracChangeset for help on using the changeset viewer.