diff --git a/glide3x/cvg/glide3/tests/makefile.linux b/glide3x/cvg/glide3/tests/makefile.linux
index ced2561..222e370 100644
--- a/glide3x/cvg/glide3/tests/makefile.linux
+++ b/glide3x/cvg/glide3/tests/makefile.linux
@@ -26,7 +26,7 @@ TOP = ../../..
 CPU ?= pentium
 
 CC = gcc
-CFLAGS = -Wall -O2 -ffast-math -mcpu=$(CPU)
+CFLAGS = -Wall -O2 -ffast-math -mtune=$(CPU)
 CFLAGS += -I$(TOP)/$(FX_GLIDE_HW)/glide3/src -I$(TOP)/$(FX_GLIDE_HW)/incsrc -I$(TOP)/$(FX_GLIDE_HW)/init
 CFLAGS += -I$(TOP)/swlibs/fxmisc
 CFLAGS += -DCVG
diff --git a/glide3x/cvg/glide3/tests/test08.c b/glide3x/cvg/glide3/tests/test08.c
index 48f5b46..1a09905 100644
--- a/glide3x/cvg/glide3/tests/test08.c
+++ b/glide3x/cvg/glide3/tests/test08.c
@@ -35,7 +35,7 @@ int main( int argc, char **argv) {
     int frames                      = -1;
     FxBool               scrgrab = FXFALSE;
     char                 filename[256];
-    int                  ftsize = 0;
+    FxI32                ftsize = 0;
     GrFog_t              *fogtable = NULL;
 
     /* Initialize Glide */
diff --git a/glide3x/cvg/glide3/tests/test22.c b/glide3x/cvg/glide3/tests/test22.c
index f92c324..0e41485 100644
--- a/glide3x/cvg/glide3/tests/test22.c
+++ b/glide3x/cvg/glide3/tests/test22.c
@@ -39,7 +39,7 @@ int main( int argc, char **argv) {
     TlTexture  lightTexture;
     unsigned int lightTextureAddr;
 
-    int                  ftsize = 0;
+    FxI32                ftsize = 0;
     GrFog_t              *fogtable = NULL;
 
     TlVertex3D srcVerts[4];
diff --git a/glide3x/cvg/glide3/tests/test23.c b/glide3x/cvg/glide3/tests/test23.c
index 7e543b0..8f3fa33 100644
--- a/glide3x/cvg/glide3/tests/test23.c
+++ b/glide3x/cvg/glide3/tests/test23.c
@@ -46,7 +46,7 @@ int main( int argc, char **argv) {
     static TlVertex3D srcVerts[100];
     float angle;
 
-    int                  ftsize = 0;
+    FxI32                ftsize = 0;
     GrFog_t              *fogtable = NULL;
     FxU32                zrange[2];
 
diff --git a/glide3x/cvg/glide3/tests/test24.c b/glide3x/cvg/glide3/tests/test24.c
index 09fd17a..c3f17e1 100644
--- a/glide3x/cvg/glide3/tests/test24.c
+++ b/glide3x/cvg/glide3/tests/test24.c
@@ -45,7 +45,7 @@ int main( int argc, char **argv) {
     static TlVertex3D srcVerts[100];
     float angle;
 
-    int                  ftsize = 0;
+    FxI32                ftsize = 0;
     GrFog_t              *fogtable = NULL;
     FxU32                wrange[2];
 
diff --git a/glide3x/cvg/glide3/tests/test34.c b/glide3x/cvg/glide3/tests/test34.c
index b07a481..1b75235 100644
--- a/glide3x/cvg/glide3/tests/test34.c
+++ b/glide3x/cvg/glide3/tests/test34.c
@@ -46,7 +46,7 @@ int main( int argc, char **argv) {
     int frames                      = -1;
     FxBool               scrgrab = FXFALSE;
     char                 filename[256];
-    int                  ftsize = 0;
+    FxI32                ftsize = 0;
     GrFog_t              *fogtable = NULL;
 
     TlTexture  baseTexture;
diff --git a/glide3x/cvg/glide3/tests/tlib.c b/glide3x/cvg/glide3/tests/tlib.c
index 5e8ac92..4ffe186 100644
--- a/glide3x/cvg/glide3/tests/tlib.c
+++ b/glide3x/cvg/glide3/tests/tlib.c
@@ -1648,7 +1648,7 @@ static int qhead = 0;
 static int qtail = 0;
 static int queue[256] = {0};
 
-int FAR PASCAL 
+LRESULT WINAPI
 MainWndproc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam )
 {
   PAINTSTRUCT ps;
@@ -1687,7 +1687,7 @@ MainWndproc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam )
       break;
 
     case WM_CHAR:
-      if (!isascii(wParam)) break;
+      if ((int)wParam & ~0x7f) break;/* not ascii */
 #if 0
       printf("Posting keystroke %.02x\n", wParam);
       fflush(stdout);
diff --git a/glide3x/h3/glide3/tests/Makefile.DJ b/glide3x/h3/glide3/tests/Makefile.DJ
index 28f340e..ab07a56 100644
--- a/glide3x/h3/glide3/tests/Makefile.DJ
+++ b/glide3x/h3/glide3/tests/Makefile.DJ
@@ -27,7 +27,7 @@ TOP = ../../..
 CPU ?= pentium
 
 CC = gcc
-CFLAGS = -Wall -O2 -ffast-math -mcpu=$(CPU)
+CFLAGS = -Wall -O2 -ffast-math -mtune=$(CPU)
 CFLAGS += -I$(TOP)/$(FX_GLIDE_HW)/glide3/src -I$(TOP)/$(FX_GLIDE_HW)/incsrc
 CFLAGS += -I$(TOP)/swlibs/fxmisc
 CFLAGS += -D__DOS__ -DH3
diff --git a/glide3x/h3/glide3/tests/makefile.linux b/glide3x/h3/glide3/tests/makefile.linux
index b756e5d..d7c1f7e 100644
--- a/glide3x/h3/glide3/tests/makefile.linux
+++ b/glide3x/h3/glide3/tests/makefile.linux
@@ -30,7 +30,7 @@ CPU ?= pentium
 XPATH ?= /usr/X11R6/lib
 
 CC = gcc
-CFLAGS = -Wall -O2 -ffast-math -mcpu=$(CPU)
+CFLAGS = -Wall -O2 -ffast-math -mtune=$(CPU)
 CFLAGS += -I$(TOP)/$(FX_GLIDE_HW)/glide3/src -I$(TOP)/$(FX_GLIDE_HW)/incsrc
 CFLAGS += -I$(TOP)/swlibs/fxmisc
 CFLAGS += -DH3
diff --git a/glide3x/h3/glide3/tests/test08.c b/glide3x/h3/glide3/tests/test08.c
index 48f5b46..1a09905 100644
--- a/glide3x/h3/glide3/tests/test08.c
+++ b/glide3x/h3/glide3/tests/test08.c
@@ -35,7 +35,7 @@ int main( int argc, char **argv) {
     int frames                      = -1;
     FxBool               scrgrab = FXFALSE;
     char                 filename[256];
-    int                  ftsize = 0;
+    FxI32                ftsize = 0;
     GrFog_t              *fogtable = NULL;
 
     /* Initialize Glide */
diff --git a/glide3x/h3/glide3/tests/test22.c b/glide3x/h3/glide3/tests/test22.c
index 1b6f8d4..43f81b0 100644
--- a/glide3x/h3/glide3/tests/test22.c
+++ b/glide3x/h3/glide3/tests/test22.c
@@ -39,7 +39,7 @@ int main( int argc, char **argv) {
     TlTexture  lightTexture;
     unsigned long lightTextureAddr;
 
-    int                  ftsize = 0;
+    FxI32                ftsize = 0;
     GrFog_t              *fogtable = NULL;
 
     TlVertex3D srcVerts[4];
diff --git a/glide3x/h3/glide3/tests/test23.c b/glide3x/h3/glide3/tests/test23.c
index 5f4f116..c894e4e 100644
--- a/glide3x/h3/glide3/tests/test23.c
+++ b/glide3x/h3/glide3/tests/test23.c
@@ -46,7 +46,7 @@ int main( int argc, char **argv) {
     static TlVertex3D srcVerts[100];
     float angle;
 
-    int                  ftsize = 0;
+    FxI32                ftsize = 0;
     GrFog_t              *fogtable = NULL;
     FxU32                zrange[2];
 
diff --git a/glide3x/h3/glide3/tests/test24.c b/glide3x/h3/glide3/tests/test24.c
index 067561e..93a07f8 100644
--- a/glide3x/h3/glide3/tests/test24.c
+++ b/glide3x/h3/glide3/tests/test24.c
@@ -45,7 +45,7 @@ int main( int argc, char **argv) {
     static TlVertex3D srcVerts[100];
     float angle;
 
-    int                  ftsize = 0;
+    FxI32                ftsize = 0;
     GrFog_t              *fogtable = NULL;
     FxU32                wrange[2];
 
diff --git a/glide3x/h3/glide3/tests/test34.c b/glide3x/h3/glide3/tests/test34.c
index 1be0ace..db91306 100644
--- a/glide3x/h3/glide3/tests/test34.c
+++ b/glide3x/h3/glide3/tests/test34.c
@@ -46,7 +46,7 @@ int main( int argc, char **argv) {
     int frames                      = -1;
     FxBool               scrgrab = FXFALSE;
     char                 filename[256];
-    int                  ftsize = 0;
+    FxI32                ftsize = 0;
     GrFog_t              *fogtable = NULL;
 
     TlTexture  baseTexture;
diff --git a/glide3x/h3/glide3/tests/tlib.c b/glide3x/h3/glide3/tests/tlib.c
index be50a2b..c773357 100644
--- a/glide3x/h3/glide3/tests/tlib.c
+++ b/glide3x/h3/glide3/tests/tlib.c
@@ -1648,7 +1648,7 @@ static int qhead = 0;
 static int qtail = 0;
 static int queue[256] = {0};
 
-long FAR PASCAL 
+LRESULT WINAPI
 MainWndproc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam )
 {
   PAINTSTRUCT ps;
@@ -1687,7 +1687,7 @@ MainWndproc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam )
       break;
 
     case WM_CHAR:
-      if (!isascii(wParam)) break;
+      if ((int)wParam & ~0x7f) break;/* not ascii */
 #if 0
       printf("Posting keystroke %.02x\n", wParam);
       fflush(stdout);
diff --git a/glide3x/h5/glide3/tests/Makefile.mgw b/glide3x/h5/glide3/tests/Makefile.mgw
index 7934ed4..7ba8d3e 100644
--- a/glide3x/h5/glide3/tests/Makefile.mgw
+++ b/glide3x/h5/glide3/tests/Makefile.mgw
@@ -25,7 +25,7 @@ TOP = ../../..
 CPU ?= pentium
 
 CC = mingw32-gcc
-CFLAGS = -Wall -O2 -ffast-math -mcpu=$(CPU)
+CFLAGS = -Wall -O2 -ffast-math -mtune=$(CPU)
 CFLAGS += -I$(TOP)/$(FX_GLIDE_HW)/glide3/src -I$(TOP)/$(FX_GLIDE_HW)/incsrc
 CFLAGS += -I$(TOP)/swlibs/fxmisc
 CFLAGS += -D__WIN32__ -DH3
diff --git a/glide3x/h5/glide3/tests/makefile.linux b/glide3x/h5/glide3/tests/makefile.linux
index 08717c4..d057700 100644
--- a/glide3x/h5/glide3/tests/makefile.linux
+++ b/glide3x/h5/glide3/tests/makefile.linux
@@ -30,7 +30,7 @@ CPU ?= pentium
 XPATH ?= /usr/X11R6/lib
 
 CC = gcc
-CFLAGS = -Wall -O2 -ffast-math -mcpu=$(CPU)
+CFLAGS = -Wall -O2 -ffast-math -mtune=$(CPU)
 CFLAGS += -I$(TOP)/$(FX_GLIDE_HW)/glide3/src -I$(TOP)/$(FX_GLIDE_HW)/incsrc
 CFLAGS += -I$(TOP)/swlibs/fxmisc
 CFLAGS += -DH3
diff --git a/glide3x/h5/glide3/tests/test08.c b/glide3x/h5/glide3/tests/test08.c
index dd9ee26..d49dd5f 100644
--- a/glide3x/h5/glide3/tests/test08.c
+++ b/glide3x/h5/glide3/tests/test08.c
@@ -51,7 +51,7 @@ int main( int argc, char **argv) {
     int frames                      = -1;
     FxBool               scrgrab = FXFALSE;
     char                 filename[256];
-    int                  ftsize = 0;
+    FxI32                ftsize = 0;
     GrFog_t              *fogtable = NULL;
     GrContext_t          gc = 0;
 
@@ -112,7 +112,7 @@ int main( int argc, char **argv) {
     tlConSet( 0.0f, 0.0f, 1.0f, 1.0f, 
               60, 30, 0xffffff );
 
-    grGet(GR_FOG_TABLE_ENTRIES, 4, (FxI32 *)&ftsize);
+    grGet(GR_FOG_TABLE_ENTRIES, 4, &ftsize);
     fogtable = malloc(sizeof(GrFog_t)*ftsize);
     assert(fogtable);
 
diff --git a/glide3x/h5/glide3/tests/test22.c b/glide3x/h5/glide3/tests/test22.c
index 11940e2..9d42cdb 100644
--- a/glide3x/h5/glide3/tests/test22.c
+++ b/glide3x/h5/glide3/tests/test22.c
@@ -55,7 +55,7 @@ int main( int argc, char **argv) {
     TlTexture  lightTexture;
     unsigned long lightTextureAddr;
 
-    int                  ftsize = 0;
+    FxI32                ftsize = 0;
     GrFog_t              *fogtable = NULL;
 
     TlVertex3D srcVerts[4];
@@ -116,8 +116,8 @@ int main( int argc, char **argv) {
               60, 15, 0xffffff );
     
     /* Set up Render State - decal - bilinear - nearest mipmapping - fogging */
-    grGet(GR_ZDEPTH_MIN_MAX, 8, (FxI32 *)zrange);  
-    grGet(GR_FOG_TABLE_ENTRIES, 4, (FxI32 *)&ftsize);
+    grGet(GR_ZDEPTH_MIN_MAX, 8, (FxI32 *)zrange);
+    grGet(GR_FOG_TABLE_ENTRIES, 4, &ftsize);
     fogtable = malloc(sizeof(GrFog_t)*ftsize);
     assert(fogtable);
 
diff --git a/glide3x/h5/glide3/tests/test23.c b/glide3x/h5/glide3/tests/test23.c
index d800e32..300a5f3 100644
--- a/glide3x/h5/glide3/tests/test23.c
+++ b/glide3x/h5/glide3/tests/test23.c
@@ -62,7 +62,7 @@ int main( int argc, char **argv) {
     static TlVertex3D srcVerts[100];
     float angle;
 
-    int                  ftsize = 0;
+    FxI32                ftsize = 0;
     GrFog_t              *fogtable = NULL;
     FxU32                zrange[2];
     GrContext_t          gc = 0;
@@ -120,8 +120,8 @@ int main( int argc, char **argv) {
               60, 15, 0xffffff );
     
     /* Set up Render State - flat shading - alpha blending */
-    grGet(GR_ZDEPTH_MIN_MAX, 8, (FxI32 *)zrange);  
-    grGet(GR_FOG_TABLE_ENTRIES, 4, (FxI32 *)&ftsize);
+    grGet(GR_ZDEPTH_MIN_MAX, 8, (FxI32 *)zrange);
+    grGet(GR_FOG_TABLE_ENTRIES, 4, &ftsize);
     fogtable = malloc(sizeof(GrFog_t)*ftsize);
     assert(fogtable);
     grVertexLayout(GR_PARAM_XY,  0, GR_PARAM_ENABLE);
diff --git a/glide3x/h5/glide3/tests/test24.c b/glide3x/h5/glide3/tests/test24.c
index 5b320b8..e4ab861 100644
--- a/glide3x/h5/glide3/tests/test24.c
+++ b/glide3x/h5/glide3/tests/test24.c
@@ -61,7 +61,7 @@ int main( int argc, char **argv) {
     static TlVertex3D srcVerts[100];
     float angle;
 
-    int                  ftsize = 0;
+    FxI32                ftsize = 0;
     GrFog_t              *fogtable = NULL;
     FxU32                wrange[2];
     GrContext_t          gc = 0;
@@ -123,8 +123,8 @@ int main( int argc, char **argv) {
     grVertexLayout(GR_PARAM_A,   GR_VERTEX_A_OFFSET << 2, GR_PARAM_ENABLE);
     grVertexLayout(GR_PARAM_Q,   GR_VERTEX_OOW_OFFSET << 2, GR_PARAM_ENABLE);
 
-    grGet(GR_WDEPTH_MIN_MAX, 8, (FxI32 *)wrange);  
-    grGet(GR_FOG_TABLE_ENTRIES, 4, (FxI32 *)&ftsize);
+    grGet(GR_WDEPTH_MIN_MAX, 8, (FxI32 *)wrange);
+    grGet(GR_FOG_TABLE_ENTRIES, 4, &ftsize);
     fogtable = malloc(sizeof(GrFog_t)*ftsize);
     assert(fogtable);
 
diff --git a/glide3x/h5/glide3/tests/test34.c b/glide3x/h5/glide3/tests/test34.c
index d61ae52..88e2e2e 100644
--- a/glide3x/h5/glide3/tests/test34.c
+++ b/glide3x/h5/glide3/tests/test34.c
@@ -62,7 +62,7 @@ int main( int argc, char **argv) {
     int frames                      = -1;
     FxBool               scrgrab = FXFALSE;
     char                 filename[256];
-    int                  ftsize = 0;
+    FxI32                ftsize = 0;
     GrFog_t              *fogtable = NULL;
     GrContext_t          gc = 0;
 
@@ -144,7 +144,7 @@ int main( int argc, char **argv) {
       fogext = (strncmp(extstr, "FOGCOORD", 8) == 0);
     }
 
-    grGet(GR_FOG_TABLE_ENTRIES, 4, (FxI32 *)&ftsize);
+    grGet(GR_FOG_TABLE_ENTRIES, 4, &ftsize);
     fogtable = malloc(sizeof(GrFog_t)*ftsize);
     assert(fogtable);
 
diff --git a/glide3x/h5/glide3/tests/tlib.c b/glide3x/h5/glide3/tests/tlib.c
index e4329de..2038f91 100644
--- a/glide3x/h5/glide3/tests/tlib.c
+++ b/glide3x/h5/glide3/tests/tlib.c
@@ -2328,7 +2328,7 @@ static int qhead = 0;
 static int qtail = 0;
 static int queue[256] = {0};
 
-long FAR PASCAL 
+LRESULT WINAPI
 MainWndproc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam )
 {
   PAINTSTRUCT ps;
@@ -2409,7 +2409,7 @@ MainWndproc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam )
       break;
 
     case WM_CHAR:
-      if (!isascii(wParam)) break;
+      if ((int)wParam & ~0x7f) break;/* not ascii */
 #if 0
       printf("Posting keystroke %.02x\n", wParam);
       fflush(stdout);
diff --git a/glide3x/sst1/glide3/tests/makefile.linux b/glide3x/sst1/glide3/tests/makefile.linux
index a6fa161..f49ff6a 100644
--- a/glide3x/sst1/glide3/tests/makefile.linux
+++ b/glide3x/sst1/glide3/tests/makefile.linux
@@ -39,7 +39,7 @@ TOP = ../../..
 CPU ?= pentium
 
 CC = gcc
-CFLAGS = -Wall -O2 -ffast-math -mcpu=$(CPU)
+CFLAGS = -Wall -O2 -ffast-math -mtune=$(CPU)
 CFLAGS += -I$(TOP)/$(FX_GLIDE_HW)/glide3/src -I$(TOP)/$(FX_GLIDE_HW)/incsrc -I$(TOP)/$(FX_GLIDE_HW)/init
 CFLAGS += -I$(TOP)/swlibs/fxmisc
 CFLAGS += $(HWDEF)
diff --git a/glide3x/sst1/glide3/tests/test08.c b/glide3x/sst1/glide3/tests/test08.c
index 48f5b46..1a09905 100644
--- a/glide3x/sst1/glide3/tests/test08.c
+++ b/glide3x/sst1/glide3/tests/test08.c
@@ -35,7 +35,7 @@ int main( int argc, char **argv) {
     int frames                      = -1;
     FxBool               scrgrab = FXFALSE;
     char                 filename[256];
-    int                  ftsize = 0;
+    FxI32                ftsize = 0;
     GrFog_t              *fogtable = NULL;
 
     /* Initialize Glide */
diff --git a/glide3x/sst1/glide3/tests/test22.c b/glide3x/sst1/glide3/tests/test22.c
index 1b6f8d4..43f81b0 100644
--- a/glide3x/sst1/glide3/tests/test22.c
+++ b/glide3x/sst1/glide3/tests/test22.c
@@ -39,7 +39,7 @@ int main( int argc, char **argv) {
     TlTexture  lightTexture;
     unsigned long lightTextureAddr;
 
-    int                  ftsize = 0;
+    FxI32                ftsize = 0;
     GrFog_t              *fogtable = NULL;
 
     TlVertex3D srcVerts[4];
diff --git a/glide3x/sst1/glide3/tests/test23.c b/glide3x/sst1/glide3/tests/test23.c
index 5f4f116..c894e4e 100644
--- a/glide3x/sst1/glide3/tests/test23.c
+++ b/glide3x/sst1/glide3/tests/test23.c
@@ -46,7 +46,7 @@ int main( int argc, char **argv) {
     static TlVertex3D srcVerts[100];
     float angle;
 
-    int                  ftsize = 0;
+    FxI32                ftsize = 0;
     GrFog_t              *fogtable = NULL;
     FxU32                zrange[2];
 
diff --git a/glide3x/sst1/glide3/tests/test24.c b/glide3x/sst1/glide3/tests/test24.c
index 51c59a9..a7c81c3 100644
--- a/glide3x/sst1/glide3/tests/test24.c
+++ b/glide3x/sst1/glide3/tests/test24.c
@@ -47,7 +47,7 @@ int main( int argc, char **argv) {
     static TlVertex3D srcVerts[100];
     float angle;
 
-    int                  ftsize = 0;
+    FxI32                ftsize = 0;
     GrFog_t              *fogtable = NULL;
     FxU32                wrange[2];
 
diff --git a/glide3x/sst1/glide3/tests/test34.c b/glide3x/sst1/glide3/tests/test34.c
index 1be0ace..db91306 100644
--- a/glide3x/sst1/glide3/tests/test34.c
+++ b/glide3x/sst1/glide3/tests/test34.c
@@ -46,7 +46,7 @@ int main( int argc, char **argv) {
     int frames                      = -1;
     FxBool               scrgrab = FXFALSE;
     char                 filename[256];
-    int                  ftsize = 0;
+    FxI32                ftsize = 0;
     GrFog_t              *fogtable = NULL;
 
     TlTexture  baseTexture;
diff --git a/glide3x/sst1/glide3/tests/tlib.c b/glide3x/sst1/glide3/tests/tlib.c
index 5f9b1a6..493c492 100644
--- a/glide3x/sst1/glide3/tests/tlib.c
+++ b/glide3x/sst1/glide3/tests/tlib.c
@@ -1648,7 +1648,7 @@ static int qhead = 0;
 static int qtail = 0;
 static int queue[256] = {0};
 
-long FAR PASCAL 
+LRESULT WINAPI
 MainWndproc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam )
 {
   PAINTSTRUCT ps;
@@ -1687,7 +1687,7 @@ MainWndproc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam )
       break;
 
     case WM_CHAR:
-      if (!isascii(wParam)) break;
+      if ((int)wParam & ~0x7f) break;/* not ascii */
 #if 0
       printf("Posting keystroke %.02x\n", wParam);
       fflush(stdout);