diff options
| author | Raphael <raphael@google.com> | 2010-04-15 19:41:05 -0700 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2010-04-16 17:58:58 -0700 |
| commit | a3dcd8f0df7aaf6aae8e0291b39476dba532dea1 (patch) | |
| tree | 99b29dd7817281d229bb003f3b2d9ae5250a889e | |
| parent | dd47b5fd5a36ca572125a50ea50fb217b865cad7 (diff) | |
| download | sdk-a3dcd8f0df7aaf6aae8e0291b39476dba532dea1.zip sdk-a3dcd8f0df7aaf6aae8e0291b39476dba532dea1.tar.gz sdk-a3dcd8f0df7aaf6aae8e0291b39476dba532dea1.tar.bz2 | |
Add missing windres to build SDK Setup.exe using MinGW/Linux
(This mirrors what we did with the emulator in Change Ib4ce944b )
Change-Id: I09f2e154ff89af4a0ed6629fd20846f20dbd2f5b
| -rw-r--r-- | sdklauncher/Android.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sdklauncher/Android.mk b/sdklauncher/Android.mk index 3e92ea8..e3cc7d3 100644 --- a/sdklauncher/Android.mk +++ b/sdklauncher/Android.mk @@ -20,6 +20,13 @@ LOCAL_CFLAGS += -Wall -Wno-unused-parameter LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE -DSH_HISTORY LOCAL_MODULE := sdklauncher +# Locate windres executable +WINDRES := windres +ifneq ($(USE_MINGW),) + # When building the Windows emulator under Linux, use the MinGW one + WINDRES := i586-mingw32msvc-windres +endif + # Link the Windows icon file as well into the executable, based on the technique # used in external/qemu/Makefile.android. # @@ -27,7 +34,7 @@ INTERMEDIATE := $(call intermediates-dir-for,EXECUTABLES,$(LOCAL_MODULE),tru ANDROID_ICON_OBJ := android_icon.o ANDROID_ICON_PATH := $(LOCAL_PATH)/images $(ANDROID_ICON_PATH)/$(ANDROID_ICON_OBJ): $(ANDROID_ICON_PATH)/android_icon.rc - windres $< -I $(ANDROID_ICON_PATH) -o $@ + $(WINDRES) $< -I $(ANDROID_ICON_PATH) -o $@ # seems to be the only way to add an object file that was not generated from # a C/C++/Java source file to our build system. and very unfortunately, |