Jelajahi Sumber

* enabled version and description directive for all windows

git-svn-id: trunk@13447 -
florian 16 tahun lalu
induk
melakukan
caf0096877
2 mengubah file dengan 16 tambahan dan 13 penghapusan
  1. 12 9
      compiler/gendef.pas
  2. 4 4
      compiler/scandir.pas

+ 12 - 9
compiler/gendef.pas

@@ -111,7 +111,6 @@ begin
   {$I-}
   {$I-}
   if ioresult<>0 then
   if ioresult<>0 then
    exit;
    exit;
-{$ifdef i386}
   case target_info.system of
   case target_info.system of
     system_i386_Os2, system_i386_emx:
     system_i386_Os2, system_i386_emx:
       begin
       begin
@@ -125,15 +124,19 @@ begin
         writeln(t,'STACKSIZE'#9+tostr(stacksize));
         writeln(t,'STACKSIZE'#9+tostr(stacksize));
         writeln(t,'HEAPSIZE'#9+tostr(heapsize));
         writeln(t,'HEAPSIZE'#9+tostr(heapsize));
       end;
       end;
-  system_i386_win32, system_i386_wdosx :
-    begin
-      if description<>'' then
-        writeln(t,'DESCRIPTION '+''''+description+'''');
-      if dllversion<>'' then
-        writeln(t,'VERSION '+dllversion);
-    end;
+    system_i386_win32,
+    system_x86_64_win64,
+    system_ia64_win64,
+    system_arm_wince,
+    system_i386_wince,
+    system_i386_wdosx :
+      begin
+        if description<>'' then
+          writeln(t,'DESCRIPTION '+''''+description+'''');
+        if dllversion<>'' then
+          writeln(t,'VERSION '+dllversion);
+      end;
   end;
   end;
-{$endif}
 
 
 {write imports}
 {write imports}
   if not importlist.empty then
   if not importlist.empty then

+ 4 - 4
compiler/scandir.pas

@@ -312,8 +312,8 @@ unit scandir;
 
 
     procedure dir_description;
     procedure dir_description;
       begin
       begin
-        if not (target_info.system in [system_i386_os2,system_i386_emx,
-                 system_i386_win32,system_i386_netware,system_i386_wdosx,system_i386_netwlibc]) then
+        if not (target_info.system in system_all_windows+[system_i386_os2,system_i386_emx,
+                 system_i386_netware,system_i386_wdosx,system_i386_netwlibc]) then
           Message(scan_w_description_not_support);
           Message(scan_w_description_not_support);
         { change description global var in all cases }
         { change description global var in all cases }
         { it not used but in win32, os2 and netware }
         { it not used but in win32, os2 and netware }
@@ -1100,8 +1100,8 @@ unit scandir;
         major, minor, revision : longint;
         major, minor, revision : longint;
         error : integer;
         error : integer;
       begin
       begin
-        if not (target_info.system in [system_i386_os2,system_i386_emx,
-                 system_i386_win32,system_i386_netware,system_i386_wdosx,
+        if not (target_info.system in system_all_windows+[system_i386_os2,system_i386_emx,
+                 system_i386_netware,system_i386_wdosx,
                  system_i386_netwlibc]) then
                  system_i386_netwlibc]) then
           begin
           begin
             Message(scan_n_version_not_support);
             Message(scan_n_version_not_support);