Ignore:
Timestamp:
Mar 11, 2013 6:32:58 AM (11 years ago)
Author:
nanang
Message:

Re #1639: merged android branch into trunk (except sample apps, i.e: apjsua & apjloader)

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk

  • pjproject/trunk/aconfigure

    r4331 r4435  
    46954695 
    46964696case $target in 
     4697    *android*) 
     4698        $as_echo "#define PJ_ANDROID 1" >>confdefs.h 
     4699 
     4700        ;; 
    46974701    *mingw* | *cygw* | *win32* | *w32* ) 
    46984702        $as_echo "#define PJ_WIN32 1" >>confdefs.h 
     
    56735677else 
    56745678 case $target in 
     5679  *android*) 
     5680        LIBS="$LIBS -lOpenSLES" 
     5681        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... OpenSL ES" >&5 
     5682$as_echo "Checking sound device backend... OpenSL ES" >&6; } 
     5683        ;; 
    56755684  arm-apple-darwin*) 
    56765685        LIBS="$LIBS -framework CoreAudio -framework CoreFoundation -framework AudioToolbox -framework CFNetwork -framework UIKit" 
     
    57525761 
    57535762case $target in 
     5763 *android*) 
     5764        LIBS="$LIBS -llog -lgcc" 
     5765        ;; 
    57545766 arm-apple-darwin*) 
    57555767        LIBS="$LIBS -framework UIKit" 
Note: See TracChangeset for help on using the changeset viewer.