diff options
| author | Raphael <raphael@google.com> | 2010-04-13 15:25:50 -0700 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2010-04-13 15:28:26 -0700 |
| commit | fab167850d751a817c39e074334fe7a0987ce647 (patch) | |
| tree | 7406d506dd4015a8401ad8a9c22f28a984585f09 /fastboot | |
| parent | 3adde56de1f8878553dd0c89a2fc19b1b93b0f2f (diff) | |
| download | system_core-fab167850d751a817c39e074334fe7a0987ce647.zip system_core-fab167850d751a817c39e074334fe7a0987ce647.tar.gz system_core-fab167850d751a817c39e074334fe7a0987ce647.tar.bz2 | |
Fix adb, fastboot to compile in Windows SDK under Linux.
Change-Id: I3d0e4cabd65d9de17036901a22ec3277a6d58e64
Diffstat (limited to 'fastboot')
| -rw-r--r-- | fastboot/Android.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/fastboot/Android.mk b/fastboot/Android.mk index 7a9d35f..34380ec 100644 --- a/fastboot/Android.mk +++ b/fastboot/Android.mk @@ -33,11 +33,18 @@ endif ifeq ($(HOST_OS),windows) LOCAL_SRC_FILES += usb_windows.c util_windows.c EXTRA_STATIC_LIBS := AdbWinApi - LOCAL_C_INCLUDES += /usr/include/w32api/ddk development/host/windows/usb/api - ifeq ($(strip $(USE_CYGWIN)),) + ifneq ($(strip $(USE_CYGWIN)),) + # Pure cygwin case + LOCAL_LDLIBS += -lpthread + LOCAL_C_INCLUDES += /usr/include/w32api/ddk + endif + ifneq ($(strip $(USE_MINGW)),) + # MinGW under Linux case LOCAL_LDLIBS += -lws2_32 USE_SYSDEPS_WIN32 := 1 + LOCAL_C_INCLUDES += /usr/i586-mingw32msvc/include/ddk endif + LOCAL_C_INCLUDES += development/host/windows/usb/api endif LOCAL_STATIC_LIBRARIES := $(EXTRA_STATIC_LIBS) libzipfile libunz |