X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=main.c;h=88481e388d2c0fa004f678c27c4bcd70fdc6287a;hp=1570201656ac4ef5025d0cef122ffe1bfad76e9f;hb=a68b56c2c3879de6beba28ec3beb2dde1f41e31f;hpb=7ce39647721ba685f02012aa77f00dec795c00f7

diff --git a/main.c b/main.c
index 1570201..88481e3 100644
--- a/main.c
+++ b/main.c
@@ -26,17 +26,32 @@ typedef struct { char *name, type; } argitem;
 VECTOR_MAKE(argitem, items);
 
 /* global options */
-int opts_debug  = 0;
-int opts_memchk = 0;
+int opts_debug                     = 0;
+int opts_memchk                    = 0;
+int opts_compiler                  = COMPILER_GMQCC;
+int opts_darkplaces_stringtablebug = 0;
+int opts_omit_nullcode             = 0;
 
 static const int usage(const char *const app) {
     printf("usage:\n");
-    printf("    %s -c<file> -- compile file\n" , app);
-    printf("    %s -a<file> -- assemble file\n", app);
+    printf("    %s -c<file>          -oprog.dat -- compile file\n"     , app);
+    printf("    %s -a<file>          -oprog.dat -- assemble file\n"    , app);
+    printf("    %s -c<file> -i<file> -oprog.dat -- compile together (allowed multiple -i<file>)\n" , app);
+    printf("    %s -a<file> -i<file> -oprog.dat -- assemble together(allowed multiple -i<file>)\n", app);
+    printf("    example:\n");
+    printf("    %s -cfoo.qc -ibar.qc -oqc.dat -afoo.qs -ibar.qs -oqs.dat\n", app);
     printf("    additional flags:\n");
-    printf("        -debug  -- turns on compiler debug messages\n");
-    printf("        -memchk -- turns on compiler memory leak check\n");
-    
+    printf("        -debug           -- turns on compiler debug messages\n");
+    printf("        -memchk          -- turns on compiler memory leak check\n");
+    printf("        -help            -- prints this help/usage text\n");
+    printf("        -std             -- select the QuakeC compile type (types below):\n");
+    printf("            -std=qcc     -- original QuakeC\n");
+    printf("            -std=ftqecc  -- fteqcc QuakeC\n");
+    printf("            -std=qccx    -- qccx QuakeC\n");
+    printf("            -std=gmqcc   -- this compiler QuakeC (default selection)\n");
+    printf("    codegen flags:\n");
+    printf("        -fdarkplaces-string-table-bug -- patches the string table to work with bugged versions of darkplaces\n");
+    printf("        -fomit-nullcode               -- omits the generation of null code (will break everywhere see propsal.txt)\n");
     return -1;
 }
 
@@ -56,9 +71,37 @@ int main(int argc, char **argv) {
         switch (argv[1][1]) {
             case 'c': items_add((argitem){util_strdup(&argv[1][2]), 0}); break; /* compile  */ 
             case 'a': items_add((argitem){util_strdup(&argv[1][2]), 1}); break; /* assemble */
+            case 'i': items_add((argitem){util_strdup(&argv[1][2]), 2}); break; /* includes */
             default:
                 if (!strncmp(&argv[1][1], "debug" , 5)) { opts_debug  = 1; break; }
                 if (!strncmp(&argv[1][1], "memchk", 6)) { opts_memchk = 1; break; }
+                if (!strncmp(&argv[1][1], "help",   4)) {
+                    return usage(app);
+                    break;
+                }
+                /* compiler type selection */
+                if (!strncmp(&argv[1][1], "std=qcc"   , 7 )) { opts_compiler = COMPILER_QCC;    break; }
+                if (!strncmp(&argv[1][1], "std=fteqcc", 10)) { opts_compiler = COMPILER_FTEQCC; break; }
+                if (!strncmp(&argv[1][1], "std=qccx",   8 )) { opts_compiler = COMPILER_QCCX;   break; }
+                if (!strncmp(&argv[1][1], "std=gmqcc",  9 )) { opts_compiler = COMPILER_GMQCC;  break; }
+                if (!strncmp(&argv[1][1], "std=",       4 )) {
+                    printf("invalid std selection, supported types:\n");
+                    printf("    -std=qcc     -- original QuakeC\n");
+                    printf("    -std=ftqecc  -- fteqcc QuakeC\n");
+                    printf("    -std=qccx    -- qccx QuakeC\n");
+                    printf("    -std=gmqcc   -- this compiler QuakeC (default selection)\n");
+                    return 0;
+                }
+
+                /* code specific switches */
+                if (!strcmp(&argv[1][1], "fdarkplaces-stringtablebug")) {
+                    opts_darkplaces_stringtablebug = 1;
+                    break;
+                }
+                if (!strcmp(&argv[1][1], "fomit-nullcode")) {
+                    opts_omit_nullcode = 1;
+                    break;
+                }
                 return usage(app);
                 
         }
@@ -73,6 +116,7 @@ int main(int argc, char **argv) {
     if (opts_memchk && !opts_debug) 
         printf("Warning: cannot enable -memchk, without -debug.\n");
 
+    util_debug("COM", "starting ...\n");
     /* multi file multi path compilation system */
     for (; itr < items_elements; itr++) {
         switch (items_data[itr].type) {
@@ -89,7 +133,8 @@ int main(int argc, char **argv) {
                 break;
         }
     }
-    
+
+    util_debug("COM", "cleaning ...\n"); 
     /* clean list */
     for (itr = 0; itr < items_elements; itr++)
         mem_d(items_data[itr].name);