summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--adb/Android.mk9
-rw-r--r--fastboot/Android.mk11
-rw-r--r--include/arch/windows/AndroidConfig.h1
3 files changed, 16 insertions, 5 deletions
diff --git a/adb/Android.mk b/adb/Android.mk
index 6325e53fd..0c93c1e7f 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -35,13 +35,18 @@ ifeq ($(HOST_OS),windows)
35 USB_SRCS := usb_windows.c 35 USB_SRCS := usb_windows.c
36 EXTRA_SRCS := get_my_path_windows.c 36 EXTRA_SRCS := get_my_path_windows.c
37 EXTRA_STATIC_LIBS := AdbWinApi 37 EXTRA_STATIC_LIBS := AdbWinApi
38 LOCAL_C_INCLUDES += /usr/include/w32api/ddk development/host/windows/usb/api/
39 ifneq ($(strip $(USE_CYGWIN)),) 38 ifneq ($(strip $(USE_CYGWIN)),)
39 # Pure cygwin case
40 LOCAL_LDLIBS += -lpthread 40 LOCAL_LDLIBS += -lpthread
41 else 41 LOCAL_C_INCLUDES += /usr/include/w32api/ddk
42 endif
43 ifneq ($(strip $(USE_MINGW)),)
44 # MinGW under Linux case
42 LOCAL_LDLIBS += -lws2_32 45 LOCAL_LDLIBS += -lws2_32
43 USE_SYSDEPS_WIN32 := 1 46 USE_SYSDEPS_WIN32 := 1
47 LOCAL_C_INCLUDES += /usr/i586-mingw32msvc/include/ddk
44 endif 48 endif
49 LOCAL_C_INCLUDES += development/host/windows/usb/api/
45endif 50endif
46 51
47LOCAL_SRC_FILES := \ 52LOCAL_SRC_FILES := \
diff --git a/fastboot/Android.mk b/fastboot/Android.mk
index 7a9d35f28..34380ecbc 100644
--- a/fastboot/Android.mk
+++ b/fastboot/Android.mk
@@ -33,11 +33,18 @@ endif
33ifeq ($(HOST_OS),windows) 33ifeq ($(HOST_OS),windows)
34 LOCAL_SRC_FILES += usb_windows.c util_windows.c 34 LOCAL_SRC_FILES += usb_windows.c util_windows.c
35 EXTRA_STATIC_LIBS := AdbWinApi 35 EXTRA_STATIC_LIBS := AdbWinApi
36 LOCAL_C_INCLUDES += /usr/include/w32api/ddk development/host/windows/usb/api 36 ifneq ($(strip $(USE_CYGWIN)),)
37 ifeq ($(strip $(USE_CYGWIN)),) 37 # Pure cygwin case
38 LOCAL_LDLIBS += -lpthread
39 LOCAL_C_INCLUDES += /usr/include/w32api/ddk
40 endif
41 ifneq ($(strip $(USE_MINGW)),)
42 # MinGW under Linux case
38 LOCAL_LDLIBS += -lws2_32 43 LOCAL_LDLIBS += -lws2_32
39 USE_SYSDEPS_WIN32 := 1 44 USE_SYSDEPS_WIN32 := 1
45 LOCAL_C_INCLUDES += /usr/i586-mingw32msvc/include/ddk
40 endif 46 endif
47 LOCAL_C_INCLUDES += development/host/windows/usb/api
41endif 48endif
42 49
43LOCAL_STATIC_LIBRARIES := $(EXTRA_STATIC_LIBS) libzipfile libunz 50LOCAL_STATIC_LIBRARIES := $(EXTRA_STATIC_LIBS) libzipfile libunz
diff --git a/include/arch/windows/AndroidConfig.h b/include/arch/windows/AndroidConfig.h
index 1b6ece18f..806887bd2 100644
--- a/include/arch/windows/AndroidConfig.h
+++ b/include/arch/windows/AndroidConfig.h
@@ -296,7 +296,6 @@
296 */ 296 */
297#ifdef USE_MINGW 297#ifdef USE_MINGW
298#define S_IRGRP 0 298#define S_IRGRP 0
299#define sleep _sleep
300#endif 299#endif
301 300
302/* 301/*