removed amd64 support from installer (and yep, installer's version is already up-to-date ;] )
This commit is contained in:
		
										
											Binary file not shown.
										
									
								
							@@ -6,7 +6,7 @@ uses SysUtils, Classes, Windows, Graphics, Forms, ShellAPI, Controls, Messages,
 | 
			
		||||
     TlHelp32, IdFTPCommon, ComCtrls, Dialogs, JclFileUtils;
 | 
			
		||||
 | 
			
		||||
type TMod = (modNone, modCS, modDoD, modTFC, modNS, modTS, modESF);
 | 
			
		||||
type TOS = (osWindows, osLinux32, osLinux64);
 | 
			
		||||
type TOS = (osWindows, osLinux32{, osLinux64});
 | 
			
		||||
 | 
			
		||||
procedure AddStatus(Text: String; Color: TColor; ShowTime: Boolean = True);
 | 
			
		||||
procedure AddDone(Additional: String = '');
 | 
			
		||||
@@ -213,7 +213,7 @@ begin
 | 
			
		||||
      if Pos('_amd64', ExtractFileName(eFile)) <> 0 then
 | 
			
		||||
        Result := True;
 | 
			
		||||
    end;
 | 
			
		||||
    osLinux64: begin
 | 
			
		||||
    {osLinux64: begin
 | 
			
		||||
      if ExtractFileExt(eFile) = '.dll' then
 | 
			
		||||
        Result := True;
 | 
			
		||||
      if ExtractFileExt(eFile) = '.exe' then
 | 
			
		||||
@@ -221,7 +221,7 @@ begin
 | 
			
		||||
 | 
			
		||||
      if Pos('_i386', ExtractFileName(eFile)) <> 0 then
 | 
			
		||||
        Result := True;
 | 
			
		||||
    end;
 | 
			
		||||
    end;}
 | 
			
		||||
  end;
 | 
			
		||||
end;
 | 
			
		||||
 | 
			
		||||
@@ -350,10 +350,10 @@ begin
 | 
			
		||||
          eStr[i] := '//' + eStr[i];
 | 
			
		||||
      end;
 | 
			
		||||
      eStr.Add('gamedll "addons\metamod\dlls\metamod.dll"');
 | 
			
		||||
      if OS = osLinux64 then
 | 
			
		||||
        eStr.Add('gamedll_linux "addons/metamod/dlls/metamod_amd64.so"')
 | 
			
		||||
      else
 | 
			
		||||
        eStr.Add('gamedll_linux "addons/metamod/dlls/metamod_i386.so"');
 | 
			
		||||
      //if OS = osLinux64 then
 | 
			
		||||
      //  eStr.Add('gamedll_linux "addons/metamod/dlls/metamod_amd64.so"')
 | 
			
		||||
      //else
 | 
			
		||||
      eStr.Add('gamedll_linux "addons/metamod/dlls/metamod_i386.so"');
 | 
			
		||||
      FileSetAttr(ePath + 'liblist.gam', 0);
 | 
			
		||||
      eStr.SaveToFile(ePath + 'liblist.gam');
 | 
			
		||||
      FileSetAttr(ePath + 'liblist.gam', faReadOnly); // important for listen servers
 | 
			
		||||
 
 | 
			
		||||
@@ -6101,14 +6101,14 @@ object frmMain: TfrmMain
 | 
			
		||||
      end
 | 
			
		||||
      object lblStep2: TLabel
 | 
			
		||||
        Left = 44
 | 
			
		||||
        Top = 254
 | 
			
		||||
        Top = 230
 | 
			
		||||
        Width = 244
 | 
			
		||||
        Height = 13
 | 
			
		||||
        Caption = '4. Connect to server and select the mod directory:'
 | 
			
		||||
      end
 | 
			
		||||
      object lblStep4: TLabel
 | 
			
		||||
        Left = 44
 | 
			
		||||
        Top = 214
 | 
			
		||||
        Top = 188
 | 
			
		||||
        Width = 117
 | 
			
		||||
        Height = 13
 | 
			
		||||
        Caption = '3. Select a game addon:'
 | 
			
		||||
@@ -6122,7 +6122,7 @@ object frmMain: TfrmMain
 | 
			
		||||
      end
 | 
			
		||||
      object lblStep5: TLabel
 | 
			
		||||
        Left = 44
 | 
			
		||||
        Top = 358
 | 
			
		||||
        Top = 334
 | 
			
		||||
        Width = 64
 | 
			
		||||
        Height = 13
 | 
			
		||||
        Caption = '5. Click Next.'
 | 
			
		||||
@@ -6312,7 +6312,7 @@ object frmMain: TfrmMain
 | 
			
		||||
      end
 | 
			
		||||
      object cmdConnect: TFlatButton
 | 
			
		||||
        Left = 416
 | 
			
		||||
        Top = 269
 | 
			
		||||
        Top = 247
 | 
			
		||||
        Width = 71
 | 
			
		||||
        Height = 20
 | 
			
		||||
        ColorFocused = 16245198
 | 
			
		||||
@@ -6326,17 +6326,20 @@ object frmMain: TfrmMain
 | 
			
		||||
      end
 | 
			
		||||
      object pnlDirectory: TPanel
 | 
			
		||||
        Left = 44
 | 
			
		||||
        Top = 270
 | 
			
		||||
        Top = 246
 | 
			
		||||
        Width = 367
 | 
			
		||||
        Height = 83
 | 
			
		||||
        BevelOuter = bvLowered
 | 
			
		||||
        TabOrder = 2
 | 
			
		||||
        DesignSize = (
 | 
			
		||||
          367
 | 
			
		||||
          83)
 | 
			
		||||
        object trvDirectories: TTreeView
 | 
			
		||||
          Left = 1
 | 
			
		||||
          Top = 1
 | 
			
		||||
          Width = 365
 | 
			
		||||
          Height = 81
 | 
			
		||||
          Align = alClient
 | 
			
		||||
          Anchors = [akLeft, akTop, akRight, akBottom]
 | 
			
		||||
          BorderStyle = bsNone
 | 
			
		||||
          Images = ilImages
 | 
			
		||||
          Indent = 19
 | 
			
		||||
@@ -6350,7 +6353,7 @@ object frmMain: TfrmMain
 | 
			
		||||
      end
 | 
			
		||||
      object cboGameAddon: TFlatComboBox
 | 
			
		||||
        Left = 44
 | 
			
		||||
        Top = 230
 | 
			
		||||
        Top = 204
 | 
			
		||||
        Width = 443
 | 
			
		||||
        Height = 21
 | 
			
		||||
        Style = csDropDownList
 | 
			
		||||
@@ -6373,27 +6376,9 @@ object frmMain: TfrmMain
 | 
			
		||||
        Left = 44
 | 
			
		||||
        Top = 158
 | 
			
		||||
        Width = 441
 | 
			
		||||
        Height = 50
 | 
			
		||||
        Height = 25
 | 
			
		||||
        BevelOuter = bvLowered
 | 
			
		||||
        TabOrder = 5
 | 
			
		||||
        object lblOSNote: TLabel
 | 
			
		||||
          Left = 4
 | 
			
		||||
          Top = 24
 | 
			
		||||
          Width = 435
 | 
			
		||||
          Height = 22
 | 
			
		||||
          Caption = 
 | 
			
		||||
            'Note: Most linux servers run on a 32-bit platform. If you are no' +
 | 
			
		||||
            't sure what platform your server is using, you can still ask you' +
 | 
			
		||||
            'r provider for further information about this topic.'
 | 
			
		||||
          Enabled = False
 | 
			
		||||
          Font.Charset = DEFAULT_CHARSET
 | 
			
		||||
          Font.Color = clWindowText
 | 
			
		||||
          Font.Height = -9
 | 
			
		||||
          Font.Name = 'Tahoma'
 | 
			
		||||
          Font.Style = []
 | 
			
		||||
          ParentFont = False
 | 
			
		||||
          WordWrap = True
 | 
			
		||||
        end
 | 
			
		||||
        object optWindows: TFlatRadioButton
 | 
			
		||||
          Left = 5
 | 
			
		||||
          Top = 5
 | 
			
		||||
@@ -6418,6 +6403,7 @@ object frmMain: TfrmMain
 | 
			
		||||
          Width = 82
 | 
			
		||||
          Height = 14
 | 
			
		||||
          Caption = 'Linux (64-bit)'
 | 
			
		||||
          Enabled = False
 | 
			
		||||
          TabOrder = 2
 | 
			
		||||
        end
 | 
			
		||||
      end
 | 
			
		||||
 
 | 
			
		||||
@@ -108,10 +108,9 @@ type
 | 
			
		||||
    pnlOS: TPanel;
 | 
			
		||||
    optWindows: TFlatRadioButton;
 | 
			
		||||
    optLinux32: TFlatRadioButton;
 | 
			
		||||
    optLinux64: TFlatRadioButton;
 | 
			
		||||
    lblOSNote: TLabel;
 | 
			
		||||
    lblStep5: TLabel;
 | 
			
		||||
    lblFTP: TLabel;
 | 
			
		||||
    optLinux64: TFlatRadioButton;
 | 
			
		||||
    procedure jvwStepsCancelButtonClick(Sender: TObject);
 | 
			
		||||
    procedure cmdCancelClick(Sender: TObject);
 | 
			
		||||
    procedure cmdNextClick(Sender: TObject);
 | 
			
		||||
@@ -250,7 +249,7 @@ begin
 | 
			
		||||
    cmdConnect.Enabled := False;
 | 
			
		||||
    optWindows.Enabled := False;
 | 
			
		||||
    optLinux32.Enabled := False;
 | 
			
		||||
    optLinux64.Enabled := False;
 | 
			
		||||
    //optLinux64.Enabled := False;
 | 
			
		||||
    cboGameAddon.Enabled := False;
 | 
			
		||||
    // preinstall...
 | 
			
		||||
    MakeDir(ExtractFilePath(ParamStr(0)) + 'temp');
 | 
			
		||||
@@ -281,10 +280,10 @@ begin
 | 
			
		||||
 | 
			
		||||
    if optWindows.Checked then
 | 
			
		||||
      eOS := osWindows
 | 
			
		||||
    else if optLinux32.Checked then
 | 
			
		||||
      eOS := osLinux32
 | 
			
		||||
    else
 | 
			
		||||
      eOS := osLinux64;
 | 
			
		||||
    else //if optLinux32.Checked then
 | 
			
		||||
      eOS := osLinux32;
 | 
			
		||||
    //else
 | 
			
		||||
    //  eOS := osLinux64;
 | 
			
		||||
 | 
			
		||||
    jspInstallProgress.Show;
 | 
			
		||||
    frmMain.Height := 382;
 | 
			
		||||
@@ -580,7 +579,7 @@ begin
 | 
			
		||||
      end;
 | 
			
		||||
    end
 | 
			
		||||
    else if frbFTP.Checked then begin // FTP
 | 
			
		||||
      frmMain.Height := 445;
 | 
			
		||||
      frmMain.Height := 421;
 | 
			
		||||
      jspFTP.Show;
 | 
			
		||||
    end;
 | 
			
		||||
  end;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user