X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=system.mk;h=d9f2ec0dfaf65d7971bd1c16483de52840136ecc;hb=be912256a10c9710090b9f67a7e0281847828640;hp=06ce3b1234932a42b5ed984c6b9c085cc3009a23;hpb=8366314611bf30a0f31d25bf5f5023186fa87692;p=ion3.git

diff --git a/system.mk b/system.mk
index 06ce3b1..d9f2ec0 100644
--- a/system.mk
+++ b/system.mk
@@ -66,8 +66,8 @@ LUAC=$(LUA_DIR)/bin/luac
 # what you want.
 #LUA_LIBS=`pkg-config --libs lua5.1`
 #LUA_INCLUDES=`pkg-config --cflags lua5.1`
-#LUA=`which lua5.1`
-#LUAC=`which luac5.1`
+#LUA=/usr/bin/lua5.1
+#LUAC=/usr/bin/luac5.1
 
 
 ##
@@ -81,20 +81,14 @@ X11_PREFIX=/usr/X11R6
 X11_LIBS=-L$(X11_PREFIX)/lib -lX11 -lXext
 X11_INCLUDES=-I$(X11_PREFIX)/include
 
-# Change commenting to disable Xinerama support
-XINERAMA_LIBS=-lXinerama
-DEFINES += -DCF_XINERAMA
-# For Solaris
-#XINERAMA_LIBS=
-#DEFINES += -DCF_SUN_XINERAMA
-
-# XFree86 libraries up to 4.3.0 have a bug that will cause Ion to segfault
-# if Opera is used when i18n support is enabled. The following setting
-# should work around that situation.
+# XFree86 libraries up to 4.3.0 have a bug that can cause a segfault.
+# The following setting  should  work around that situation.
 DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND
 
-# Use the Xutf8 routines (XFree86 extension) instead of Xmb routines in
-# an UTF8 locale.
+# Use the Xutf8 routines (XFree86 extension) instead of the Xmb routines
+# in an UTF-8 locale. (No, you don't need this in UTF-8 locales, and 
+# most likely don't even want. It's only there because both Xmb and 
+# Xutf8 routines are broken, in different ways.)
 #DEFINES += -DCF_DE_USE_XUTF8
 
 # Remap F11 key to SunF36 and F12 to SunF37? You may want to set this
@@ -112,16 +106,18 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND
 # in sprintf_2.2/ is used.
 #HAS_SYSTEM_ASPRINTF=1
 
-
 # If you're on an archaic system (such as relatively recent *BSD releases)
 # without even dummy multibyte/widechar and localisation support, you may 
 # have to uncomment the following line:
-#DEFINES += -DCF_NO_LOCALE
+#DEFINES += -DCF_NO_LOCALE -DCF_NO_GETTEXT
 
 # On some other systems you may something like this:
 #EXTRA_LIBS += -lintl
 #EXTRA_INCLUDES +=
 
+# clock_gettime for monotonic time
+EXTRA_LIBS += -lrt
+
 
 ##
 ## C compiler
@@ -147,7 +143,7 @@ EXPORT_DYNAMIC=-Xlinker --export-dynamic
 
 #C89_SOURCE=-ansi
 
-#POSIX_SOURCE=-D_POSIX_SOURCE
+#POSIX_SOURCE=-D_POSIX_C_SOURCE=200112L
 
 # Most systems
 #XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED