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

Whoa, amb1941: All of AMX Mod X is now officially moved over to Visual Studio 2005 (MSVC 8)

Browse Source 
Also did the following:
* Removed -fPIC from all Linux makefiles
* AMXX build tool now also moved over to VS 2005
* AMXX build tool binary renamed from "AMXXRelease" to "builder"
* MSVC project files now can use environment variables to point to the paths of the Metamod headers and HL SDK: $(METAMOD) and $(HLSDK) respectively
This commit is contained in:
Scott Ehlert
2008-08-16 09:48:39 +00:00
parent 626bfe5240
commit 0dc6a4a5dd
140 changed files with 1245 additions and 6282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

169
installer/AMXXRelease/AMXXRelease.csproj
View File

@ -1,169 +0,0 @@
<VisualStudioProject>
<CSHARP
ProjectType = "Local"
ProductVersion = "7.10.3077"
SchemaVersion = "2.0"
ProjectGuid = "{60FE591C-FDC8-44B4-9AC1-CE3617450E31}"
>
<Build>
<Settings
ApplicationIcon = "App.ico"
AssemblyKeyContainerName = ""
AssemblyName = "AMXXRelease"
AssemblyOriginatorKeyFile = ""
DefaultClientScript = "JScript"
DefaultHTMLPageLayout = "Grid"
DefaultTargetSchema = "IE50"
DelaySign = "false"
OutputType = "Exe"
PreBuildEvent = ""
PostBuildEvent = ""
RootNamespace = "AMXXRelease"
RunPostBuildEvent = "OnBuildSuccess"
StartupObject = ""
>
<Config
Name = "Debug"
AllowUnsafeBlocks = "false"
BaseAddress = "285212672"
CheckForOverflowUnderflow = "false"
ConfigurationOverrideFile = ""
DefineConstants = "DEBUG;TRACE"
DocumentationFile = ""
DebugSymbols = "true"
FileAlignment = "4096"
IncrementalBuild = "false"
NoStdLib = "false"
NoWarn = ""
Optimize = "false"
OutputPath = "bin\Debug\"
RegisterForComInterop = "false"
RemoveIntegerChecks = "false"
TreatWarningsAsErrors = "false"
WarningLevel = "4"
/>
<Config
Name = "Release"
AllowUnsafeBlocks = "false"
BaseAddress = "285212672"
CheckForOverflowUnderflow = "false"
ConfigurationOverrideFile = ""
DefineConstants = "TRACE"
DocumentationFile = ""
DebugSymbols = "false"
FileAlignment = "4096"
IncrementalBuild = "false"
NoStdLib = "false"
NoWarn = ""
Optimize = "true"
OutputPath = "bin\Release\"
RegisterForComInterop = "false"
RemoveIntegerChecks = "false"
TreatWarningsAsErrors = "false"
WarningLevel = "4"
/>
</Settings>
<References>
<Reference
Name = "System"
AssemblyName = "System"
HintPath = "..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
/>
<Reference
Name = "System.Data"
AssemblyName = "System.Data"
HintPath = "..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
/>
<Reference
Name = "System.XML"
AssemblyName = "System.Xml"
HintPath = "..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
/>
</References>
</Build>
<Files>
<Include>
<File
RelPath = "ABuilder.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "AMod.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "App.ico"
BuildAction = "Content"
/>
<File
RelPath = "AssemblyInfo.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "Build.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "Config.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "CoreMod.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "LinuxBuilder.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "Main.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "ModCstrike.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "ModDoD.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "ModEsf.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "ModNs.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "ModTFC.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "ModTs.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "Win32Builder.cs"
SubType = "Code"
BuildAction = "Compile"
/>
</Include>
</Files>
</CSHARP>
</VisualStudioProject>

BIN
installer/AMXXRelease/AMXXRelease.exe
View File

Binary file not shown.

21
installer/AMXXRelease/AMXXRelease.sln
View File

@ -1,21 +0,0 @@
Microsoft Visual Studio Solution File, Format Version 8.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AMXXRelease", "AMXXRelease.csproj", "{60FE591C-FDC8-44B4-9AC1-CE3617450E31}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
Release = Release
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{60FE591C-FDC8-44B4-9AC1-CE3617450E31}.Debug.ActiveCfg = Debug|.NET
{60FE591C-FDC8-44B4-9AC1-CE3617450E31}.Debug.Build.0 = Debug|.NET
{60FE591C-FDC8-44B4-9AC1-CE3617450E31}.Release.ActiveCfg = Release|.NET
{60FE591C-FDC8-44B4-9AC1-CE3617450E31}.Release.Build.0 = Release|.NET
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution
EndGlobalSection
EndGlobal

58
installer/AMXXRelease/AssemblyInfo.cs
View File

@ -1,58 +0,0 @@
using System.Reflection;
using System.Runtime.CompilerServices;
//
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
//
[assembly: AssemblyTitle("AMXXRelease")]
[assembly: AssemblyDescription("Build scripts for AMX Mod X")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("AMX Mod X")]
[assembly: AssemblyProduct("AMXXRelease")]
[assembly: AssemblyCopyright("(C)Copyright 2004-2005 AMX Mod X Development Team")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
//
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.*")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
// Microsoft .NET Framework documentation for more information on assembly signing.
//
// Use the attributes below to control which key is used for signing.
//
// Notes:
// (*) If no key is specified, the assembly is not signed.
// (*) KeyName refers to a key that has been installed in the Crypto Service
// Provider (CSP) on your machine. KeyFile refers to a file which contains
// a key.
// (*) If the KeyFile and the KeyName values are both specified, the
// following processing occurs:
// (1) If the KeyName can be found in the CSP, that key is used.
// (2) If the KeyName does not exist and the KeyFile does exist, the key
// in the KeyFile is installed into the CSP and used.
// (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
// When specifying the KeyFile, the location of the KeyFile should be
// relative to the project output directory which is
// %Project Directory%\obj\<configuration>. For example, if your KeyFile is
// located in the project directory, you would specify the AssemblyKeyFile
// attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
// documentation for more information on this.
//
[assembly: AssemblyDelaySign(false)]
[assembly: AssemblyKeyFile("")]
[assembly: AssemblyKeyName("")]

6
installer/AMXXRelease/win32.info
View File

@ -1,6 +0,0 @@
compress = C:\WINDOWS\zip.exe
source = c:\temp\amxmodx
makeopts =
output = c:\temp\done
devenv = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\devenv.com
release = amxmodx-1.8.0

0
installer/AMXXRelease/ABuilder.cs → installer/builder/ABuilder.cs
View File

4
installer/AMXXRelease/AMod.cs → installer/builder/AMod.cs
View File

@ -34,7 +34,7 @@ namespace AMXXRelease
{
build = "Release";
outdir = "modules";
bindir = "msvc7";
bindir = "msvc8";
}
public Module(string name)
@ -42,7 +42,7 @@ namespace AMXXRelease
build = "Release";
outdir = "modules";
sourcedir = "dlls\\" + name;
bindir = "msvc7";
bindir = "msvc8";
projname = name + "_amxx";
vcproj = name;
}

0
installer/AMXXRelease/App.ico → installer/builder/App.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
installer/AMXXRelease/Build.cs → installer/builder/Build.cs
View File

0
installer/AMXXRelease/Config.cs → installer/builder/Config.cs
View File

0
installer/AMXXRelease/CoreMod.cs → installer/builder/CoreMod.cs
View File

0
installer/AMXXRelease/LinuxBuilder.cs → installer/builder/LinuxBuilder.cs
View File

0
installer/AMXXRelease/Main.cs → installer/builder/Main.cs
View File

14
installer/AMXXRelease/Makefile → installer/builder/Makefile
View File

@ -1,12 +1,11 @@
#(C)2004-2005 AMX Mod X Development Team
#(C)2004-2008 AMX Mod X Development Team
# Makefile written by David "BAILOPAN" Anderson
### EDIT BELOW FOR OTHER PROJECTS ###
CS = /usr/mono/bin/mcs
NAME = amxxrelease
BINARY = $(NAME).bin
OUTPATH = .
CS = gmcs
NAME = builder
BINARY = $(NAME).exe
OBJECTS = Main.cs Config.cs ABuilder.cs AMod.cs Build.cs Win32Builder.cs LinuxBuilder.cs \
CoreMod.cs ModDoD.cs ModEsf.cs ModCstrike.cs ModTFC.cs \
@ -15,8 +14,7 @@ OBJECTS = Main.cs Config.cs ABuilder.cs AMod.cs Build.cs Win32Builder.cs LinuxBu
default: all
all: $(OBJECTS)
$(CS) $(OBJECTS) -o $(OUTPATH)/$(BINARY)
$(CS) $(OBJECTS) -out:$(BINARY)
clean:
rm -rf amxxrelease
rm -rf $(BINARY)

2
installer/AMXXRelease/ModCstrike.cs → installer/builder/ModCstrike.cs
View File

@ -37,7 +37,7 @@ namespace AMXXRelease
if ((int)System.Environment.OSVersion.Platform == 128)
{
} else {
File.Copy(source + "\\dlls\\cstrike\\csx\\WinCSX\\msvc7\\Release\\WinCSX.exe",
File.Copy(source + "\\dlls\\cstrike\\csx\\WinCSX\\msvc8\\Release\\WinCSX.exe",
basedir + "\\data\\WinCSX.exe",
true);
}

0
installer/AMXXRelease/ModDoD.cs → installer/builder/ModDoD.cs
View File

0
installer/AMXXRelease/ModEsf.cs → installer/builder/ModEsf.cs
View File

0
installer/AMXXRelease/ModNs.cs → installer/builder/ModNs.cs
View File

0
installer/AMXXRelease/ModTFC.cs → installer/builder/ModTFC.cs
View File

0
installer/AMXXRelease/ModTs.cs → installer/builder/ModTs.cs
View File

33
installer/builder/Properties/AssemblyInfo.cs Normal file
View File

@ -0,0 +1,33 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("AMXX Build Tool")]
[assembly: AssemblyDescription("Build scripts for AMX Mod X")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("AlliedModders, LLC")]
[assembly: AssemblyProduct("AMXX Build Tool")]
[assembly: AssemblyCopyright("(C)Copyright 2004-2008 AlliedModders, LLC")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("83e54c68-616e-4392-9a12-7ff5a27865d4")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

0
installer/AMXXRelease/Win32Builder.cs → installer/builder/Win32Builder.cs
View File

60
installer/builder/builder.csproj Executable file
View File

@ -0,0 +1,60 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{93EF9F0C-2C25-428C-A13F-B7B7E46B22BB}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>builder</RootNamespace>
<AssemblyName>builder</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="ABuilder.cs" />
<Compile Include="AMod.cs" />
<Compile Include="Build.cs" />
<Compile Include="Config.cs" />
<Compile Include="CoreMod.cs" />
<Compile Include="LinuxBuilder.cs" />
<Compile Include="Main.cs" />
<Compile Include="ModCstrike.cs" />
<Compile Include="ModDoD.cs" />
<Compile Include="ModEsf.cs" />
<Compile Include="ModNs.cs" />
<Compile Include="ModTFC.cs" />
<Compile Include="ModTs.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Win32Builder.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

BIN
installer/builder/builder.exe Executable file
View File

Binary file not shown.

20
installer/builder/builder.sln Executable file
View File

@ -0,0 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "builder", "builder.csproj", "{93EF9F0C-2C25-428C-A13F-B7B7E46B22BB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{93EF9F0C-2C25-428C-A13F-B7B7E46B22BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{93EF9F0C-2C25-428C-A13F-B7B7E46B22BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{93EF9F0C-2C25-428C-A13F-B7B7E46B22BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{93EF9F0C-2C25-428C-A13F-B7B7E46B22BB}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

2
installer/AMXXRelease/linux32.info → installer/builder/linux32.info
View File

@ -3,4 +3,4 @@ source = /home/users/dvander/amxx
makeopts =
output = /home/users/dvander/done
devenv = /usr/bin/make
release = amxmodx-1.76c
release = amxmodx-1.8.1

2
installer/AMXXRelease/linux64.info → installer/builder/linux64.info
View File

@ -3,4 +3,4 @@ source = /home/dvander/code/amxx
makeopts = amd64
output = /home/dvander/done
devenv = /usr/bin/make
release = amxmodx-1.76
release = amxmodx-1.8.1

6
installer/builder/win32.info Executable file
View File

@ -0,0 +1,6 @@
compress = C:\WINDOWS\zip.exe
source = c:\temp\amxmodx
makeopts =
output = c:\temp\done
devenv = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv.com
release = amxmodx-1.8.1