X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=configure.ac;h=c5104297add457585353f72bdd3c8eff261c732c;hp=e8fd379c8091dcb2bbc7f704f3732d8446495641;hb=8ad81a8282ce6e9e488a453e6bcd05fbc09715dc;hpb=bfa6212d09d8735d8fd5e2638188e4a99f21ada4

diff --git a/configure.ac b/configure.ac
index e8fd379..c510429 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,8 +39,8 @@ AC_ARG_ENABLE([debug],
 			  [debug=$enableval
 			   if test x$debug = xyes
 			   then
-				   CFLAGS="-Wall -Werror -gstabs+ -O0 -DDEBUG"
-				   CXXFLAGS="-Wall -Werror -gstabs+ -O0 -DDEBUG"
+				   CFLAGS="-O0 -DDEBUG"
+				   CXXFLAGS="-O0 -DDEBUG"
 			   else
 				   CFLAGS="-O2 -DNDEBUG"
 				   CXXFLAGS="-O2 -DNDEBUG"
@@ -69,6 +69,11 @@ AC_ARG_WITH([assetdir],
 			[DATADIR="$withval"],
 			[eval DATADIR="$datarootdir/yoink"])
 
+case "${host}" in
+	*mingw32*)
+	DATADIR="data"
+esac
+
 AC_SUBST([DATADIR])
 AC_DEFINE_UNQUOTED([YOINK_DATADIR], ["$DATADIR"],
 				   [Define to path of game asset directory.])
@@ -96,22 +101,22 @@ BOOST_BIND
 BOOST_FUNCTION
 
 AC_SEARCH_LIBS([IMG_Load], [SDL_image],,
-			   [AC_MSG_ERROR([libSDL_image is required])])
+			   [AC_MSG_ERROR([SDL_image is required])])
 
 AC_SEARCH_LIBS([Sound_Init], [SDL_sound],,
-			   [AC_MSG_ERROR([libSDL_sound is required])])
+			   [AC_MSG_ERROR([SDL_sound is required])])
 
-AC_SEARCH_LIBS([glBegin], [GL],,
-			   [AC_MSG_ERROR([libGL is required])])
+AC_SEARCH_LIBS([glBegin], [GL opengl32],,
+			   [AC_MSG_ERROR([OpenGL is required])])
 
-AC_SEARCH_LIBS([gluPerspective], [GLU],,
-			   [AC_MSG_ERROR([libGLU is required])])
+AC_SEARCH_LIBS([gluPerspective], [GLU MesaGLU glu32],,
+			   [AC_MSG_ERROR([GLU is required])])
 
-AC_SEARCH_LIBS([alGenBuffers], [openal],,
-			   [AC_MSG_ERROR([libopenal is required])])
+AC_SEARCH_LIBS([alGenBuffers], [openal openal32],,
+			   [AC_MSG_ERROR([OpenAL is required])])
 
 AC_SEARCH_LIBS([alutInit], [alut],,
-			   [AC_MSG_ERROR([libalut is required])])
+			   [AC_MSG_ERROR([alut is required])])
 
 AC_SEARCH_LIBS([clock_gettime], [rt],
 			   [AC_DEFINE([HAVE_CLOCK_GETTIME], 1,
@@ -155,7 +160,11 @@ AC_CHECK_FUNCS([nanosleep strchr strcspn strrchr strstr])
 #
 
 DATA_FILES=$(echo $(cd data; \
-					find . -name "*.png" -o -name "*.json" -o -name yoinkrc))
+					find . -name "*.json" \
+						-o -name "*.ogg" \
+						-o -name "*.png" \
+						-o -name "*.xm" \
+						-o -name "yoinkrc"))
 AC_SUBST([DATA_FILES])