X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=configure.ac;h=a4f33cb40b21f52d65b956a13b305135c75305bd;hp=da42bf063ef7d28ea94fcbb7df8d1b22d48a8ed6;hb=6b0a0d0efafe34d48ab344fca3b479553bd4e62c;hpb=d08114d4e7315636ff62127845150273e0cbf66f

diff --git a/configure.ac b/configure.ac
index da42bf0..a4f33cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,6 +77,12 @@ AC_ARG_ENABLE([threads],
 			  [threads=$enableval],
 			  [threads=no])
 
+AC_ARG_ENABLE([hotloading],
+			  [AS_HELP_STRING([--enable-hotloading],
+							  [monitor assets and reload them when they change])],
+			  [hotloading=$enableval],
+			  [hotloading=no])
+
 AC_ARG_WITH([gtk],
 			[AS_HELP_STRING([--with-gtk],
 							[use gtk2 modal dialogs])],
@@ -127,6 +133,12 @@ then
 			  [Define to 1 if you want to use threads when applicable.])
 fi
 
+if test x$hotloading = xyes
+then
+	AC_DEFINE([USE_HOTLOADING], 1,
+			  [Define to 1 if you want to use hotloading assets.])
+fi
+
 if test x$gtk = xyes
 then
 	AC_DEFINE([USE_GTK], 1,
@@ -216,6 +228,13 @@ AM_CONDITIONAL([HAVE_MAKENSIS], [test x$MAKENSIS != x])
 AC_MSG_NOTICE([Checks for libraries.])
 ####
 
+##### boost#####
+website="http://www.boost.org/"
+BOOST_BIND
+BOOST_FUNCTION
+BOOST_SMART_PTR
+BOOST_STRING_ALGO
+
 ##### SDL #####
 website="http://www.libsdl.org/"
 PKG_CHECK_MODULES([SDL], [sdl],
@@ -294,6 +313,12 @@ then
 					   AC_MSG_WARN([Missing QT4 ($website)])])
 fi
 
+if test x$WIN32 = xyes
+then
+	# On Windows, sockets are in the ws2_32 library.
+	LIBS="$LIBS -lws2_32"
+fi
+
 if test x$missing = xyes
 then
 	AC_MSG_ERROR([You are missing some required libraries.])
@@ -306,12 +331,7 @@ AC_MSG_NOTICE([Checks for header files.])
 
 AC_HEADER_STDBOOL
 AC_HEADER_STDC
-AC_CHECK_HEADERS([stddef.h stdint.h stdlib.h string.h unistd.h])
-
-BOOST_SMART_PTR
-BOOST_STRING_ALGO
-BOOST_BIND
-BOOST_FUNCTION
+AC_CHECK_HEADERS([arpa/inet.h byteswap.h fcntl.h stddef.h stdint.h stdlib.h string.h unistd.h])
 
 
 ####
@@ -321,8 +341,8 @@ AC_MSG_NOTICE([Checks for types.])
 AC_TYPE_UINT8_T
 AC_TYPE_UINT16_T
 AC_TYPE_UINT32_T
+AC_TYPE_UINT64_T
 AC_TYPE_SIZE_T
-AC_TYPE_SSIZE_T
 
 
 ####
@@ -339,7 +359,7 @@ AC_MSG_NOTICE([Checks for library functions.])
 
 AC_FUNC_ERROR_AT_LINE
 AC_FUNC_STRTOD
-AC_CHECK_FUNCS([nanosleep strchr strcspn strrchr strstr])
+AC_CHECK_FUNCS([fcntl nanosleep strchr strcspn strrchr strstr])
 
 if test x$clock_gettime = xyes
 then