commit 39884388ede417af1186dd2605142554f4796d95
author Raphael <raphael@google.com> Tue Apr 13 15:20:37 2010 -0700
committer Raphael <raphael@google.com> Wed Apr 14 20:03:19 2010 -0700
tree 71b5321469470213421e982e0e024e075fdba57c
parent 82724df49627030df6b7ddd2afe43a6f7ad02099

Fix etc1tool to build in Windows SDK under Linux

Change-Id: Ib38a019becfeb9e227089b18e04e3f7c28a4af53

tools/etc1tool/Android.mk

diff --git a/tools/etc1tool/Android.mk b/tools/etc1tool/Android.mk
index 5536158..37aab14 100644
--- a/tools/etc1tool/Android.mk
+++ b/tools/etc1tool/Android.mk
@@ -23,15 +23,16 @@
 	libpng \
 	libETC1
 
-LOCAL_LDLIBS := -lz
-
 ifeq ($(HOST_OS),linux)
-LOCAL_LDLIBS += -lrt
+LOCAL_LDLIBS := -lz -lrt
 endif
 
 ifeq ($(HOST_OS),windows)
-ifeq ($(strip $(USE_CYGWIN),),)
-LOCAL_LDLIBS += -lws2_32
+ifeq ($(strip $(USE_CYGWIN)),)
+LOCAL_LDLIBS := -lz -lws2_32
+endif
+ifneq ($(strip $(USE_MINGW)),)
+LOCAL_STATIC_LIBRARIES += libz
 endif
 endif