Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Hopefully fixed Windows build.

Browse Source
This commit is contained in:
Scott Ehlert 2011-07-01 21:51:27 -05:00
parent 088f109a64
commit da2eb8ea66
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/cstrike/csx/msvc10/csx.sln
View File

@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csx", "csx.vcxproj", "{1DC4A99A-F23F-4AAE-881C-79D157C91155}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinCSX", "..\WinCSX\msvc10\WinCSX.vcxproj", "{39A1E5DD-81A1-441D-B99A-E50A01DB05D7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -13,6 +15,10 @@ Global
{1DC4A99A-F23F-4AAE-881C-79D157C91155}.Debug|Win32.Build.0 = Debug|Win32
{1DC4A99A-F23F-4AAE-881C-79D157C91155}.Release|Win32.ActiveCfg = Release|Win32
{1DC4A99A-F23F-4AAE-881C-79D157C91155}.Release|Win32.Build.0 = Release|Win32
{39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.Debug|Win32.ActiveCfg = Debug|Win32
{39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.Debug|Win32.Build.0 = Debug|Win32
{39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.Release|Win32.ActiveCfg = Release|Win32
{39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

2
installer/builder/ModCstrike.cs
View File

@ -37,7 +37,7 @@ public override sealed bool CopyExtraFiles(ABuilder ab, string basedir, string s
if (System.Environment.OSVersion.Platform == System.PlatformID.Unix)
{
} else {
File.Copy(source + "\\dlls\\cstrike\\csx\\WinCSX\\msvc10\\Release\\WinCSX.exe",
File.Copy(source + "\\dlls\\cstrike\\csx\\msvc10\\Release\\WinCSX.exe",
basedir + "\\data\\WinCSX.exe",
true);
}

8
installer/builder/Win32Builder.cs
View File

@ -74,11 +74,11 @@ public override string BuildModule(Module module)
else
{
info.Arguments = "";
}
info.WorkingDirectory = PropSlashes(dir);
}
info.WorkingDirectory = PropSlashes(dir);
info.FileName = m_Cfg.DevenvPath();
info.Arguments += module.vcproj + ".vcxproj" + " /p:Configuration=" + module.build + " /t:Rebuild";
info.Arguments += module.vcproj + ".sln" + " /p:Configuration=" + module.build + " /t:Rebuild";
info.UseShellExecute = false;
info.RedirectStandardOutput = true;
info.RedirectStandardError = true;

BIN
installer/builder/builder.exe
View File

Binary file not shown.

2
support/buildbot/package.pl
View File

@ -41,7 +41,7 @@ $ftp_path .= "/$major.$minor";
my ($ftp);
$ftp = Net::FTP->new($ftp_host, Debug => 0)
$ftp = Net::FTP->new($ftp_host, Debug => 0, Passive => 0)
or die "Cannot connect to host $ftp_host: $@";
$ftp->login($ftp_user, $ftp_pass)