[Levent-commits] [Libevent/master 1/2] Change include order in Makefile.nmake

[Nick M. <ni...@us...>]

Author: Nick Mathewson <ni...@to...>
Date: Fri, 13 Aug 2010 11:34:39 -0400
Subject: Change include order in Makefile.nmake
Commit: 4022b287f8b096edeea9b461b4a0e5eb3e7ebebf

If there is an event-config.h in include/event2 (either because we
screwed up packaging like in 2.0.6-rc or because we previously tried
building with mingw and we didn't make distclean in the middle), we
want MSVC to find the one one in WIN32-Code/include/event2 first.

Found by Gilad Benjamini.
---
 Makefile.nmake      |    2 +-
 test/Makefile.nmake |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.nmake b/Makefile.nmake
index da418e2..4cd04c1 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -2,7 +2,7 @@
 # tons of important things.  DO NOT RELY ON IT TO BUILD A GOOD LIBEVENT.
 
 # Needed for correctness
-CFLAGS=/Iinclude /Icompat /IWIN32-Code /DWIN32 /DHAVE_CONFIG_H /I.
+CFLAGS=/IWIN32-Code /Iinclude /Icompat /DWIN32 /DHAVE_CONFIG_H /I.
 
 # For optimization and warnings
 CFLAGS=$(CFLAGS) /Ox /W3 /wd4996 /nologo
diff --git a/test/Makefile.nmake b/test/Makefile.nmake
index 6e13264..3fbf776 100644
--- a/test/Makefile.nmake
+++ b/test/Makefile.nmake
@@ -1,5 +1,5 @@
 
-CFLAGS=/I.. /I../include /I../WIN32-Code /I../compat /DWIN32 /DHAVE_CONFIG_H
+CFLAGS=/I.. /I../WIN32-Code /I../include /I../compat /DWIN32 /DHAVE_CONFIG_H
 
 CFLAGS=$(CFLAGS) /Ox /W3 /wd4996 /nologo
 
-- 
1.6.3