Changeset 30 for trunk

Timestamp:

Jan 8, 2017, 10:39:00 PM (7 years ago)

Author:

chronos

Message:

• Fixed: Windows installer now properly install AI files according build architecture to AI subdirectory.

Location:

trunk

Files:

• AI/StdAI-win64.dll (added)
• Direct.pas (modified) (1 diff)
• Install/win/C-evo.iss (modified) (1 diff)
• Integrated.lpi (modified) (1 diff)
• LocalPlayer/Help.pas (modified) (1 diff)
• Start.pas (modified) (1 diff)

trunk/Direct.pas

@@ -7 +7 @@
   Messg,
 
-  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms;
+  LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms;
 
 const

trunk/Install/win/C-evo.iss

@@ -66 +66 @@
 Source: "{#MyAppSubDir}\Language.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#MyAppSubDir}\Language2.txt"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyAppSubDir}\AI\lib\x86_64-win64\StdAI.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "{#MyAppSubDir}\AI\lib\i386-win32\StdAI.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "{#MyAppSubDir}\StdAI.bmp"; DestDir: "{app}"; Flags: ignoreversion; 
-Source: "{#MyAppSubDir}\StdAI.ai.txt"; DestDir: "{app}"; Flags: ignoreversion;
+Source: "{#MyAppSubDir}\AI\lib\x86_64-win64\StdAI.dll"; DestDir: "{app}\AI"; DestName: "StdAI-win64.dll"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "{#MyAppSubDir}\AI\lib\i386-win32\StdAI.dll"; DestDir: "{app}\AI"; DestName: "StdAI-win32.dll"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "{#MyAppSubDir}\AI\StdAI.bmp"; DestDir: "{app}\AI"; Flags: ignoreversion; 
+Source: "{#MyAppSubDir}\AI\StdAI.ai.txt"; DestDir: "{app}\AI"; Flags: ignoreversion;
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 

trunk/Integrated.lpi

@@ -395 +395 @@
         <Filename Value="LocalPlayer\TechTree.pas"/>
         <IsPartOfProject Value="True"/>
-        <HasResources Value="True"/>
+        <ComponentName Value="TechTreeDlg"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit40>
       <Unit41>

trunk/LocalPlayer/Help.pas

@@ -966 +966 @@
             inc(p)
           until (p > length(s)) or (s[p] = '\');
-          if LoadLocalizedGraphicFile(ExtPic, 'Help\' + copy(s, 2, p - 2)) then
+          if LoadLocalizedGraphicFile(ExtPic, 'Help' + DirectorySeparator + copy(s, 2, p - 2)) then
           begin
             MainText.AddLine('', pkExternal);

trunk/Start.pas

@@ -354 +354 @@
   begin
     BrainPicture[i] := TBitmap.Create;
-    if not LoadGraphicFile(BrainPicture[i], HomeDir + Brain[i].FileName,
+    if not LoadGraphicFile(BrainPicture[i], HomeDir + 'AI' + DirectorySeparator + Brain[i].FileName,
       gfNoError) then
     begin