Change include order in Makefile.nmake

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.

diff --git a/Makefile.nmake b/Makefile.nmake
index da418e205ecde63a81a1ab2d60d15cfaef9ce9b6..4cd04c13c9cb97778d0fe2ef5c8384e8980c2969 100644 (file)
--- 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 6e1326412d65262263b8d23c143863286557745f..3fbf776d91a9068a3e8a2b18d3da8243e323e2e7 100644 (file)
--- 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