diff options
| author | Jesse Hall <jessehall@google.com> | 2012-04-26 15:13:27 -0700 |
|---|---|---|
| committer | Jesse Hall <jessehall@google.com> | 2012-04-26 16:54:26 -0700 |
| commit | 183e927350a14945e13ab217e16ab5dce20349f3 (patch) | |
| tree | 190bdb0d954f3dbe952c94895d147c0df2145073 /Makefile.common | |
| parent | 0c8a719be79b979a039abaf24432de6fbc9b13e6 (diff) | |
| download | external_qemu-183e927350a14945e13ab217e16ab5dce20349f3.zip external_qemu-183e927350a14945e13ab217e16ab5dce20349f3.tar.gz external_qemu-183e927350a14945e13ab217e16ab5dce20349f3.tar.bz2 | |
Fix standalone emulator build.
- Allow building with OpenGL ES acceleration disabled, avoiding a
dependency on stuff outside the QEMU project.
- Allow the standalone configure.sh to provide the include/lib path
for the OpenGL ES libraries.
- Update the default OpenGL ES include path for standalone builds.
Change-Id: I03f4627af4c271783b65a116ceb5934385c68cdc
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.common b/Makefile.common index 5307b28..20b6fa7 100644 --- a/Makefile.common +++ b/Makefile.common @@ -164,7 +164,9 @@ endif # HOST_OS == linux common_LOCAL_CFLAGS = common_LOCAL_SRC_FILES = -EMULATOR_LIBUI_CFLAGS := -Isdk/emulator/opengl/host/include +ifneq ($(QEMU_OPENGLES_INCLUDE),) + EMULATOR_LIBUI_CFLAGS := -I$(QEMU_OPENGLES_INCLUDE) +endif common_LOCAL_CFLAGS += $(EMULATOR_COMMON_CFLAGS) |