# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1350214253 -10800
# Node ID e468ff7d0058c8feb3b0a03de657be45d2e27d0c
# Parent  148e981739f4b65218dc07c66e08c207acf60471# Parent  4cc21ebab650ebb15f985d35daae74808c170eaa
Merged

diff -r 148e981739f4 -r e468ff7d0058 config.mak.in
--- a/config.mak.in	Sun Oct 14 14:30:29 2012 +0300
+++ b/config.mak.in	Sun Oct 14 14:30:53 2012 +0300
@@ -16,14 +16,14 @@
 DM_USE_SIMD=yes
 
 
-DM_RES_PACKFS=yes
-DM_RES_STDIO=yes
-DM_RES_MEMIO=yes
+DM_USE_PACKFS=yes
+DM_USE_STDIO=yes
+DM_USE_MEMIO=yes
 
 
 DM_GFX_BM_TEXT=yes
 DM_GFX_TTF_TEXT=yes
-DM_GFX_LINES=no
+DM_GFX_LINES=yes
 DM_GFX_BLITS=yes
 DM_GFX_MISC=yes
 
@@ -36,9 +36,6 @@
 ###
 JSS=yes
 
-# Use floating point mixing
-JSS_MIX_FP=no
-
 # Build a special "light"/minimized version by removing all
 # error messages and few other things.
 JSS_LIGHT=no