X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=configure.ac;h=f75ce600c01e9e91031fce1641953c3cdc6d8648;hp=f7e75b0a2a7ea1295c77ac2e019da35ca36fc38b;hb=31d52677b38d935297d132bdbd956c655cd3feee;hpb=892da43bf5796e7c5f593a6d0f53bd797a36bd3e

diff --git a/configure.ac b/configure.ac
index f7e75b0..f75ce60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,16 +68,16 @@ AM_CONDITIONAL([WIN32], test "$WIN32" = "yes")
 # Checks for configuration arguments.
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-AC_ARG_ENABLE([developer],
-			  [  --enable-developer      use all compiler flags developers need],
-			  [developer=$enableval],
-			  [developer=no])
-
 AC_ARG_ENABLE([debug],
 			  [  --enable-debug          include debugging symbols and features],
 			  [debug=$enableval],
 			  [debug=no])
 
+AC_ARG_ENABLE([double-precision],
+			  [  --enable-double-precision      use double-precision numbers],
+			  [double_precision=$enableval],
+			  [double_precision=no])
+
 AC_ARG_ENABLE([profile],
 			  [  --enable-profile        make a binary for use with gprof profiler],
 			  [profile=$enableval],
@@ -88,6 +88,11 @@ AC_ARG_ENABLE([extra-warnings],
 			  [extra_warnings=$enableval],
 			  [extra_warnings=no])
 
+AC_ARG_ENABLE([threads],
+			  [  --enable-threads        use threads for some parallel tasks],
+			  [threads=$enableval],
+			  [threads=no])
+
 AC_ARG_WITH([log-level],
 			[AS_HELP_STRING([--with-log-level=NUM],
 							[0, none... 1, errors... 4, everything (default: 3)])],
@@ -95,31 +100,27 @@ AC_ARG_WITH([log-level],
 			[log_level=3])
 
 
-if test x$developer = xyes
+if test x$debug = xyes
 then
-	debug=yes
-	log_level=4
-
-	if test x$WIN32 != xyes
-	then
-# i haven't had much success with gprof profiling on win32
-		profile=yes
-	fi
+	CFLAGS="$CFLAGS -DDEBUG -Wall -Wno-uninitialized"
+	CXXFLAGS="$CXXFLAGS -DDEBUG -Wall -Wno-uninitialized"
+else
+	CFLAGS="$CFLAGS -DNDEBUG"
+	CXXFLAGS="$CXXFLAGS -DNDEBUG"
 fi
 
-if test x$debug = xyes
+if test x$double_precision = xyes
 then
-	CFLAGS="$CFLAGS -Wall -O0 -DDEBUG"
-	CXXFLAGS="$CXXFLAGS -Wall -O0 -DDEBUG"
-else
-	CFLAGS="$CFLAGS -O2 -DNDEBUG"
-	CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
+	AC_DEFINE([USE_DOUBLE_PRECISION], 1,
+			  [Define to 1 if you want to use doubles instead of floats.])
 fi
 
 if test x$profile = xyes
 then
 	CFLAGS="$CFLAGS -pg"
 	CXXFLAGS="$CXXFLAGS -pg"
+	AC_DEFINE([PROFILING_ENABLED], 1,
+			  [Define to 1 if profiling is built in.])
 fi
 
 if test x$extra_warnings = xyes
@@ -128,6 +129,12 @@ then
 	CXXFLAGS="$CXXFLAGS -Wextra -Wno-unused-parameter"
 fi
 
+if test x$threads = xyes
+then
+	AC_DEFINE([USE_THREADS], 1,
+			  [Define to 1 if you want to use threads for parallel tasks.])
+fi
+
 AC_DEFINE_UNQUOTED([YOINK_LOGLEVEL], [$log_level],
 				   [Define to detail level of logging.])
 
@@ -137,15 +144,11 @@ then
 	prefix="$ac_default_prefix"
 fi
 
-AC_ARG_WITH([assetdir],
-			[AS_HELP_STRING([--with-assetdir=DIR],
-							[real path to assets (default: $datarootdir/yoink)])],
-			[DATADIR="$withval"],
-			[eval DATADIR="$datarootdir/yoink"])
-
 if test x$WIN32 = xyes
 then
 	DATADIR="data"
+else
+	eval eval DATADIR="${datadir}/yoink"
 fi
 
 AC_SUBST([DATADIR])
@@ -294,11 +297,9 @@ fi
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 DATA_FILES=$(echo $(cd data; \
-					find . -name "*.json" \
-						-o -name "*.lua" \
+					find . -name "*.lua" \
 						-o -name "*.ogg" \
 						-o -name "*.png" \
-						-o -name "*.xm" \
 						-o -name "yoinkrc"))
 AC_SUBST([DATA_FILES])
 
@@ -328,13 +329,14 @@ AC_OUTPUT
 echo ""
 echo " Configuration complete! :-)"
 echo ""
-echo "          Target: $target"
-echo "          Prefix: $prefix"
-echo "  Data Directory: $DATADIR"
-echo "       Log Level: $log_level"
-echo "           Debug: $debug"
-echo "         Profile: $profile"
-echo "  Extra Warnings: $extra_warnings"
+echo "            Target: $target"
+echo "            Prefix: $prefix"
+echo "    Data Directory: $DATADIR"
+echo "         Log Level: $log_level"
+echo "             Debug: $debug"
+echo "  Double Precision: $double_precision"
+echo "           Profile: $profile"
+echo "    Extra Warnings: $extra_warnings"
 echo ""
 echo " To finish the installation, execute:"
 echo "  make"