瀏覽代碼

tigcc *nix: when creating the decompressor, add "-n" option to the ld-tigcc invocation.
Without this fix, the launcher of the "Custom DLL Test" example is named "custom", whereas the Project Name line of the TPR requires (with good reason) that it be named "dlltest".

git-svn-id: file:///var/svn/tigccpp/trunk@1336 9552661e-59e3-4036-b4f2-dbe53926924f

debrouxl 15 年之前
父節點
當前提交
282828e422
共有 2 個文件被更改,包括 15 次插入3 次删除
  1. 12 1
      tigcc-linux/sources/tigcc/src/tigcc.c
  2. 3 2
      tigcc-linux/sources/tigcc/src/tigcc.h

+ 12 - 1
tigcc-linux/sources/tigcc/src/tigcc.c

@@ -251,6 +251,7 @@ short int process_arg(short int arg, char *argv[], int argc)
     if (++arg > argc) {
     if (++arg > argc) {
       fprintf(stderr, "Error: you didn't specify a variable name\n");
       fprintf(stderr, "Error: you didn't specify a variable name\n");
     } else {
     } else {
+      oncalcname = argv[arg];
       ld_argv[ld_argc++] = cur_arg;
       ld_argv[ld_argc++] = cur_arg;
       ld_argv[ld_argc++] = argv[arg];
       ld_argv[ld_argc++] = argv[arg];
     }
     }
@@ -925,7 +926,17 @@ void pack(void)
   // create decompressor (.??z)
   // create decompressor (.??z)
   {
   {
     char ld_tigcc_name[strlen(tigcc_base) + 14];
     char ld_tigcc_name[strlen(tigcc_base) + 14];
-    char *argv[] = {ld_tigcc_name, "pstarter.o", "-o", tmpfile, NULL};
+    char *argv[7];
+    int i = 1;
+    *argv = ld_tigcc_name;
+    argv[i++] = "pstarter.o";
+    argv[i++] = "-o";
+    argv[i++] = tmpfile;
+    if (oncalcname) {
+      argv[i++] = "-n";
+      argv[i++] = oncalcname;
+    }
+    argv[i] = NULL;
 
 
     sprintf (ld_tigcc_name, "%s/bin/ld-tigcc", tigcc_base);
     sprintf (ld_tigcc_name, "%s/bin/ld-tigcc", tigcc_base);
     change_extension(tmpfile, "");
     change_extension(tmpfile, "");

+ 3 - 2
tigcc-linux/sources/tigcc/src/tigcc.h

@@ -23,8 +23,8 @@
 #ifndef _TIGCC_H
 #ifndef _TIGCC_H
 #define _TIGCC_H
 #define _TIGCC_H
 
 
-#define VERSION "1.3.2"
-#define TIGCC_VERSION "0.96 Beta 9 r1"
+#define VERSION "1.3.3"
+#define TIGCC_VERSION "0.96 Beta 10 r1"
 
 
 /* global enumerations */
 /* global enumerations */
 enum Boolean 	{FALSE,TRUE};
 enum Boolean 	{FALSE,TRUE};
@@ -75,6 +75,7 @@ const char *tigcc_args[] =
 
 
 /* global vars */
 /* global vars */
 char *outfile = NULL;
 char *outfile = NULL;
+char *oncalcname = NULL;
 char packfile[9];
 char packfile[9];
 char *tigcc_base = NULL;
 char *tigcc_base = NULL;