diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2012-05-11 15:31:18 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-05-11 15:31:18 -0700 |
| commit | ad82bb114ade2362be7d740835463b092d167741 (patch) | |
| tree | 7f6b2fe1306eeee3104be855971d2a01ad36d183 | |
| parent | 9d6d9e510f31485416554baf2dd35b4f68fdd4bc (diff) | |
| parent | 2c4c30e62aac9f55cf2287feb0ef6ed81c5430d3 (diff) | |
| download | external_qemu-ad82bb114ade2362be7d740835463b092d167741.zip external_qemu-ad82bb114ade2362be7d740835463b092d167741.tar.gz external_qemu-ad82bb114ade2362be7d740835463b092d167741.tar.bz2 | |
Merge "Fix --no-gles config, and ease the pain of standalone emulator build"
| -rwxr-xr-x | android-configure.sh | 26 | ||||
| -rw-r--r-- | android/opengles.c | 5 |
2 files changed, 31 insertions, 0 deletions
diff --git a/android-configure.sh b/android-configure.sh index 01fc2c4..9510ece 100755 --- a/android-configure.sh +++ b/android-configure.sh @@ -255,6 +255,32 @@ if [ "$IN_ANDROID_BUILD" = "yes" ] ; then fi fi fi +else + if [ "$GLES_PROBE" = "yes" ]; then + GLES_SUPPORT=yes + if [ -z "$GLES_INCLUDE" ]; then + log "GLES : Probing for headers" + GLES_INCLUDE=../../sdk/emulator/opengl/host/include + if [ -d "$GLES_INCLUDE" ]; then + log "GLES : Headers in $GLES_INCLUDE" + else + echo "Warning: Could not find OpenGLES emulation include dir: $GLES_INCLUDE" + echo "Disabling GLES emulation from this build!" + GLES_SUPPORT=no + fi + fi + if [ -z "$GLES_LIBS" ]; then + log "GLES : Probing for host libraries" + GLES_LIBS=../../out/host/$OS/lib + if [ -d "$GLES_LIBS" ]; then + echo "GLES : Libs in $GLES_LIBS" + else + echo "Warning: Could nof find OpenGLES emulation libraries in: $GLES_LIBS" + echo "Disabling GLES emulation from this build!" + GLES_SUPPORT=no + fi + fi + fi fi # IN_ANDROID_BUILD = no if [ "$GLES_SUPPORT" = "yes" ]; then diff --git a/android/opengles.c b/android/opengles.c index b265428..f56252c 100644 --- a/android/opengles.c +++ b/android/opengles.c @@ -283,6 +283,11 @@ int android_startOpenglesRenderer(int width, int height) return -1; } +void +android_setPostCallback(OnPostFunc onPost, void* onPostContext) +{ +} + void android_getOpenglesHardwareStrings(char* vendor, size_t vendorBufSize, char* renderer, size_t rendererBufSize, char* version, size_t versionBufSize) |