Skip to content

Commit

Permalink
Change include order in Makefile.nmake
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
nmathewson committed Aug 13, 2010
1 parent 4991669 commit 4022b28
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile.nmake
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion 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

Expand Down

0 comments on commit 4022b28

Please sign in to comment.