diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index b0322e75b..cedb06086 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -8427,18 +8427,21 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
 {
     int32_t i = 1, j, maxlen=0, *lengths;
     char *c, *k;
-    char clipshape[16] = "_clipshape0.map";
 
     mapster32_fullpath = argv[0];
 
+#ifdef HAVE_CLIPSHAPE_FEATURE
     // pre-form the default 10 clipmaps
     for (j = '0'; j<='9'; ++j)
     {
+        char clipshape[16] = "_clipshape0.map";
+
         clipshape[10] = j;
         g_clipMapFiles = (char **) Brealloc (g_clipMapFiles, (g_clipMapFilesNum+1) * sizeof(char *));
         g_clipMapFiles[g_clipMapFilesNum] = Bstrdup(clipshape);
         ++g_clipMapFilesNum;
     }
+#endif
 
     if (argc <= 1)
         return;
@@ -8585,6 +8588,7 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
                 i++;
                 continue;
             }
+#ifdef HAVE_CLIPSHAPE_FEATURE
             if (!Bstrcasecmp(c+1,"clipmap"))
             {
                 if (argc > i+1)
@@ -8597,6 +8601,7 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
                 i++;
                 continue;
             }
+#endif
             if (!Bstrcasecmp(c+1,"nm") || !Bstrcasecmp(c+1,"ns"))
             {
                 COPYARG(i);
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 1ff846cac..7e699d955 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -8612,7 +8612,6 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
 {
     int16_t i = 1, j;
     char *c, *k;
-    char clipshape[16] = "_clipshape0.map";
 
     ud.fta_on = 1;
     ud.god = 0;
@@ -8633,14 +8632,18 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
     g_player[0].wchoice[8] = 9;
     g_player[0].wchoice[9] = 1;
 
+#ifdef HAVE_CLIPSHAPE_FEATURE
     // pre-form the default 10 clipmaps
     for (j = '0'; j<='9'; ++j)
     {
+        char clipshape[16] = "_clipshape0.map";
+
         clipshape[10] = j;
         g_clipMapFiles = (char **) Brealloc (g_clipMapFiles, (g_clipMapFilesNum+1) * sizeof(char *));
         g_clipMapFiles[g_clipMapFilesNum] = Bstrdup(clipshape);
         ++g_clipMapFilesNum;
     }
+#endif
 
     if (argc > 1)
     {
@@ -8869,6 +8872,7 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
                     i++;
                     continue;
                 }
+#ifdef HAVE_CLIPSHAPE_FEATURE
                 if (!Bstrcasecmp(c+1,"clipmap"))
                 {
                     if (argc > i+1)
@@ -8881,6 +8885,7 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
                     i++;
                     continue;
                 }
+#endif
                 if (!Bstrcasecmp(c+1,"condebug"))
                 {
                     g_scriptDebug = 1;