diff options
| author | Raphael <raphael@google.com> | 2010-04-23 17:14:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-23 17:14:45 -0700 |
| commit | a00a69e07d959f73495e42637fe1f493eb01193d (patch) | |
| tree | f7d10c2c2ad9c1fb75a3b53aa0c0d6bf98a46377 /adb | |
| parent | 775a8df614d364fcb82e280069a3f533381240b4 (diff) | |
| parent | b419c35c660d7421e18a9efef38eca11966b44c7 (diff) | |
| download | system_core-a00a69e07d959f73495e42637fe1f493eb01193d.zip system_core-a00a69e07d959f73495e42637fe1f493eb01193d.tar.gz system_core-a00a69e07d959f73495e42637fe1f493eb01193d.tar.bz2 | |
am b419c35c: Fix adb, fastboot to compile in Windows SDK under Linux.
Merge commit 'b419c35c660d7421e18a9efef38eca11966b44c7' into froyo-plus-aosp
* commit 'b419c35c660d7421e18a9efef38eca11966b44c7':
Fix adb, fastboot to compile in Windows SDK under Linux.
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 := \ |