[Dotgnu-pnet-commits] CVS: pnet/ilalink link_main.c, 1.20, 1.21 link_res.c, 1.1, 1.2

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/ilalink
In directory subversions:/tmp/cvs-serv10981/ilalink

Modified Files:
        link_main.c link_res.c 
Log Message:


Put some of the support code in place for writing win32 resources
and icons (not complete yet).


Index: link_main.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ilalink/link_main.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** link_main.c 3 Jul 2003 10:28:10 -0000       1.20
--- link_main.c 9 Jul 2003 00:53:21 -0000       1.21
***************
*** 2,6 ****
   * link_main.c - Link IL images together to form an assembly.
   *
!  * Copyright (C) 2001, 2002  Southern Storm Software, Pty Ltd.
   *
   * This program is free software; you can redistribute it and/or modify
--- 2,6 ----
   * link_main.c - Link IL images together to form an assembly.
   *
!  * Copyright (C) 2001, 2002, 2003  Southern Storm Software, Pty Ltd.
   *
   * This program is free software; you can redistribute it and/or modify
***************
*** 109,112 ****
--- 109,118 ----
                "-fminimize-parameters       or -z",
                "Minimize the size of the parameter table in the output."},
+       {"-W", 'W', 1,
+               "-fwin32res=file             or -W file",
+               "Specify a Win32 resource file to add to the image."},
+       {"-i", 'i', 1,
+               "-fwin32icon=file            or -i file",
+               "Specify a Win32 icon file to add to the image."},
        {"-H", 'H', 1,
                "-fhash-algorithm=name       or -H name",
***************
*** 162,167 ****
        {"/t*", 'F', 1, 0, 0},                  /* "/target:lib|exe|win" */
        {"/v*", 'A', 1, 0, 0},                  /* "/version:version" */
!       {"/win32icon", '?', 1, 0, 0},   /* "/win32icon:filename" */
!       {"/win32res", '?', 1, 0, 0},    /* "/win32res:filename" */
        {"/?", 'h', 0, 0, 0},                   /* "/?" */
  
--- 168,173 ----
        {"/t*", 'F', 1, 0, 0},                  /* "/target:lib|exe|win" */
        {"/v*", 'A', 1, 0, 0},                  /* "/version:version" */
!       {"/win32icon", 'i', 1, 0, 0},   /* "/win32icon:filename" */
!       {"/win32res", 'W', 1, 0, 0},    /* "/win32res:filename" */
        {"/?", 'h', 0, 0, 0},                   /* "/?" */
  
***************
*** 218,221 ****
--- 224,229 ----
        int defaultIsLib = 0;
        int linkerFlags = 0;
+       const char *win32Res = 0;
+       const char *win32Icon = 0;
        int firstFile;
        int temp, temp2;
***************
*** 367,370 ****
--- 375,390 ----
                        break;
  
+                       case 'W':
+                       {
+                               win32Res = param;
+                       }
+                       break;
+ 
+                       case 'i':
+                       {
+                               win32Icon = param;
+                       }
+                       break;
+ 
                        case 'r':
                        {
***************
*** 527,530 ****
--- 547,558 ----
                                        goto parseHashAlg;
                                }
+                               else if(!strncmp(param, "win32res=", 9))
+                               {
+                                       win32Res = param + 9;
+                               }
+                               else if(!strncmp(param, "win32icon=", 10))
+                               {
+                                       win32Icon = param + 10;
+                               }
                                else if(!strcmp(param, "private-resources"))
                                {
***************
*** 861,864 ****
--- 889,906 ----
        }
  
+       /* Add Win32 resource, icon, or version information */
+       if(win32Res)
+       {
+               ILLinkerAddWin32Resource(linker, win32Res);
+       }
+       else if(win32Icon)
+       {
+               ILLinkerAddWin32Icon(linker, win32Icon);
+       }
+       else
+       {
+               ILLinkerAddWin32Version(linker);
+       }
+ 
        /* Set the default entry point, or report an error about
           incorrect entry point specifications */
***************
*** 913,917 ****
  {
        fprintf(stdout, "ILALINK " VERSION " - IL Assembly Link Utility\n");
!       fprintf(stdout, "Copyright (c) 2001 Southern Storm Software, Pty 
Ltd.\n");
        fprintf(stdout, "\n");
        fprintf(stdout, "Usage: %s [options] input ...\n", progname);
--- 955,959 ----
  {
        fprintf(stdout, "ILALINK " VERSION " - IL Assembly Link Utility\n");
!       fprintf(stdout, "Copyright (c) 2001, 2002, 2003 Southern Storm 
Software, Pty Ltd.\n");
        fprintf(stdout, "\n");
        fprintf(stdout, "Usage: %s [options] input ...\n", progname);
***************
*** 924,928 ****
  
        printf("ILALINK " VERSION " - IL Assembly Link Utility\n");
!       printf("Copyright (c) 2001 Southern Storm Software, Pty Ltd.\n");
        printf("\n");
        printf("ILALINK comes with ABSOLUTELY NO WARRANTY.  This is free 
software,\n");
--- 966,970 ----
  
        printf("ILALINK " VERSION " - IL Assembly Link Utility\n");
!       printf("Copyright (c) 2001, 2002, 2003 Southern Storm Software, Pty 
Ltd.\n");
        printf("\n");
        printf("ILALINK comes with ABSOLUTELY NO WARRANTY.  This is free 
software,\n");

Index: link_res.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ilalink/link_res.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** link_res.c  2 Nov 2001 04:23:02 -0000       1.1
--- link_res.c  9 Jul 2003 00:53:21 -0000       1.2
***************
*** 81,84 ****
--- 81,102 ----
  }
  
+ int ILLinkerAddWin32Resource(ILLinker *linker, const char *filename)
+ {
+       /* TODO */
+       return 1;
+ }
+ 
+ int ILLinkerAddWin32Icon(ILLinker *linker, const char *filename)
+ {
+       /* TODO */
+       return 1;
+ }
+ 
+ int ILLinkerAddWin32Version(ILLinker *linker)
+ {
+       /* TODO */
+       return 1;
+ }
+ 
  #ifdef        __cplusplus
  };