fix make & upscale bugs

diff --git a/core.c b/core.c
index fc3ddf6cd6b06204f1b252af536ac92d221f3834..948189840184b0ae5e9c29d33880a3c651ff0141 100644 (file)
--- a/core.c
+++ b/core.c
@@ -934,12 +934,11 @@ ILuint upscale_value (ILubyte x, ILint bytes)
                y <<= 8;
                y |= x;
        }
+       return y;
 }
 
 ILubyte downscale_value (ILuint x, ILint bytes)
 {
-       ILint i;
-       
        return (ILubyte)(x >> (8 * (bytes-1)));
 }
 

diff --git a/makefile b/makefile
index e16336850cd57d35652fd7a82db6b357635e0841..603d6ed27522455201f6852a75ff4fffaa30e816 100644 (file)
--- a/makefile
+++ b/makefile
@@ -31,7 +31,7 @@ CONFIGURE = /botm/bin/config/configure.pl
 CONFIGURE_CMD = $(PERL) $(CONFIGURE) $(CONFIGFILE)
 
 CC   =gcc
-###MAKE_CG:    CF=-g -Wall
+CF   =-g -Wall
 L_IL =-lIL
 L_CGI=-lcgi
 

diff --git a/makefile.1.mak b/makefile.1.mak
index 9f6b54dff22be55f5fff8f7b90ad3997b303c632..b05a9644f00c21eb03d9acec6d0314f987ddf597 100644 (file)
--- a/makefile.1.mak
+++ b/makefile.1.mak
@@ -31,7 +31,7 @@ CONFIGURE = /botm/bin/config/configure.pl ###MAKE_CONFIGURE:
 CONFIGURE_CMD = $(PERL) $(CONFIGURE) $(CONFIGFILE)
 
 ###MAKE_CC:    CC=gcc
-###MAKE_CG:    CF=-g -Wall
+###MAKE_CF:    CF=-g -Wall
 ###MAKE_L_IL:  L_IL=-lIL
 ###MAKE_L_CGI: L_CGI=-lcgi