LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 67fa3142: Fix etc1tool to build in Windows SDK under Linux

Browse Source 
Merge commit '67fa314265f47fc9360bcea990d8d67270fdefde' into froyo-plus-aosp

* commit '67fa314265f47fc9360bcea990d8d67270fdefde':
  Fix etc1tool to build in Windows SDK under Linux
This commit is contained in:
Raphael
2010-04-23 17:14:29 -07:00
committed by Android Git Automerger
parent a3799abcd4 67fa314265
commit fab98d832c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/etc1tool/Android.mk
View File

@@ -23,16 +23,16 @@ LOCAL_STATIC_LIBRARIES := \
libpng \ libpng \
libETC1 libETC1
LOCAL_LDLIBS := -lz
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
LOCAL_LDLIBS += -lrt LOCAL_LDLIBS += -lrt
endif endif
ifeq ($(HOST_OS),windows) # Statically link libz for MinGW (Win SDK under Linux),
ifeq ($(strip $(USE_CYGWIN),),) # and dynamically link for all others.
LOCAL_LDLIBS += -lws2_32 ifneq ($(strip $(USE_MINGW)),)
endif LOCAL_STATIC_LIBRARIES += libz
else
LOCAL_LDLIBS += -lz
endif endif
LOCAL_MODULE := etc1tool LOCAL_MODULE := etc1tool