diff options
| author | Raphael <raphael@google.com> | 2010-04-13 15:25:50 -0700 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2010-04-23 13:07:17 -0700 |
| commit | b419c35c660d7421e18a9efef38eca11966b44c7 (patch) | |
| tree | 2139b1ae960b534cce0e59cd45435a73b6c7ea3a /adb | |
| parent | f54e0a4be3e7a49e1b3f53de6b9542bc146c36fe (diff) | |
| download | system_core-b419c35c660d7421e18a9efef38eca11966b44c7.zip system_core-b419c35c660d7421e18a9efef38eca11966b44c7.tar.gz system_core-b419c35c660d7421e18a9efef38eca11966b44c7.tar.bz2 | |
Fix adb, fastboot to compile in Windows SDK under Linux.
(Merged from master Change I3d0e4cab)
Change-Id: Ib3fd566bdaf09d5893a6b0c66168c76c6b0d92eb
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/Android.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index 6325e53..0c93c1e 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -35,13 +35,18 @@ ifeq ($(HOST_OS),windows) USB_SRCS := usb_windows.c EXTRA_SRCS := get_my_path_windows.c EXTRA_STATIC_LIBS := AdbWinApi - LOCAL_C_INCLUDES += /usr/include/w32api/ddk development/host/windows/usb/api/ ifneq ($(strip $(USE_CYGWIN)),) + # Pure cygwin case LOCAL_LDLIBS += -lpthread - else + 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_SRC_FILES := \ |