utils/mojoshader-compiler.c
changeset 688 29ee34e66161
parent 686 021241f2a237
child 706 01a92f30b84f
--- a/utils/mojoshader-compiler.c	Mon Feb 23 17:52:28 2009 -0500
+++ b/utils/mojoshader-compiler.c	Mon Feb 23 20:26:12 2009 -0500
@@ -220,14 +220,14 @@
 
         if (strcmp(arg, "-P") == 0)
         {
-            if (action != ACTION_UNKNOWN)
+            if ((action != ACTION_UNKNOWN) && (action != ACTION_PREPROCESS))
                 fail("Multiple actions specified");
             action = ACTION_PREPROCESS;
         } // if
 
         else if (strcmp(arg, "-A") == 0)
         {
-            if (action != ACTION_UNKNOWN)
+            if ((action != ACTION_UNKNOWN) && (action != ACTION_ASSEMBLE))
                 fail("Multiple actions specified");
             action = ACTION_ASSEMBLE;
         } // else if