diff --git a/glide2x/cvg/glide/tests/display.c b/glide2x/cvg/glide/tests/display.c
index bc10a35..912dce1 100644
--- a/glide2x/cvg/glide/tests/display.c
+++ b/glide2x/cvg/glide/tests/display.c
@@ -99,13 +99,13 @@ int main( int argc, char **argv)
     dstfname[0] = 0;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrst", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrst", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-	    exit(1);
+            exit(1);
         }
         switch( match ) {
         case 'n':
diff --git a/glide2x/cvg/glide/tests/h3dtst02.c b/glide2x/cvg/glide/tests/h3dtst02.c
index f8bbbe3..3650bec 100644
--- a/glide2x/cvg/glide/tests/h3dtst02.c
+++ b/glide2x/cvg/glide/tests/h3dtst02.c
@@ -71,13 +71,13 @@ int main( int argc, char **argv) {
 //    GrFog_t  fogtable[GR_FOG_TABLE_SIZE];
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-	    exit(1);
+            exit(1);
         }
         switch( match ) {
         case 'n':
diff --git a/glide2x/cvg/glide/tests/qatest00.c b/glide2x/cvg/glide/tests/qatest00.c
index 0690717..20a353e 100644
--- a/glide2x/cvg/glide/tests/qatest00.c
+++ b/glide2x/cvg/glide/tests/qatest00.c
@@ -182,7 +182,7 @@ int main( int argc, char **argv) {
   fgVerts[3].tmuvtx[0].tow = 0.f;
 
   /* Process Command Line Arguments */
-  while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) )
+  while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0)
   {
     if ( rv == -1 )
     {
diff --git a/glide2x/cvg/glide/tests/qatest01.c b/glide2x/cvg/glide/tests/qatest01.c
index 953ba06..c5ccfe3 100644
--- a/glide2x/cvg/glide/tests/qatest01.c
+++ b/glide2x/cvg/glide/tests/qatest01.c
@@ -83,7 +83,7 @@ int main( int argc, char **argv)
   
   /* Code */
     /* Process Command Line Arguments */
-  while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
diff --git a/glide2x/cvg/glide/tests/test00.c b/glide2x/cvg/glide/tests/test00.c
index 8959ffe..a416342 100644
--- a/glide2x/cvg/glide/tests/test00.c
+++ b/glide2x/cvg/glide/tests/test00.c
@@ -51,7 +51,7 @@ main( int argc, char **argv)
   char                 filename[256];
   
   /* Process Command Line Arguments */
-  while(( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) )) {
+  while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
diff --git a/glide2x/cvg/glide/tests/test01.c b/glide2x/cvg/glide/tests/test01.c
index 94e50ed..928a908 100644
--- a/glide2x/cvg/glide/tests/test01.c
+++ b/glide2x/cvg/glide/tests/test01.c
@@ -52,7 +52,7 @@ main( int argc, char **argv) {
   char                 filename[256];
   
   /* Process Command Line Arguments */
-  while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
diff --git a/glide2x/cvg/glide/tests/test02.c b/glide2x/cvg/glide/tests/test02.c
index 03a74a3..bad1521 100644
--- a/glide2x/cvg/glide/tests/test02.c
+++ b/glide2x/cvg/glide/tests/test02.c
@@ -51,13 +51,13 @@ int main( int argc, char **argv) {
     char                 filename[256];
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-	    exit(1);
+            exit(1);
         }
         switch( match ) {
         case 'n':
diff --git a/glide2x/cvg/glide/tests/test03.c b/glide2x/cvg/glide/tests/test03.c
index 2205235..b36599e 100644
--- a/glide2x/cvg/glide/tests/test03.c
+++ b/glide2x/cvg/glide/tests/test03.c
@@ -51,13 +51,13 @@ int main( int argc, char **argv) {
     char                 filename[256];
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-	    exit(1);
+            exit(1);
         }
         switch( match ) {
         case 'n':
diff --git a/glide2x/cvg/glide/tests/test04.c b/glide2x/cvg/glide/tests/test04.c
index 3c33d77..00f1fd7 100644
--- a/glide2x/cvg/glide/tests/test04.c
+++ b/glide2x/cvg/glide/tests/test04.c
@@ -51,13 +51,13 @@ int main( int argc, char **argv) {
     char                 filename[256];
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-	    exit(1);
+            exit(1);
         }
         switch( match ) {
         case 'n':
diff --git a/glide2x/cvg/glide/tests/test05.c b/glide2x/cvg/glide/tests/test05.c
index 11829a4..59e7002 100644
--- a/glide2x/cvg/glide/tests/test05.c
+++ b/glide2x/cvg/glide/tests/test05.c
@@ -53,7 +53,7 @@ main( int argc, char **argv)
   char                 filename[256];
   
   /* Process Command Line Arguments */
-  while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
diff --git a/glide2x/cvg/glide/tests/test06.c b/glide2x/cvg/glide/tests/test06.c
index 9ef1cd6..9e42ba6 100644
--- a/glide2x/cvg/glide/tests/test06.c
+++ b/glide2x/cvg/glide/tests/test06.c
@@ -51,13 +51,13 @@ int main( int argc, char **argv) {
     char                 filename[256];
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-	    exit(1);
+            exit(1);
         }
         switch( match ) {
         case 'n':
diff --git a/glide2x/cvg/glide/tests/test07.c b/glide2x/cvg/glide/tests/test07.c
index 6541771..813b7d3 100644
--- a/glide2x/cvg/glide/tests/test07.c
+++ b/glide2x/cvg/glide/tests/test07.c
@@ -51,13 +51,13 @@ int main( int argc, char **argv) {
     char                 filename[256];
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-	    exit(1);
+            exit(1);
         }
         switch( match ) {
         case 'n':
diff --git a/glide2x/cvg/glide/tests/test08.c b/glide2x/cvg/glide/tests/test08.c
index 90d26ec..535a469 100644
--- a/glide2x/cvg/glide/tests/test08.c
+++ b/glide2x/cvg/glide/tests/test08.c
@@ -53,13 +53,13 @@ int main( int argc, char **argv) {
     GrFog_t  fogtable[GR_FOG_TABLE_SIZE];
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-	    exit(1);
+            exit(1);
         }
         switch( match ) {
         case 'n':
diff --git a/glide2x/cvg/glide/tests/test09.c b/glide2x/cvg/glide/tests/test09.c
index 9a9d0de..a0bb265 100644
--- a/glide2x/cvg/glide/tests/test09.c
+++ b/glide2x/cvg/glide/tests/test09.c
@@ -55,13 +55,13 @@ int main( int argc, char **argv) {
     unsigned long chromaColor;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) )) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-	    exit(1);
+            exit(1);
         }
         switch( match ) {
         case 'n':
diff --git a/glide2x/cvg/glide/tests/test10.c b/glide2x/cvg/glide/tests/test10.c
index f3f58a1..3533409 100644
--- a/glide2x/cvg/glide/tests/test10.c
+++ b/glide2x/cvg/glide/tests/test10.c
@@ -56,13 +56,13 @@ int main( int argc, char **argv) {
     GrCullMode_t cullMode;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-	    exit(1);
+            exit(1);
         }
         switch( match ) {
         case 'n':
diff --git a/glide2x/cvg/glide/tests/test11.c b/glide2x/cvg/glide/tests/test11.c
index 305bc66..f7629d9 100644
--- a/glide2x/cvg/glide/tests/test11.c
+++ b/glide2x/cvg/glide/tests/test11.c
@@ -57,13 +57,13 @@ int main( int argc, char **argv) {
     int x,y;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-	    exit(0);
+            exit(0);
         }
         switch( match ) {
         case 'n':
diff --git a/glide2x/cvg/glide/tests/test12.c b/glide2x/cvg/glide/tests/test12.c
index 4abd5e1..0ff6da2 100644
--- a/glide2x/cvg/glide/tests/test12.c
+++ b/glide2x/cvg/glide/tests/test12.c
@@ -97,7 +97,7 @@ main( int argc, char **argv)
   FxBool             pixPipe;
 
   /* Process Command Line Arguments */
-  while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+  while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
diff --git a/glide2x/cvg/glide/tests/test13.c b/glide2x/cvg/glide/tests/test13.c
index 740c29c..97ecc30 100644
--- a/glide2x/cvg/glide/tests/test13.c
+++ b/glide2x/cvg/glide/tests/test13.c
@@ -52,7 +52,7 @@ int main( int argc, char **argv) {
     char                 filename[256];
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/cvg/glide/tests/test14.c b/glide2x/cvg/glide/tests/test14.c
index 42170ed..d1b0605 100644
--- a/glide2x/cvg/glide/tests/test14.c
+++ b/glide2x/cvg/glide/tests/test14.c
@@ -53,7 +53,7 @@ int main( int argc, char **argv) {
     short zDelta;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/cvg/glide/tests/test15.c b/glide2x/cvg/glide/tests/test15.c
index 95d820d..9dd9316 100644
--- a/glide2x/cvg/glide/tests/test15.c
+++ b/glide2x/cvg/glide/tests/test15.c
@@ -51,7 +51,7 @@ int main( int argc, char **argv) {
     float clipX, clipY, clipSize, clipSizeDelta, clipPosDelta;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/cvg/glide/tests/test16.c b/glide2x/cvg/glide/tests/test16.c
index a696250..8619302 100644
--- a/glide2x/cvg/glide/tests/test16.c
+++ b/glide2x/cvg/glide/tests/test16.c
@@ -52,7 +52,7 @@ int main( int argc, char **argv) {
     char                 filename[256];
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/cvg/glide/tests/test17.c b/glide2x/cvg/glide/tests/test17.c
index d2e7a01..f70d815 100644
--- a/glide2x/cvg/glide/tests/test17.c
+++ b/glide2x/cvg/glide/tests/test17.c
@@ -64,7 +64,7 @@ int main( int argc, char **argv) {
     TlTexture texture;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/cvg/glide/tests/test18.c b/glide2x/cvg/glide/tests/test18.c
index 20bdaa5..4c4bcd9 100644
--- a/glide2x/cvg/glide/tests/test18.c
+++ b/glide2x/cvg/glide/tests/test18.c
@@ -54,7 +54,7 @@ int main( int argc, char **argv) {
     TlTexture texture;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/cvg/glide/tests/test19.c b/glide2x/cvg/glide/tests/test19.c
index 7867175..f70e95a 100644
--- a/glide2x/cvg/glide/tests/test19.c
+++ b/glide2x/cvg/glide/tests/test19.c
@@ -82,7 +82,7 @@ int main( int argc, char **argv) {
     Texture texture;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/cvg/glide/tests/test20.c b/glide2x/cvg/glide/tests/test20.c
index f99640f..54dbe3b 100644
--- a/glide2x/cvg/glide/tests/test20.c
+++ b/glide2x/cvg/glide/tests/test20.c
@@ -58,7 +58,7 @@ int main( int argc, char **argv) {
     MipMapMode mipMapMode;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/cvg/glide/tests/test21.c b/glide2x/cvg/glide/tests/test21.c
index 1fc7ad3..b901ef7 100644
--- a/glide2x/cvg/glide/tests/test21.c
+++ b/glide2x/cvg/glide/tests/test21.c
@@ -63,7 +63,7 @@ int main( int argc, char **argv) {
     Mode mode;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/cvg/glide/tests/test22.c b/glide2x/cvg/glide/tests/test22.c
index 042cf3d..74ac199 100644
--- a/glide2x/cvg/glide/tests/test22.c
+++ b/glide2x/cvg/glide/tests/test22.c
@@ -59,7 +59,7 @@ int main( int argc, char **argv) {
     float      distance, dDelta;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/cvg/glide/tests/test23.c b/glide2x/cvg/glide/tests/test23.c
index ff48f4d..2ef06e0 100644
--- a/glide2x/cvg/glide/tests/test23.c
+++ b/glide2x/cvg/glide/tests/test23.c
@@ -63,7 +63,7 @@ int main( int argc, char **argv) {
     GrFog_t  fogtable[GR_FOG_TABLE_SIZE];
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/cvg/glide/tests/test24.c b/glide2x/cvg/glide/tests/test24.c
index 1d6b088..065ccba 100644
--- a/glide2x/cvg/glide/tests/test24.c
+++ b/glide2x/cvg/glide/tests/test24.c
@@ -62,7 +62,7 @@ int main( int argc, char **argv) {
     GrFog_t  fogtable[GR_FOG_TABLE_SIZE];
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/cvg/glide/tests/test25.c b/glide2x/cvg/glide/tests/test25.c
index 7864a0f..5027e33 100644
--- a/glide2x/cvg/glide/tests/test25.c
+++ b/glide2x/cvg/glide/tests/test25.c
@@ -241,7 +241,7 @@ int main( int argc, char **argv) {
 
 
   /* Process Command Line Arguments */
-  while( (rv = tlGetOpt( argc, argv, "nrbtea", &match, &remArgs )) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrbtea", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
diff --git a/glide2x/cvg/glide/tests/test26.c b/glide2x/cvg/glide/tests/test26.c
index c3791ee..1c2afca 100644
--- a/glide2x/cvg/glide/tests/test26.c
+++ b/glide2x/cvg/glide/tests/test26.c
@@ -85,7 +85,7 @@ int main( int argc, char **argv) {
   static FxU32 imageHeight;
 
   /* Process Command Line Arguments */
-  while( (rv = tlGetOpt( argc, argv, "bdnr", &match, &remArgs )) ) {
+  while ((rv = tlGetOpt(argc, argv, "bdnr", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
diff --git a/glide2x/cvg/glide/tests/test27.c b/glide2x/cvg/glide/tests/test27.c
index 3663c9c..1147b47 100644
--- a/glide2x/cvg/glide/tests/test27.c
+++ b/glide2x/cvg/glide/tests/test27.c
@@ -54,7 +54,7 @@ int main( int argc, char **argv) {
     int cycles;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "Nnr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "Nnr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/cvg/glide/tests/test28.c b/glide2x/cvg/glide/tests/test28.c
index 79e5d32..d721d52 100644
--- a/glide2x/cvg/glide/tests/test28.c
+++ b/glide2x/cvg/glide/tests/test28.c
@@ -110,7 +110,7 @@ int main( int argc, char **argv) {
     RGB hues[NHUE];
     
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/cvg/glide/tests/test29.c b/glide2x/cvg/glide/tests/test29.c
index 6d5c7fa..3a7f586 100644
--- a/glide2x/cvg/glide/tests/test29.c
+++ b/glide2x/cvg/glide/tests/test29.c
@@ -53,7 +53,7 @@ int main( int argc, char **argv) {
     float      distance, dDelta;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/h3/glide/tests/display.c b/glide2x/h3/glide/tests/display.c
index bc10a35..912dce1 100644
--- a/glide2x/h3/glide/tests/display.c
+++ b/glide2x/h3/glide/tests/display.c
@@ -99,13 +99,13 @@ int main( int argc, char **argv)
     dstfname[0] = 0;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrst", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrst", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-	    exit(1);
+            exit(1);
         }
         switch( match ) {
         case 'n':
diff --git a/glide2x/h3/glide/tests/h3dtst02.c b/glide2x/h3/glide/tests/h3dtst02.c
index f8bbbe3..3650bec 100644
--- a/glide2x/h3/glide/tests/h3dtst02.c
+++ b/glide2x/h3/glide/tests/h3dtst02.c
@@ -71,13 +71,13 @@ int main( int argc, char **argv) {
 //    GrFog_t  fogtable[GR_FOG_TABLE_SIZE];
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-	    exit(1);
+            exit(1);
         }
         switch( match ) {
         case 'n':
diff --git a/glide2x/h3/glide/tests/qatest00.c b/glide2x/h3/glide/tests/qatest00.c
index 0690717..20a353e 100644
--- a/glide2x/h3/glide/tests/qatest00.c
+++ b/glide2x/h3/glide/tests/qatest00.c
@@ -182,7 +182,7 @@ int main( int argc, char **argv) {
   fgVerts[3].tmuvtx[0].tow = 0.f;
 
   /* Process Command Line Arguments */
-  while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) )
+  while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0)
   {
     if ( rv == -1 )
     {
diff --git a/glide2x/h3/glide/tests/qatest01.c b/glide2x/h3/glide/tests/qatest01.c
index 0cf183d..62f3390 100644
--- a/glide2x/h3/glide/tests/qatest01.c
+++ b/glide2x/h3/glide/tests/qatest01.c
@@ -82,7 +82,7 @@ int main( int argc, char **argv)
   
   /* Code */
     /* Process Command Line Arguments */
-  while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
diff --git a/glide2x/h3/glide/tests/test00.c b/glide2x/h3/glide/tests/test00.c
index 31fb96a..afda9ea 100644
--- a/glide2x/h3/glide/tests/test00.c
+++ b/glide2x/h3/glide/tests/test00.c
@@ -52,7 +52,7 @@ main( int argc, char **argv)
   char                 filename[256];
   
   /* Process Command Line Arguments */
-  while(( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) )) {
+  while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
diff --git a/glide2x/h3/glide/tests/test01.c b/glide2x/h3/glide/tests/test01.c
index deae094..e76114e 100644
--- a/glide2x/h3/glide/tests/test01.c
+++ b/glide2x/h3/glide/tests/test01.c
@@ -52,7 +52,7 @@ main( int argc, char **argv) {
   char                 filename[256];
   
   /* Process Command Line Arguments */
-  while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
diff --git a/glide2x/h3/glide/tests/test02.c b/glide2x/h3/glide/tests/test02.c
index 03a74a3..bad1521 100644
--- a/glide2x/h3/glide/tests/test02.c
+++ b/glide2x/h3/glide/tests/test02.c
@@ -51,13 +51,13 @@ int main( int argc, char **argv) {
     char                 filename[256];
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-	    exit(1);
+            exit(1);
         }
         switch( match ) {
         case 'n':
diff --git a/glide2x/h3/glide/tests/test03.c b/glide2x/h3/glide/tests/test03.c
index 2205235..b36599e 100644
--- a/glide2x/h3/glide/tests/test03.c
+++ b/glide2x/h3/glide/tests/test03.c
@@ -51,13 +51,13 @@ int main( int argc, char **argv) {
     char                 filename[256];
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-	    exit(1);
+            exit(1);
         }
         switch( match ) {
         case 'n':
diff --git a/glide2x/h3/glide/tests/test04.c b/glide2x/h3/glide/tests/test04.c
index 3c33d77..00f1fd7 100644
--- a/glide2x/h3/glide/tests/test04.c
+++ b/glide2x/h3/glide/tests/test04.c
@@ -51,13 +51,13 @@ int main( int argc, char **argv) {
     char                 filename[256];
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-	    exit(1);
+            exit(1);
         }
         switch( match ) {
         case 'n':
diff --git a/glide2x/h3/glide/tests/test05.c b/glide2x/h3/glide/tests/test05.c
index 11829a4..59e7002 100644
--- a/glide2x/h3/glide/tests/test05.c
+++ b/glide2x/h3/glide/tests/test05.c
@@ -53,7 +53,7 @@ main( int argc, char **argv)
   char                 filename[256];
   
   /* Process Command Line Arguments */
-  while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
diff --git a/glide2x/h3/glide/tests/test06.c b/glide2x/h3/glide/tests/test06.c
index 9ef1cd6..9e42ba6 100644
--- a/glide2x/h3/glide/tests/test06.c
+++ b/glide2x/h3/glide/tests/test06.c
@@ -51,13 +51,13 @@ int main( int argc, char **argv) {
     char                 filename[256];
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-	    exit(1);
+            exit(1);
         }
         switch( match ) {
         case 'n':
diff --git a/glide2x/h3/glide/tests/test07.c b/glide2x/h3/glide/tests/test07.c
index da05ef3..58fa048 100644
--- a/glide2x/h3/glide/tests/test07.c
+++ b/glide2x/h3/glide/tests/test07.c
@@ -51,13 +51,13 @@ int main( int argc, char **argv) {
     char                 filename[256];
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-	    exit(1);
+            exit(1);
         }
         switch( match ) {
         case 'n':
diff --git a/glide2x/h3/glide/tests/test08.c b/glide2x/h3/glide/tests/test08.c
index 90d26ec..535a469 100644
--- a/glide2x/h3/glide/tests/test08.c
+++ b/glide2x/h3/glide/tests/test08.c
@@ -53,13 +53,13 @@ int main( int argc, char **argv) {
     GrFog_t  fogtable[GR_FOG_TABLE_SIZE];
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-	    exit(1);
+            exit(1);
         }
         switch( match ) {
         case 'n':
diff --git a/glide2x/h3/glide/tests/test09.c b/glide2x/h3/glide/tests/test09.c
index 9a9d0de..a0bb265 100644
--- a/glide2x/h3/glide/tests/test09.c
+++ b/glide2x/h3/glide/tests/test09.c
@@ -55,13 +55,13 @@ int main( int argc, char **argv) {
     unsigned long chromaColor;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) )) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-	    exit(1);
+            exit(1);
         }
         switch( match ) {
         case 'n':
diff --git a/glide2x/h3/glide/tests/test10.c b/glide2x/h3/glide/tests/test10.c
index 9cb1d70..83faf32 100644
--- a/glide2x/h3/glide/tests/test10.c
+++ b/glide2x/h3/glide/tests/test10.c
@@ -56,13 +56,13 @@ int main( int argc, char **argv) {
     GrCullMode_t cullMode;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-	    exit(1);
+            exit(1);
         }
         switch( match ) {
         case 'n':
diff --git a/glide2x/h3/glide/tests/test11.c b/glide2x/h3/glide/tests/test11.c
index 305bc66..f7629d9 100644
--- a/glide2x/h3/glide/tests/test11.c
+++ b/glide2x/h3/glide/tests/test11.c
@@ -57,13 +57,13 @@ int main( int argc, char **argv) {
     int x,y;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-	    exit(0);
+            exit(0);
         }
         switch( match ) {
         case 'n':
diff --git a/glide2x/h3/glide/tests/test12.c b/glide2x/h3/glide/tests/test12.c
index 4abd5e1..0ff6da2 100644
--- a/glide2x/h3/glide/tests/test12.c
+++ b/glide2x/h3/glide/tests/test12.c
@@ -97,7 +97,7 @@ main( int argc, char **argv)
   FxBool             pixPipe;
 
   /* Process Command Line Arguments */
-  while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+  while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
diff --git a/glide2x/h3/glide/tests/test13.c b/glide2x/h3/glide/tests/test13.c
index 740c29c..97ecc30 100644
--- a/glide2x/h3/glide/tests/test13.c
+++ b/glide2x/h3/glide/tests/test13.c
@@ -52,7 +52,7 @@ int main( int argc, char **argv) {
     char                 filename[256];
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/h3/glide/tests/test14.c b/glide2x/h3/glide/tests/test14.c
index 42170ed..d1b0605 100644
--- a/glide2x/h3/glide/tests/test14.c
+++ b/glide2x/h3/glide/tests/test14.c
@@ -53,7 +53,7 @@ int main( int argc, char **argv) {
     short zDelta;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/h3/glide/tests/test15.c b/glide2x/h3/glide/tests/test15.c
index 95d820d..9dd9316 100644
--- a/glide2x/h3/glide/tests/test15.c
+++ b/glide2x/h3/glide/tests/test15.c
@@ -51,7 +51,7 @@ int main( int argc, char **argv) {
     float clipX, clipY, clipSize, clipSizeDelta, clipPosDelta;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/h3/glide/tests/test16.c b/glide2x/h3/glide/tests/test16.c
index a696250..8619302 100644
--- a/glide2x/h3/glide/tests/test16.c
+++ b/glide2x/h3/glide/tests/test16.c
@@ -52,7 +52,7 @@ int main( int argc, char **argv) {
     char                 filename[256];
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/h3/glide/tests/test17.c b/glide2x/h3/glide/tests/test17.c
index d2e7a01..f70d815 100644
--- a/glide2x/h3/glide/tests/test17.c
+++ b/glide2x/h3/glide/tests/test17.c
@@ -64,7 +64,7 @@ int main( int argc, char **argv) {
     TlTexture texture;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/h3/glide/tests/test18.c b/glide2x/h3/glide/tests/test18.c
index 20bdaa5..4c4bcd9 100644
--- a/glide2x/h3/glide/tests/test18.c
+++ b/glide2x/h3/glide/tests/test18.c
@@ -54,7 +54,7 @@ int main( int argc, char **argv) {
     TlTexture texture;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/h3/glide/tests/test19.c b/glide2x/h3/glide/tests/test19.c
index 7867175..f70e95a 100644
--- a/glide2x/h3/glide/tests/test19.c
+++ b/glide2x/h3/glide/tests/test19.c
@@ -82,7 +82,7 @@ int main( int argc, char **argv) {
     Texture texture;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/h3/glide/tests/test20.c b/glide2x/h3/glide/tests/test20.c
index f99640f..54dbe3b 100644
--- a/glide2x/h3/glide/tests/test20.c
+++ b/glide2x/h3/glide/tests/test20.c
@@ -58,7 +58,7 @@ int main( int argc, char **argv) {
     MipMapMode mipMapMode;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/h3/glide/tests/test21.c b/glide2x/h3/glide/tests/test21.c
index 4aec274..488e188 100644
--- a/glide2x/h3/glide/tests/test21.c
+++ b/glide2x/h3/glide/tests/test21.c
@@ -63,7 +63,7 @@ int main( int argc, char **argv) {
     Mode mode;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/h3/glide/tests/test22.c b/glide2x/h3/glide/tests/test22.c
index 042cf3d..74ac199 100644
--- a/glide2x/h3/glide/tests/test22.c
+++ b/glide2x/h3/glide/tests/test22.c
@@ -59,7 +59,7 @@ int main( int argc, char **argv) {
     float      distance, dDelta;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/h3/glide/tests/test23.c b/glide2x/h3/glide/tests/test23.c
index ff48f4d..2ef06e0 100644
--- a/glide2x/h3/glide/tests/test23.c
+++ b/glide2x/h3/glide/tests/test23.c
@@ -63,7 +63,7 @@ int main( int argc, char **argv) {
     GrFog_t  fogtable[GR_FOG_TABLE_SIZE];
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/h3/glide/tests/test24.c b/glide2x/h3/glide/tests/test24.c
index 1d6b088..065ccba 100644
--- a/glide2x/h3/glide/tests/test24.c
+++ b/glide2x/h3/glide/tests/test24.c
@@ -62,7 +62,7 @@ int main( int argc, char **argv) {
     GrFog_t  fogtable[GR_FOG_TABLE_SIZE];
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/h3/glide/tests/test25.c b/glide2x/h3/glide/tests/test25.c
index 7864a0f..5027e33 100644
--- a/glide2x/h3/glide/tests/test25.c
+++ b/glide2x/h3/glide/tests/test25.c
@@ -241,7 +241,7 @@ int main( int argc, char **argv) {
 
 
   /* Process Command Line Arguments */
-  while( (rv = tlGetOpt( argc, argv, "nrbtea", &match, &remArgs )) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrbtea", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
diff --git a/glide2x/h3/glide/tests/test26.c b/glide2x/h3/glide/tests/test26.c
index c3791ee..1c2afca 100644
--- a/glide2x/h3/glide/tests/test26.c
+++ b/glide2x/h3/glide/tests/test26.c
@@ -85,7 +85,7 @@ int main( int argc, char **argv) {
   static FxU32 imageHeight;
 
   /* Process Command Line Arguments */
-  while( (rv = tlGetOpt( argc, argv, "bdnr", &match, &remArgs )) ) {
+  while ((rv = tlGetOpt(argc, argv, "bdnr", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
diff --git a/glide2x/h3/glide/tests/test27.c b/glide2x/h3/glide/tests/test27.c
index 99c2c29..ccf5193 100644
--- a/glide2x/h3/glide/tests/test27.c
+++ b/glide2x/h3/glide/tests/test27.c
@@ -55,7 +55,7 @@ int main( int argc, char **argv) {
     int cycles;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "Nnr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "Nnr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/h3/glide/tests/test28.c b/glide2x/h3/glide/tests/test28.c
index 79e5d32..d721d52 100644
--- a/glide2x/h3/glide/tests/test28.c
+++ b/glide2x/h3/glide/tests/test28.c
@@ -110,7 +110,7 @@ int main( int argc, char **argv) {
     RGB hues[NHUE];
     
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/h3/glide/tests/test29.c b/glide2x/h3/glide/tests/test29.c
index 6d5c7fa..3a7f586 100644
--- a/glide2x/h3/glide/tests/test29.c
+++ b/glide2x/h3/glide/tests/test29.c
@@ -53,7 +53,7 @@ int main( int argc, char **argv) {
     float      distance, dDelta;
 
     /* Process Command Line Arguments */
-    while( (rv = tlGetOpt( argc, argv, "nr", &match, &remArgs )) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
diff --git a/glide2x/sst1/glide/tests/display.c b/glide2x/sst1/glide/tests/display.c
index e182184..912dce1 100644
--- a/glide2x/sst1/glide/tests/display.c
+++ b/glide2x/sst1/glide/tests/display.c
@@ -46,11 +46,6 @@ static const char name[]    = "display";
 static const char purpose[] = "display a 16 bit frame buffer (565 format) dump out";
 static const char usage[]   = "-n <frames> -r <res> -s srcimage -t testimage";
 
-static const char *renderBufferString[] = {
-    "GR_BUFFER_FRONTBUFFER",
-    "GR_BUFFER_BACKBUFFER "
-};
-
 static const char *sourceFormatString[] = {
     "GR_LFB_SRC_FMT_565       ",
     "GR_LFB_SRC_FMT_555       ",
@@ -92,7 +87,7 @@ int main( int argc, char **argv)
     LFB_Img src, dst, diff;
     FxBool txtdisplay = FXTRUE;
 
-    void *image;
+    void *image = NULL;
     FxU32 bpp;
 
     GrLfbSrcFmt_t sourceFormat;
@@ -104,13 +99,13 @@ int main( int argc, char **argv)
     dstfname[0] = 0;
 
     /* Process Command Line Arguments */
-    while ((rv = tlGetOpt(argc, argv, "nrst", &match, &remArgs))) {
+    while ((rv = tlGetOpt(argc, argv, "nrst", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -175,7 +170,7 @@ int main( int argc, char **argv)
 	fread(&src.signature, 4, 1, fp);
 	if (src.signature != IMAGE_SRLE) {
 	  printf("%s file type incorrect\n", srcfname);
-	  return;
+	  exit(1);
 	}
 	fread(&src.width, 2, 1, fp);
 	fread(&src.height, 2, 1, fp);
@@ -209,7 +204,7 @@ int main( int argc, char **argv)
 	fread(&dst.signature, 4, 1, fp);
 	if (dst.signature != IMAGE_SRLE) {
 	  printf("%s file type incorrect\n", dstfname);
-	  return;
+	  exit(1);
 	}
 	fread(&dst.width, 2, 1, fp);
 	fread(&dst.height, 2, 1, fp);
@@ -272,7 +267,7 @@ int main( int argc, char **argv)
     }
     if ( ( imageWidth > (FxU32)scrWidth ) ||
          ( imageHeight > (FxU32)scrHeight ) )
-        return;
+	exit(1);
 
     while( frames-- ) {
 
@@ -363,7 +358,7 @@ int main( int argc, char **argv)
     if (srcfname[0] && dstfname[0])
       free(diff.data);
     free(image);
-    return;
+    exit(0);
 }
 
 
diff --git a/glide2x/sst1/glide/tests/h3dtst01.c b/glide2x/sst1/glide/tests/h3dtst01.c
index 50b2435..066b624 100644
--- a/glide2x/sst1/glide/tests/h3dtst01.c
+++ b/glide2x/sst1/glide/tests/h3dtst01.c
@@ -93,10 +93,9 @@ void drawBoxes(int w, int h, unsigned long c1, unsigned long c2) {
   grDrawLine(&p2,&p3);  
 }
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
   int     keepworking = 1;
   GrScreenResolution_t resolution;
-  int			frames		= -1;
   int     redraw = 1;
   int     redrawPattern = 0;
   int     patternon = 1;
@@ -196,6 +195,6 @@ void main( int argc, char **argv) {
     }
   }  
   grGlideShutdown();
-  return;
+  exit(0);
 }
 
diff --git a/glide2x/sst1/glide/tests/h3dtst02.c b/glide2x/sst1/glide/tests/h3dtst02.c
index 6bc84e7..3650bec 100644
--- a/glide2x/sst1/glide/tests/h3dtst02.c
+++ b/glide2x/sst1/glide/tests/h3dtst02.c
@@ -43,7 +43,7 @@ static unsigned int iRandom (unsigned int maxr);
 
 typedef enum { NORMAL, ANTIALIASED } Mode;
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -71,13 +71,13 @@ void main( int argc, char **argv) {
 //    GrFog_t  fogtable[GR_FOG_TABLE_SIZE];
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -257,7 +257,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
 
 static unsigned long randx = 1;
diff --git a/glide2x/sst1/glide/tests/plib.c b/glide2x/sst1/glide/tests/plib.c
index eed338e..112f8b4 100644
--- a/glide2x/sst1/glide/tests/plib.c
+++ b/glide2x/sst1/glide/tests/plib.c
@@ -43,6 +43,19 @@ static GrChipID_t currTMU = GR_TMU0;
 static FxBool bMultiRevOrder;
 static FxBool bMultiOffsetFix;
 
+/* static helper prototypes */
+static FxU32 prGetLodSize( GrTexInfo *const disTexInfo, GrLOD_t disLOD );
+static FxU32 prTexMultiMemRequired( FxU32 deMipMask, GrTexBaseRange_t deRange,
+			    	    GrTexInfo* deTexInfo );
+static void prGetLod( GrTexInfo *lpTexInfo, GrLOD_t deLod, void *data );
+static void prPopLod( GrTexInfo *lpDeTexInfo, mipMapEnd_t deMipMapEnd );
+static void prPushLod( GrTexInfo *lpDeTexInfo, mipMapEnd_t deMipMapEnd );
+static FxU32 prGetTxMnAdd( hTexId_t deTexId, GrLOD_t deLod );
+static int prGetLodWidth( GrLOD_t lod, GrAspectRatio_t aspect );
+static int prGetLodHeight( GrLOD_t lod, GrAspectRatio_t aspect );
+static FxU32 prGetMultiMemBump( const GrTexInfo *const deTexInfo, 
+                                  GrTexBaseRange_t deTexBase,
+                                  FxU32 deMipMask );
 
 
 /*-------------------------------------------------------------------
diff --git a/glide2x/sst1/glide/tests/plib.h b/glide2x/sst1/glide/tests/plib.h
index 0855a8b..f3300af 100644
--- a/glide2x/sst1/glide/tests/plib.h
+++ b/glide2x/sst1/glide/tests/plib.h
@@ -97,20 +97,6 @@ void plPopLod( hTexId_t hCurrTexture, mipMapEnd_t mipMapEnd );
 void plPushLod( hTexId_t hCurrTexture, mipMapEnd_t mipMapEnd );
 void plCreateTlTexture( TlTexture *disTlTexture, FxU16 daColors[] );
 
-/* static helper prototypes */
-static void prSetBeenPopd( hTexId_t deTexId, FxBool bBeenPopd );
-static FxU32 prGetLodSize( GrTexInfo *const disTexInfo, GrLOD_t disLOD );
-static FxU32 prTexMultiMemRequired( FxU32 deMipMask, GrTexBaseRange_t deRange,
-																		GrTexInfo* deTexInfo );
-static void prGetLod( GrTexInfo *lpTexInfo, GrLOD_t deLod, void *data );
-static void prPopLod( GrTexInfo *lpDeTexInfo, mipMapEnd_t deMipMapEnd );
-static void prPushLod( GrTexInfo *lpDeTexInfo, mipMapEnd_t deMipMapEnd );
-static FxU32 prGetTxMnAdd( hTexId_t deTexId, GrLOD_t deLod );
-static int prGetLodWidth( GrLOD_t lod, GrAspectRatio_t aspect );
-static int prGetLodHeight( GrLOD_t lod, GrAspectRatio_t aspect );
-static FxU32 prGetMultiMemBump( const GrTexInfo *const deTexInfo, 
-                                  GrTexBaseRange_t deTexBase,
-                                  FxU32 deMipMask );
 
 
 
diff --git a/glide2x/sst1/glide/tests/qatest00.c b/glide2x/sst1/glide/tests/qatest00.c
index 57d9f44..20a353e 100644
--- a/glide2x/sst1/glide/tests/qatest00.c
+++ b/glide2x/sst1/glide/tests/qatest00.c
@@ -64,7 +64,7 @@ static FxBool  g_bDoLodPrtlDwnld = FXFALSE;
 static FxI32   g_nLodPrtlFstRow;
 static FxI32   g_nLodPrtlLstRow;
 	
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
   char match; 
   char **remArgs;
   int  rv;
@@ -91,10 +91,10 @@ void main( int argc, char **argv) {
 
   /* templates for all algorithmic textures */
   GrTexInfo yAlgTxtreTmplts[][9] = 
-    {{ GR_LOD_1, GR_LOD_256, GR_ASPECT_8x1, GR_TEXFMT_RGB_565, NULL },
-     { GR_LOD_1, GR_LOD_256, GR_ASPECT_4x1, GR_TEXFMT_RGB_565, NULL },
-     { GR_LOD_1, GR_LOD_256, GR_ASPECT_2x1, GR_TEXFMT_RGB_565, NULL },
-     { GR_LOD_1, GR_LOD_256, GR_ASPECT_1x1, GR_TEXFMT_RGB_565, NULL }};
+    {{ {GR_LOD_1, GR_LOD_256, GR_ASPECT_8x1, GR_TEXFMT_RGB_565, NULL} },
+     { {GR_LOD_1, GR_LOD_256, GR_ASPECT_4x1, GR_TEXFMT_RGB_565, NULL} },
+     { {GR_LOD_1, GR_LOD_256, GR_ASPECT_2x1, GR_TEXFMT_RGB_565, NULL} },
+     { {GR_LOD_1, GR_LOD_256, GR_ASPECT_1x1, GR_TEXFMT_RGB_565, NULL} }};
 
   const int nDwnLodTxtres = 8;
   FxU16  yDwnLodClrs[][9] = 
@@ -108,23 +108,23 @@ void main( int argc, char **argv) {
      { BLU_565, BLU_565, BLU_565, BLU_565, BLU_565, BLU_565, BLU_565, BLU_565, BLU_565 }};
 
   GrTexInfo yDwnTxtreTmplts[][9] = 
-    {{ GR_LOD_1, GR_LOD_256, GR_ASPECT_1x1, GR_TEXFMT_RGB_565, NULL },
-     { GR_LOD_1, GR_LOD_256, GR_ASPECT_1x1, GR_TEXFMT_RGB_332, NULL },
-     { GR_LOD_1, GR_LOD_256, GR_ASPECT_1x1, GR_TEXFMT_ARGB_1555, NULL },
-     { GR_LOD_1, GR_LOD_256, GR_ASPECT_1x1, GR_TEXFMT_ARGB_4444, NULL },
-     { GR_LOD_1, GR_LOD_256, GR_ASPECT_1x1, GR_TEXFMT_RGB_565, NULL },
-     { GR_LOD_1, GR_LOD_256, GR_ASPECT_8x1, GR_TEXFMT_RGB_565, NULL },
-     { GR_LOD_1, GR_LOD_256, GR_ASPECT_4x1, GR_TEXFMT_RGB_565, NULL },
-     { GR_LOD_1, GR_LOD_256, GR_ASPECT_2x1, GR_TEXFMT_RGB_565, NULL }};
+    {{ {GR_LOD_1, GR_LOD_256, GR_ASPECT_1x1, GR_TEXFMT_RGB_565, NULL} },
+     { {GR_LOD_1, GR_LOD_256, GR_ASPECT_1x1, GR_TEXFMT_RGB_332, NULL} },
+     { {GR_LOD_1, GR_LOD_256, GR_ASPECT_1x1, GR_TEXFMT_ARGB_1555, NULL} },
+     { {GR_LOD_1, GR_LOD_256, GR_ASPECT_1x1, GR_TEXFMT_ARGB_4444, NULL} },
+     { {GR_LOD_1, GR_LOD_256, GR_ASPECT_1x1, GR_TEXFMT_RGB_565, NULL} },
+     { {GR_LOD_1, GR_LOD_256, GR_ASPECT_8x1, GR_TEXFMT_RGB_565, NULL} },
+     { {GR_LOD_1, GR_LOD_256, GR_ASPECT_4x1, GR_TEXFMT_RGB_565, NULL} },
+     { {GR_LOD_1, GR_LOD_256, GR_ASPECT_2x1, GR_TEXFMT_RGB_565, NULL} }};
 
   /* texture handles */
   hTexId_t  hCurrFgTxtre,    /* current fg texture */
-            hFstFgTxtre,     /* first fg texture */
+            hFstFgTxtre = 0, /* first fg texture */
             hLstFgTxtre,     /* last fg texture */
             hFstAlgFgTxtre,	/* first algo texture */
-            hLstAlgFgTxtre,	/* last algo texture */
-            hFstDwnlTxtre,   /* first lod download texture */
-            hLstDwnlTxtre,   /* last lod download texture */
+            hLstAlgFgTxtre = 0,	/* last algo texture */
+            hFstDwnlTxtre = 0,  /* first lod download texture */
+            hLstDwnlTxtre = 0,  /* last lod download texture */
             hDwlnSrcTxtre,
             hTmpTxtre;
   hTexId_t  hBgTxtre;  /* bg texture */
@@ -182,14 +182,14 @@ void main( int argc, char **argv) {
   fgVerts[3].tmuvtx[0].tow = 0.f;
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) )
+  while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0)
   {
     if ( rv == -1 )
     {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n", tlGetResolutionList() );
-      return;
+      exit(1);
     }
 
     switch( match )
@@ -742,8 +742,7 @@ void main( int argc, char **argv) {
   doUnloadTextures();
   grGlideShutdown();
 
-  
-  return;
+  exit(1);
 }	/* main */
 
 
diff --git a/glide2x/sst1/glide/tests/qatest01.c b/glide2x/sst1/glide/tests/qatest01.c
index 835b0f5..62f3390 100644
--- a/glide2x/sst1/glide/tests/qatest01.c
+++ b/glide2x/sst1/glide/tests/qatest01.c
@@ -50,8 +50,7 @@ static const char purpose[] = "Buffer Swap Alliance bug";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
 
-void 
-main( int argc, char **argv) 
+int main( int argc, char **argv) 
 {
   /* Definitions */
   char match; 
@@ -83,13 +82,13 @@ main( int argc, char **argv)
   
   /* Code */
     /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      exit(1);
     }
     switch( match ) {
     case 'n':
@@ -164,5 +163,5 @@ main( int argc, char **argv)
   }
   grLfbUnlock( GR_LFB_WRITE_ONLY, GR_BUFFER_BACKBUFFER ); 
   grGlideShutdown();
-  return;
+  exit(0);
 }
diff --git a/glide2x/sst1/glide/tests/test00.c b/glide2x/sst1/glide/tests/test00.c
index 824e026..afda9ea 100644
--- a/glide2x/sst1/glide/tests/test00.c
+++ b/glide2x/sst1/glide/tests/test00.c
@@ -37,7 +37,7 @@ static const char name[]    = "test00";
 static const char purpose[] = "Clear screen to blue";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void 
+int 
 main( int argc, char **argv) 
 {
   char match; 
@@ -52,13 +52,13 @@ main( int argc, char **argv)
   char                 filename[256];
   
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      exit(1);
     }
     switch( match ) {
     case 'n':
@@ -128,6 +128,6 @@ main( int argc, char **argv)
   }
   
   grGlideShutdown();
-  return;
+  exit(0);
 }
 
diff --git a/glide2x/sst1/glide/tests/test01.c b/glide2x/sst1/glide/tests/test01.c
index 1ec144b..e76114e 100644
--- a/glide2x/sst1/glide/tests/test01.c
+++ b/glide2x/sst1/glide/tests/test01.c
@@ -38,7 +38,7 @@ static const char name[]    = "test01";
 static const char purpose[] = "draws a diagonal line of points from top-left to bottom-right";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void
+int
 main( int argc, char **argv) {
   char match; 
   char **remArgs;
@@ -52,13 +52,13 @@ main( int argc, char **argv) {
   char                 filename[256];
   
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      exit(1);
     }
     switch( match ) {
     case 'n':
@@ -148,7 +148,7 @@ main( int argc, char **argv) {
   }
   
   grGlideShutdown();
-  return;
+  exit(0);
 }
 
 
diff --git a/glide2x/sst1/glide/tests/test02.c b/glide2x/sst1/glide/tests/test02.c
index b877afe..bad1521 100644
--- a/glide2x/sst1/glide/tests/test02.c
+++ b/glide2x/sst1/glide/tests/test02.c
@@ -38,7 +38,7 @@ static const char name[]    = "test02";
 static const char purpose[] = "draws a parabolic envelope of lines";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -51,13 +51,13 @@ void main( int argc, char **argv) {
     char                 filename[256];
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -150,7 +150,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
 
 
diff --git a/glide2x/sst1/glide/tests/test03.c b/glide2x/sst1/glide/tests/test03.c
index fde691d..b36599e 100644
--- a/glide2x/sst1/glide/tests/test03.c
+++ b/glide2x/sst1/glide/tests/test03.c
@@ -38,7 +38,7 @@ static const char name[]    = "test03";
 static const char purpose[] = "draws gouraud shaded lines";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -51,13 +51,13 @@ void main( int argc, char **argv) {
     char                 filename[256];
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -145,7 +145,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
 
 
diff --git a/glide2x/sst1/glide/tests/test04.c b/glide2x/sst1/glide/tests/test04.c
index 1295b12..00f1fd7 100644
--- a/glide2x/sst1/glide/tests/test04.c
+++ b/glide2x/sst1/glide/tests/test04.c
@@ -38,7 +38,7 @@ static const char name[]    = "test04";
 static const char purpose[] = "draws gouraud shaded triangle";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -51,13 +51,13 @@ void main( int argc, char **argv) {
     char                 filename[256];
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -148,7 +148,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
 
 
diff --git a/glide2x/sst1/glide/tests/test05.c b/glide2x/sst1/glide/tests/test05.c
index 739bc4a..59e7002 100644
--- a/glide2x/sst1/glide/tests/test05.c
+++ b/glide2x/sst1/glide/tests/test05.c
@@ -38,7 +38,7 @@ static const char name[]    = "test05";
 static const char purpose[] = "renders two interpenetrating triangles with z-buffering";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void 
+int 
 main( int argc, char **argv) 
 {
   char match; 
@@ -53,13 +53,13 @@ main( int argc, char **argv)
   char                 filename[256];
   
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      exit(1);
     }
     switch( match ) {
     case 'n':
@@ -182,7 +182,7 @@ main( int argc, char **argv)
   }
   
   grGlideShutdown();
-  return;
+  exit(0);
 }
 
 
diff --git a/glide2x/sst1/glide/tests/test06.c b/glide2x/sst1/glide/tests/test06.c
index 23761e9..9e42ba6 100644
--- a/glide2x/sst1/glide/tests/test06.c
+++ b/glide2x/sst1/glide/tests/test06.c
@@ -38,7 +38,7 @@ static const char name[]    = "test06";
 static const char purpose[] = "renders two interpenetrating triangles with w-buffering";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -51,13 +51,13 @@ void main( int argc, char **argv) {
     char                 filename[256];
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -179,7 +179,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
 
 
diff --git a/glide2x/sst1/glide/tests/test07.c b/glide2x/sst1/glide/tests/test07.c
index dd912b6..58fa048 100644
--- a/glide2x/sst1/glide/tests/test07.c
+++ b/glide2x/sst1/glide/tests/test07.c
@@ -38,7 +38,7 @@ static const char name[]    = "test07";
 static const char purpose[] = "alpha blending test";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -51,13 +51,13 @@ void main( int argc, char **argv) {
     char                 filename[256];
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -162,7 +162,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
 
 
diff --git a/glide2x/sst1/glide/tests/test08.c b/glide2x/sst1/glide/tests/test08.c
index 63f3130..535a469 100644
--- a/glide2x/sst1/glide/tests/test08.c
+++ b/glide2x/sst1/glide/tests/test08.c
@@ -38,7 +38,7 @@ static const char name[]    = "test08";
 static const char purpose[] = "fogging";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -53,13 +53,13 @@ void main( int argc, char **argv) {
     GrFog_t  fogtable[GR_FOG_TABLE_SIZE];
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -161,7 +161,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
 
 
diff --git a/glide2x/sst1/glide/tests/test09.c b/glide2x/sst1/glide/tests/test09.c
index 065e648..a0bb265 100644
--- a/glide2x/sst1/glide/tests/test09.c
+++ b/glide2x/sst1/glide/tests/test09.c
@@ -39,7 +39,7 @@ static const char purpose[] = "chromakey - render a red and blue"
                               " triangle but chromakey one out";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -55,13 +55,13 @@ void main( int argc, char **argv) {
     unsigned long chromaColor;
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -169,7 +169,7 @@ void main( int argc, char **argv) {
           cnt = strcspn(filename, ".");
           strncpy(fname, filename, cnt);
           fname[cnt] = 0;
-          sprintf(tmp,"_%d\0", subframe);
+          sprintf(tmp,"_%d", subframe);
           strcat(fname, tmp);
           strcat(fname, filename+cnt);
           if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -203,7 +203,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
 
 
diff --git a/glide2x/sst1/glide/tests/test10.c b/glide2x/sst1/glide/tests/test10.c
index cf6b927..83faf32 100644
--- a/glide2x/sst1/glide/tests/test10.c
+++ b/glide2x/sst1/glide/tests/test10.c
@@ -40,7 +40,7 @@ static const char purpose[] = "culling test - render a red and blue"
                               ", blue negative";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -56,13 +56,13 @@ void main( int argc, char **argv) {
     GrCullMode_t cullMode;
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -165,7 +165,7 @@ void main( int argc, char **argv) {
           cnt = strcspn(filename, ".");
           strncpy(fname, filename, cnt);
           fname[cnt] = 0;
-          sprintf(tmp,"_%d\0", subframe);
+          sprintf(tmp,"_%d", subframe);
           strcat(fname, tmp);
           strcat(fname, filename+cnt);
           if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -198,7 +198,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
 
 
diff --git a/glide2x/sst1/glide/tests/test11.c b/glide2x/sst1/glide/tests/test11.c
index b44b8c5..f7629d9 100644
--- a/glide2x/sst1/glide/tests/test11.c
+++ b/glide2x/sst1/glide/tests/test11.c
@@ -41,7 +41,7 @@ static const char usage[]   = "-n <frames> -r <res>";
 static int rRandom(int s, int e);
 static unsigned int iRandom (unsigned int maxr);
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -57,13 +57,13 @@ void main( int argc, char **argv) {
     int x,y;
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(0);
         }
         switch( match ) {
         case 'n':
@@ -151,7 +151,7 @@ void main( int argc, char **argv) {
 
         if ( tlScaleX(1.0f) < 64.0 ||
              tlScaleY(1.0f) < 64.0 )
-            return;
+	    exit(1);
         
         /* generate random start position */
         startX = (int)rRandom( 64, (int)tlScaleX(1.0f) - 65 );
@@ -226,7 +226,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
 
 static unsigned long randx = 1;
diff --git a/glide2x/sst1/glide/tests/test12.c b/glide2x/sst1/glide/tests/test12.c
index c7fbd45..0ff6da2 100644
--- a/glide2x/sst1/glide/tests/test12.c
+++ b/glide2x/sst1/glide/tests/test12.c
@@ -73,7 +73,7 @@ static const char *pixPipeString[] = {
   "PIXELPIPE ENABLED "
 };
 
-void
+int
 main( int argc, char **argv)
 {
   char match; 
@@ -97,13 +97,13 @@ main( int argc, char **argv)
   FxBool             pixPipe;
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      exit(1);
     }
     switch( match ) {
     case 'n':
@@ -119,7 +119,7 @@ main( int argc, char **argv)
 
   if ( resolution == GR_RESOLUTION_NONE ) {
     tlErrorMessage( "Error!: Frontbuffer rendering not supported in a window\n" );
-    return;
+    exit(1);
   }
 
   tlSetScreen( scrWidth, scrHeight );
@@ -338,7 +338,7 @@ main( int argc, char **argv)
   }
     
   grGlideShutdown();
-  return;
+  exit(0);
 } /* main */
 
 
diff --git a/glide2x/sst1/glide/tests/test13.c b/glide2x/sst1/glide/tests/test13.c
index 5dbf098..97ecc30 100644
--- a/glide2x/sst1/glide/tests/test13.c
+++ b/glide2x/sst1/glide/tests/test13.c
@@ -39,7 +39,7 @@ static const char name[]    = "test13";
 static const char purpose[] = "iterated alpha test - blue triangle fades towards one vertex\n";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -52,13 +52,13 @@ void main( int argc, char **argv) {
     char                 filename[256];
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -170,5 +170,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
diff --git a/glide2x/sst1/glide/tests/test14.c b/glide2x/sst1/glide/tests/test14.c
index 1fb0a50..d1b0605 100644
--- a/glide2x/sst1/glide/tests/test14.c
+++ b/glide2x/sst1/glide/tests/test14.c
@@ -39,7 +39,7 @@ static const char purpose[] = "depth bias test: vary depth bias \n"
                                "over time with two interpenetrating triangles";
 static const char usage[]   = "-n <frames> -r <res>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -53,13 +53,13 @@ void main( int argc, char **argv) {
     short zDelta;
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -180,5 +180,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
diff --git a/glide2x/sst1/glide/tests/test15.c b/glide2x/sst1/glide/tests/test15.c
index 429d3b0..9dd9316 100644
--- a/glide2x/sst1/glide/tests/test15.c
+++ b/glide2x/sst1/glide/tests/test15.c
@@ -38,7 +38,7 @@ static const char name[]    = "test15";
 static const char purpose[] = "clip rectangle testing - clip rectangle travels around screen";
 static const char usage[]   = "-n <frames> -r <res>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -51,13 +51,13 @@ void main( int argc, char **argv) {
     float clipX, clipY, clipSize, clipSizeDelta, clipPosDelta;
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -213,5 +213,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
diff --git a/glide2x/sst1/glide/tests/test16.c b/glide2x/sst1/glide/tests/test16.c
index bc000b6..8619302 100644
--- a/glide2x/sst1/glide/tests/test16.c
+++ b/glide2x/sst1/glide/tests/test16.c
@@ -39,7 +39,7 @@ static const char name[]    = "test16";
 static const char purpose[] = "test grShamelessPlug and grSplash";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -52,13 +52,13 @@ void main( int argc, char **argv) {
     char                 filename[256];
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -197,5 +197,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
diff --git a/glide2x/sst1/glide/tests/test17.c b/glide2x/sst1/glide/tests/test17.c
index 5c3ace6..f70d815 100644
--- a/glide2x/sst1/glide/tests/test17.c
+++ b/glide2x/sst1/glide/tests/test17.c
@@ -48,7 +48,7 @@ const char *textureModeNames[] = {
     "(ITRGB * TEXTURE)+WHITE SPECULAR"
 };
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -64,13 +64,13 @@ void main( int argc, char **argv) {
     TlTexture texture;
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -260,7 +260,7 @@ void main( int argc, char **argv) {
           cnt = strcspn(filename, ".");
           strncpy(fname, filename, cnt);
           fname[cnt] = 0;
-          sprintf(tmp,"_%d\0", subframe);
+          sprintf(tmp,"_%d", subframe);
           strcat(fname, tmp);
           strcat(fname, filename+cnt);
           if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -288,5 +288,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
diff --git a/glide2x/sst1/glide/tests/test18.c b/glide2x/sst1/glide/tests/test18.c
index 2baa300..4c4bcd9 100644
--- a/glide2x/sst1/glide/tests/test18.c
+++ b/glide2x/sst1/glide/tests/test18.c
@@ -39,7 +39,7 @@ static const char name[]    = "test18";
 static const char purpose[] = "alpha texture test";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -54,13 +54,13 @@ void main( int argc, char **argv) {
     TlTexture texture;
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -254,5 +254,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
diff --git a/glide2x/sst1/glide/tests/test19.c b/glide2x/sst1/glide/tests/test19.c
index 9d8e512..f70e95a 100644
--- a/glide2x/sst1/glide/tests/test19.c
+++ b/glide2x/sst1/glide/tests/test19.c
@@ -66,7 +66,7 @@ static int loadTexture( const char *filename,
                         void *table );
 static GrTexTable_t texTableType( GrTextureFormat_t format );
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -82,13 +82,13 @@ void main( int argc, char **argv) {
     Texture texture;
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -248,7 +248,7 @@ void main( int argc, char **argv) {
           cnt = strcspn(filename, ".");
           strncpy(fname, filename, cnt);
           fname[cnt] = 0;
-          sprintf(tmp,"_%d\0", subframe);
+          sprintf(tmp,"_%d", subframe);
           strcat(fname, tmp);
           strcat(fname, filename+cnt);
           if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -296,7 +296,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
 
 
diff --git a/glide2x/sst1/glide/tests/test20.c b/glide2x/sst1/glide/tests/test20.c
index 21c0e94..54dbe3b 100644
--- a/glide2x/sst1/glide/tests/test20.c
+++ b/glide2x/sst1/glide/tests/test20.c
@@ -41,7 +41,7 @@ static const char usage[]   = "-n <frames> -r <res>";
 typedef enum { DISABLE, NEAREST, TRILINEAR } MipMapMode;
 
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -58,13 +58,13 @@ void main( int argc, char **argv) {
     MipMapMode mipMapMode;
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -313,7 +313,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
 
 
diff --git a/glide2x/sst1/glide/tests/test21.c b/glide2x/sst1/glide/tests/test21.c
index 78e23e3..b901ef7 100644
--- a/glide2x/sst1/glide/tests/test21.c
+++ b/glide2x/sst1/glide/tests/test21.c
@@ -40,7 +40,7 @@ static const char usage[]   = "-n <frames> -r <res>";
 
 typedef enum { LIGHTMAP, SPECULAR, DETAIL } Mode;
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -63,13 +63,13 @@ void main( int argc, char **argv) {
     Mode mode;
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -367,7 +367,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
 
 
diff --git a/glide2x/sst1/glide/tests/test22.c b/glide2x/sst1/glide/tests/test22.c
index 64e1ae8..74ac199 100644
--- a/glide2x/sst1/glide/tests/test22.c
+++ b/glide2x/sst1/glide/tests/test22.c
@@ -38,7 +38,7 @@ static const char name[]    = "test22";
 static const char purpose[] = "fog with multi-pass texturing";
 static const char usage[]   = "-n <frames> -r <res>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -59,13 +59,13 @@ void main( int argc, char **argv) {
     float      distance, dDelta;
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -299,7 +299,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
 
 
diff --git a/glide2x/sst1/glide/tests/test23.c b/glide2x/sst1/glide/tests/test23.c
index 986c4c2..2ef06e0 100644
--- a/glide2x/sst1/glide/tests/test23.c
+++ b/glide2x/sst1/glide/tests/test23.c
@@ -43,7 +43,7 @@ static unsigned int iRandom (unsigned int maxr);
 
 typedef enum { NORMAL, ANTIALIASED } Mode;
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -63,13 +63,13 @@ void main( int argc, char **argv) {
     GrFog_t  fogtable[GR_FOG_TABLE_SIZE];
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -225,7 +225,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
 
 static unsigned long randx = 1;
diff --git a/glide2x/sst1/glide/tests/test24.c b/glide2x/sst1/glide/tests/test24.c
index 69d7ae1..065ccba 100644
--- a/glide2x/sst1/glide/tests/test24.c
+++ b/glide2x/sst1/glide/tests/test24.c
@@ -43,7 +43,7 @@ static unsigned int iRandom (unsigned int maxr);
 
 typedef enum { NORMAL, ANTIALIASED } Mode;
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -62,13 +62,13 @@ void main( int argc, char **argv) {
     GrFog_t  fogtable[GR_FOG_TABLE_SIZE];
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -220,7 +220,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
 
 static unsigned long randx = 1;
diff --git a/glide2x/sst1/glide/tests/test25.c b/glide2x/sst1/glide/tests/test25.c
index eb61186..5027e33 100644
--- a/glide2x/sst1/glide/tests/test25.c
+++ b/glide2x/sst1/glide/tests/test25.c
@@ -167,7 +167,7 @@ static int screenFulls[] = {
 #define NFRAMES 20
 #define NVERTS 3
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
   char match; 
   char **remArgs;
   int  rv;
@@ -190,7 +190,7 @@ void main( int argc, char **argv) {
     y_angle = 0.0f;             /* rotation amount */
     
   int
-    firstTime;                  /* Used for performance calculations */
+    firstTime = 0;              /* Used for performance calculations */
 
   GrPassthruMode_t
     passthruMode = GR_PASSTHRU_SHOW_SST1; /* For toggling passthru */
@@ -214,7 +214,7 @@ void main( int argc, char **argv) {
     swapDelay = 1,              /* Arg to grBufferSwap */
     trisDrawn,                  /* # triangles drawn */
     trisProcessed,              /* # triangles through pipeline */
-    lastFrame,                  /* Number of last frame we did perf stats */
+    lastFrame = 0,              /* Number of last frame we did perf stats */
     frameNum = 0L;              /* id of each frame drawn */
     
   GrCullMode_t
@@ -241,13 +241,13 @@ void main( int argc, char **argv) {
 
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrbtea", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrbtea", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      exit(1);
     }
     switch( match ) {
     case 'n':
@@ -875,7 +875,7 @@ void main( int argc, char **argv) {
         {
           char str[256];
           swapDelay = (int) c - 0x30;
-          sprintf(str, "Swapdelay = %d\n", swapDelay);
+          sprintf(str, "Swapdelay = %ld\n", swapDelay);
           tlConOutput(str);
         }
         break;
@@ -894,4 +894,5 @@ void main( int argc, char **argv) {
       break;
   }
   grGlideShutdown();
+  exit(0);
 }
diff --git a/glide2x/sst1/glide/tests/test26.c b/glide2x/sst1/glide/tests/test26.c
index df02b32..1c2afca 100644
--- a/glide2x/sst1/glide/tests/test26.c
+++ b/glide2x/sst1/glide/tests/test26.c
@@ -38,11 +38,6 @@ static const char name[]    = "test26";
 static const char purpose[] = "tests grLfbWriteRegion, and grLfbReadRegion";
 static const char usage[]   = "-b <# color buffers> -d <# aux buffers> -n <frames> -r <res>";
 
-static const char *renderBufferString[] = {
-  "GR_BUFFER_FRONTBUFFER",
-  "GR_BUFFER_BACKBUFFER "
-};
-
 static const char *sourceFormatString[] = {
   "GR_LFB_SRC_FMT_565       ",
   "GR_LFB_SRC_FMT_555       ",
@@ -67,7 +62,7 @@ static void imageConvert( void *dst,
                           GrLfbSrcFmt_t format,
                           FxU32 *bpp );
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
   char match; 
   char **remArgs;
   int  rv;
@@ -90,13 +85,13 @@ void main( int argc, char **argv) {
   static FxU32 imageHeight;
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "bdnr", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "bdnr", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
               tlGetResolutionList() );
-      return;
+      exit(1);
     }
     switch( match ) {
     case 'b':
@@ -171,7 +166,7 @@ void main( int argc, char **argv) {
             (int) scrWidth, (int) scrHeight);
 
     tlErrorMessage(errMsg);
-    return;
+    exit(1);
   }
 
   sourceFormat = GR_LFB_SRC_FMT_565;
@@ -291,7 +286,7 @@ void main( int argc, char **argv) {
   }
     
   grGlideShutdown();
-  return;
+  exit(0);
 }
 
 
diff --git a/glide2x/sst1/glide/tests/test27.c b/glide2x/sst1/glide/tests/test27.c
index 524905f..ccf5193 100644
--- a/glide2x/sst1/glide/tests/test27.c
+++ b/glide2x/sst1/glide/tests/test27.c
@@ -41,7 +41,7 @@ static unsigned int iRandom (unsigned int maxr);
 
 #define SNAP_BIAS ((float)(3<<18))
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -55,13 +55,13 @@ void main( int argc, char **argv) {
     int cycles;
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "Nnr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "Nnr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -166,7 +166,7 @@ doNothing:
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
 
 static unsigned long randx = 1;
diff --git a/glide2x/sst1/glide/tests/test28.c b/glide2x/sst1/glide/tests/test28.c
index 7abc0cb..d721d52 100644
--- a/glide2x/sst1/glide/tests/test28.c
+++ b/glide2x/sst1/glide/tests/test28.c
@@ -93,7 +93,7 @@ static const char name[]    = "test28";
 static const char purpose[] = "planar polygon test";
 static const char usage[]   = "-n <frames> -r <res>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -110,13 +110,13 @@ void main( int argc, char **argv) {
     RGB hues[NHUE];
     
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -225,5 +225,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }
diff --git a/glide2x/sst1/glide/tests/test29.c b/glide2x/sst1/glide/tests/test29.c
index a4b799c..3a7f586 100644
--- a/glide2x/sst1/glide/tests/test29.c
+++ b/glide2x/sst1/glide/tests/test29.c
@@ -38,7 +38,7 @@ static const char name[]    = "test29";
 static const char purpose[] = "oow diff hint";
 static const char usage[]   = "-n <frames> -r <res>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -53,13 +53,13 @@ void main( int argc, char **argv) {
     float      distance, dDelta;
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            exit(1);
         }
         switch( match ) {
         case 'n':
@@ -264,7 +264,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    exit(0);
 }