diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-03-11 22:40:01 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2014-03-11 22:47:32 +0100 |
| commit | 68fbb34a4539d55ea788d6ee28676012810df535 (patch) | |
| tree | f8429744386edb3ac11de98be0eeeb253a0c5c97 /emulator/opengl/shared | |
| parent | 84b68033f6b92a3c35ac1d3ab7f8278c54744cff (diff) | |
| download | sdk-68fbb34a4539d55ea788d6ee28676012810df535.zip sdk-68fbb34a4539d55ea788d6ee28676012810df535.tar.gz sdk-68fbb34a4539d55ea788d6ee28676012810df535.tar.bz2 | |
emulator/opengl: Fix Windows SDK build.
This patch fixes the Windows SDK build. A previous patch
apparently broke it even though I could not reproduce this
locally before submitting.
What it does is, when using the platform build to generate
Windows binaries, use the host Linux binary instead of rebuilding
the 'emugen' tool from sources.
Note that the emulator's standalone build supports building
host Linux binaries even when targetting Windows by default.
+ Add a missing module import that got lost in translation
for some odd reason.
Change-Id: I2ccd962d8b3df859b2cba82573225820b69b0d32
Diffstat (limited to 'emulator/opengl/shared')
| -rw-r--r-- | emulator/opengl/shared/OpenglOsUtils/Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/emulator/opengl/shared/OpenglOsUtils/Android.mk b/emulator/opengl/shared/OpenglOsUtils/Android.mk index 566fd10..a3dd3c2 100644 --- a/emulator/opengl/shared/OpenglOsUtils/Android.mk +++ b/emulator/opengl/shared/OpenglOsUtils/Android.mk @@ -42,6 +42,7 @@ ifdef EMUGL_BUILD_64BITS $(call emugl-export,C_INCLUDES,$(host_common_INCLUDES)) LOCAL_SRC_FILES = $(host_common_SRC_FILES) $(call emugl-export,LDLIBS,$(host_common_LDLIBS)) + $(call emugl-import,lib64emugl_common) $(call emugl-export,CFLAGS,-m64 -fPIC) $(call emugl-end-module) -endif
\ No newline at end of file +endif |