X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=configure;h=8cc0b0d183071963c2c32602c3d19421f49f83fd;hp=7a4adbf4997b3d1258e56bd068ef429e011d4859;hb=1d4aa0d34b0410c7bc60a24bad7abb55eacc850a;hpb=eceb970628068ae621ef9523a669a2b66a82fd8a

diff --git a/configure b/configure
index 7a4adbf..8cc0b0d 100755
--- a/configure
+++ b/configure
@@ -50,16 +50,16 @@ Basic configuration:
       --datadir=DIR       directory to install shared data files
       --mandir=DIR        directory to install manual pages
 
-      --disable-dependency-tracking  speed up one-time builds
-      --enable-asneeded   decrease the number of direct dependencies
+      --disable-dependency-tracking  speed up one-time builds (maybe)
+      --disable-special-linking      do not use direct dependency minimizer
+      --enable-profile    compile in gprof profiling instructions
 
 Program options:
-      --enable-debug      include debugging symbols and code paths
-      --enable-double-precision      use doubles instead of floats
-      --enable-profile    compile in gprof profiling instructions
-      --enable-clock_gettime         use clock_gettime() for timing
-      --enable-threads    use threads for concurrency
-      --enable-hotloading watch assets for automatic reloading
+      --enable-clock_gettime         use a very accurate timing function
+      --enable-debug      compile in assertion checks and other debug helps
+      --enable-double-precision      use larger floating-point numbers
+      --enable-hotload    automatically reload modified game assets
+      --enable-threads    use threads for concurrency where appropriate
 
       --with-gtk          use the gtk2 toolkit (overrides --with-qt4)
       --with-qt4          use the qt4 gui toolkit
@@ -338,10 +338,14 @@ do
 	define("mandir",		datarootdir.."/man")
 	define("docdir",		datarootdir.."/doc/"..tarname)
 
-	if not features["dependency-tracking"] then
+	if features["dependency-tracking"] == nil then
 		features["dependency-tracking"] = true
 	end
 	
+	if features["special-linking"] == nil then
+		features["special-linking"] = true
+	end
+	
 	define("config",		{})
 	define("define",		{})
 	define("export",		{})
@@ -462,27 +466,18 @@ else
 	config.NDEBUG = true
 end
 
-if get_feature("extra-warnings") then
-	add_cflag("-Wextra -Wno-unused-parameter")
-end
-
-config.USE_CLOCK_GETTIME	= get_feature("clock_gettime")
-config.USE_DOUBLE_PRECISION	= get_feature("double-precision")
-config.USE_HOTLOADING		= get_feature("hotloading")
-config.USE_THREADS			= get_feature("threads")
-config.PROFILING_ENABLED	= get_feature("profile") and add_cflag("-pg")
-
-if get_feature("asneeded") then
-	define.AS_NEEDED = true
+config.ENABLE_CLOCK_GETTIME		= get_feature("clock_gettime")
+config.ENABLE_DOUBLE_PRECISION	= get_feature("double-precision")
+config.ENABLE_HOTLOADING		= get_feature("hotload")
+config.ENABLE_THREADS			= get_feature("threads")
+if get_feature("profile") then
+	config.ENABLE_PROFILING = true
+	add_cflag("-pg")
+	LDFLAGS = LDFLAGS .. "-pg"
 end
 
-if get_package("gtk") then
-	-- TODO
-end
-
-if get_package("qt4") then
-	-- TODO
-end
+if get_package("gtk") then config.WITH_GTK = true end
+if get_package("qt4") then config.WITH_QT4 = true end
 
 
 --
@@ -552,6 +547,7 @@ define.datadir				= datadir
 define.mandir				= mandir
 define.EXEEXT				= exe_extension
 define.DEP_TRACKING			= get_feature("dependency-tracking")
+define.DEP_MINIMIZING		= get_feature("special-linking")
 
 export.datadir				= datadir		-- Used in doc/yoink.6.in.
 export.PACKAGE_BUGREPORT	= contact		-- Used in doc/yoink.6.in.