moved back windows compat headers and fixed catta headers to stop clutter dependent...

[catta] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index b78e013ff574e19fac0502d06ec556aaddddd948..9471992c950abbc642d243357c38a947c3ba95a8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -85,15 +85,19 @@ endif
 endif
 endif
 
+if WINDOWS
+# require Windows Vista or above (for winsock2)
+AM_CFLAGS+=-DWINVER=0x0600 -D_WIN32_WINNT=0x0600
+endif
+
 libcatta_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 libcatta_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
 libcatta_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBCATTA_VERSION_INFO)
 
 if WINDOWS
-libcatta_la_CFLAGS += -I$(top_srcdir)/include/catta/compat/windows
 libcatta_la_SOURCES += \
-       compat/windows/wincompat.c
+       compat/windows/wincompat.c \
+       compat/windows/wincompat.h
 libcatta_la_LIBADD += -lws2_32 -liphlpapi
 libcatta_la_LDFLAGS += -no-undefined -Wl,--kill-at,--output-def=.libs/libcatta-0.def
 endif
-