Browse Source

+ added $APPTYPE TOOL for MPW tools on MacOS

olle 21 years ago
parent
commit
46451e4662
6 changed files with 38 additions and 12 deletions
  1. 11 4
      compiler/globtype.pas
  2. 3 1
      compiler/msg/errore.msg
  3. 1 1
      compiler/msgidx.inc
  4. 5 3
      compiler/msgtxt.inc
  5. 11 1
      compiler/options.pas
  6. 7 2
      compiler/scandir.pas

+ 11 - 4
compiler/globtype.pas

@@ -111,9 +111,13 @@ interface
        );
        );
        tmodeswitches = set of tmodeswitch;
        tmodeswitches = set of tmodeswitch;
 
 
-       { win32 & OS/2 application types }
-       tapptype = (app_none,
-         app_gui,app_cui,app_fs
+       { Win32, OS/2 & MacOS application types }
+       tapptype = (
+         app_none,
+         app_gui,		{ graphic user-interface application}
+         app_cui,       { console application}
+         app_fs,        { full-screen type application (OS/2 and EMX only) }
+         app_tool       { tool application, (MPW tool for MacOS, MacOS only)}
        );
        );
 
 
        { interface types }
        { interface types }
@@ -235,7 +239,10 @@ implementation
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.50  2004-03-10 22:52:57  peter
+  Revision 1.51  2004-04-04 18:46:09  olle
+    + added $APPTYPE TOOL for MPW tools on MacOS
+
+  Revision 1.50  2004/03/10 22:52:57  peter
     * more stabs fixes
     * more stabs fixes
     * special mode -gv for valgrind compatible stabs
     * special mode -gv for valgrind compatible stabs
 
 

+ 3 - 1
compiler/msg/errore.msg

@@ -2234,13 +2234,15 @@ option_help_pages=11025_[
 6*2Tamiga_Commodore Amiga
 6*2Tamiga_Commodore Amiga
 6*2Tatari_Atari ST/STe/TT
 6*2Tatari_Atari ST/STe/TT
 6*2Tlinux_Linux-68k
 6*2Tlinux_Linux-68k
-6*2Tmacos_Macintosh m68k
+6*2Tmacos_Macintosh m68k (not supported)
 6*2Tpalmos_PalmOS
 6*2Tpalmos_PalmOS
 P*1T<x>_Target operating system:
 P*1T<x>_Target operating system:
 P*2Tdarwin_Darwin and MacOS X on PowerPC
 P*2Tdarwin_Darwin and MacOS X on PowerPC
 P*2Tlinux_Linux on PowerPC
 P*2Tlinux_Linux on PowerPC
 P*2Tmacos_MacOS (classic) on PowerPC
 P*2Tmacos_MacOS (classic) on PowerPC
 P*2Tmorphos_MorphOS
 P*2Tmorphos_MorphOS
+P*2WC_Specify console type application (MacOS only)
+P*2WT_Specify tool type application (MPW tool, MacOS only)
 **1*_
 **1*_
 **1?_shows this help
 **1?_shows this help
 **1h_shows this help without waiting
 **1h_shows this help without waiting

+ 1 - 1
compiler/msgidx.inc

@@ -634,7 +634,7 @@ const
   option_info=11024;
   option_info=11024;
   option_help_pages=11025;
   option_help_pages=11025;
 
 
-  MsgTxtSize = 36108;
+  MsgTxtSize = 36235;
 
 
   MsgIdxMax : array[1..20] of longint=(
   MsgIdxMax : array[1..20] of longint=(
     17,63,197,54,57,44,99,20,35,60,
     17,63,197,54,57,44,99,20,35,60,

+ 5 - 3
compiler/msgtxt.inc

@@ -866,13 +866,15 @@ const msgtxt : array[0..000150,1..240] of char=(
   '6*2Tamiga_Commodore Amiga'#010+
   '6*2Tamiga_Commodore Amiga'#010+
   '6*2Tatari_Atari ST/STe/TT'#010+
   '6*2Tatari_Atari ST/STe/TT'#010+
   '6*2Tlinux_Linux-68k'#010+
   '6*2Tlinux_Linux-68k'#010+
-  '6*2Tmacos_Macintosh m68k'#010+
+  '6*2Tmacos_Macintosh m68k (not supported)'#010+
   '6*2Tpalmos_PalmOS'#010+
   '6*2Tpalmos_PalmOS'#010+
   'P*1T<x>_Target operating system:'#010+
   'P*1T<x>_Target operating system:'#010+
   'P*2Tdarwin_Darwin and MacOS X on PowerPC'#010+
   'P*2Tdarwin_Darwin and MacOS X on PowerPC'#010+
-  'P*2Tlinux_Linux on PowerPC'#010+
-  'P*2Tmacos_Mac','OS (classic) on PowerPC'#010+
+  'P*2Tlinux_Linux on Power','PC'#010+
+  'P*2Tmacos_MacOS (classic) on PowerPC'#010+
   'P*2Tmorphos_MorphOS'#010+
   'P*2Tmorphos_MorphOS'#010+
+  'P*2WC_Specify console type application (MacOS only)'#010+
+  'P*2WT_Specify tool type application (MPW tool, MacOS only)'#010+
   '**1*_'#010+
   '**1*_'#010+
   '**1?_shows this help'#010+
   '**1?_shows this help'#010+
   '**1h_shows this help without waiting'#000
   '**1h_shows this help without waiting'#000

+ 11 - 1
compiler/options.pas

@@ -1080,6 +1080,13 @@ begin
                         else
                         else
                           apptype:=app_gui;
                           apptype:=app_gui;
                       end;
                       end;
+                    'T':
+                      begin
+                        if UnsetBool(More, j) then
+                          apptype:=app_cui
+                        else
+                          apptype:=app_tool;
+                      end;
                     'N':
                     'N':
                       begin
                       begin
                         RelocSection:=UnsetBool(More,j);
                         RelocSection:=UnsetBool(More,j);
@@ -2040,7 +2047,10 @@ finalization
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.132  2004-03-29 19:19:35  florian
+  Revision 1.133  2004-04-04 18:46:09  olle
+    + added $APPTYPE TOOL for MPW tools on MacOS
+
+  Revision 1.132  2004/03/29 19:19:35  florian
     + arm floating point register saving implemented
     + arm floating point register saving implemented
     * hopefully stabs generation for MacOSX fixed
     * hopefully stabs generation for MacOSX fixed
     + some defines for arm added
     + some defines for arm added

+ 7 - 2
compiler/scandir.pas

@@ -183,7 +183,7 @@ implementation
          hs : string;
          hs : string;
       begin
       begin
         if not (target_info.system in [system_i386_win32,system_i386_os2,
         if not (target_info.system in [system_i386_win32,system_i386_os2,
-                                       system_i386_emx]) then
+                                       system_i386_emx, system_powerpc_macos]) then
           Message(scan_w_app_type_not_support);
           Message(scan_w_app_type_not_support);
         if not current_module.in_global then
         if not current_module.in_global then
           Message(scan_w_switch_is_global)
           Message(scan_w_switch_is_global)
@@ -198,6 +198,8 @@ implementation
              else if (hs='FS') and (target_info.system in [system_i386_os2,
              else if (hs='FS') and (target_info.system in [system_i386_os2,
                                                          system_i386_emx]) then
                                                          system_i386_emx]) then
                apptype:=app_fs
                apptype:=app_fs
+             else if (hs='TOOL') and (target_info.system in [system_powerpc_macos]) then
+               apptype:=app_tool
              else
              else
                Message1(scan_w_unsupported_app_type,hs);
                Message1(scan_w_unsupported_app_type,hs);
           end;
           end;
@@ -992,7 +994,10 @@ implementation
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.31  2004-03-14 20:08:37  peter
+  Revision 1.32  2004-04-04 18:46:09  olle
+    + added $APPTYPE TOOL for MPW tools on MacOS
+
+  Revision 1.31  2004/03/14 20:08:37  peter
     * packrecords fixed for settings from $PACKRECORDS
     * packrecords fixed for settings from $PACKRECORDS
     * default packrecords now uses value 0 and uses info from aligment
     * default packrecords now uses value 0 and uses info from aligment
       structure only, initpackrecords removed
       structure only, initpackrecords removed