Browse Source

configure: define WIN32_LEAN_AND_MEAN early to make it effective

This macro makes windows builds faster and helps with the old "#define
interface struct" issue as the word "interface" is part of libusb-0.1
API. However, defining it in replacements.h is too late, as windows.h
gets included by that time from somewhere else.

This solution is provided by Ray Donnelly from the MSYS2 team.

Change-Id: I376a5fb3d106786515d7e1ba44dbd751e4dcdb1b
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/2486
Tested-by: jenkins
Reviewed-by: Xiaofan <xiaofanc@gmail.com>
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
tags/v0.9.0-rc1
Paul Fertser 7 years ago
committed by Spencer Oliver
parent
commit
c9639ae2ac
2 changed files with 4 additions and 1 deletions
  1. +4
    -0
      configure.ac
  2. +0
    -1
      src/helper/replacements.h

+ 4
- 0
configure.ac View File

@@ -623,6 +623,10 @@ case $host in
;;
esac

if test $is_win32 = yes; then
AC_DEFINE([WIN32_LEAN_AND_MEAN], [1], [1 to exclude old conflicting definitions when building on Windows])
fi

if test $build_parport = yes; then
build_bitbang=yes
AC_DEFINE([BUILD_PARPORT], [1], [1 if you want parport.])


+ 0
- 1
src/helper/replacements.h View File

@@ -135,7 +135,6 @@ static inline unsigned usleep(unsigned int usecs)
/* Windows specific */
#ifdef _WIN32

#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <time.h>



Loading…
Cancel
Save