diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-09-12 23:37:33 +0000 | 
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-09-12 23:37:33 +0000 | 
| commit | e6524da35e4fe6014606455676b174e903fa1036 (patch) | |
| tree | f838ee20a581d16158101d80b8e15494cf91a918 /code/tools/asm | |
| parent | 0df037543f28ce0af60b427bba126c773eb76426 (diff) | |
| download | ioquake3-aero-e6524da35e4fe6014606455676b174e903fa1036.tar.gz ioquake3-aero-e6524da35e4fe6014606455676b174e903fa1036.zip  | |
* Improve Makefile startup time
  + Merge q3asm and q3lcc Makefiles into the core Makefile
  + Don't find .d files, create a list from .o
  + .asm files now depend on q3lcc
  + .qvm files now depend on q3asm
* IMPORTANT NOTE: do a "make distclean" if you have problems
git-svn-id: svn://svn.icculus.org/quake3/trunk@1178 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/tools/asm')
| -rw-r--r-- | code/tools/asm/Makefile | 43 | ||||
| -rw-r--r-- | code/tools/asm/q3asm.sln | 28 | ||||
| -rw-r--r-- | code/tools/asm/q3asm.vcproj | 191 | 
3 files changed, 0 insertions, 262 deletions
diff --git a/code/tools/asm/Makefile b/code/tools/asm/Makefile deleted file mode 100644 index 52f1060..0000000 --- a/code/tools/asm/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# yeah, couldn't do more simple really - -ifeq ($(PLATFORM),mingw32) -  BINEXT=.exe -else -  BINEXT= -endif - -ifeq ($(PLATFORM),sunos) -  INSTALL=ginstall -else -  INSTALL=install -endif - -CC=gcc -Q3ASM_CFLAGS=-O2 -Wall -Werror -fno-strict-aliasing - -ifeq ($(PLATFORM),darwin) -  LCC_CFLAGS += -DMACOS_X=1 -endif - -ifndef USE_CCACHE -  USE_CCACHE=0 -endif - -ifeq ($(USE_CCACHE),1) -  CC := ccache $(CC) -  CXX := ccache $(CXX) -endif - -default: q3asm - -q3asm: q3asm.c cmdlib.c -	$(CC) $(Q3ASM_CFLAGS) -o $@ $^ - -clean: -	rm -f q3asm *~ *.o - -install: default -	$(INSTALL) -s -m 0755 q3asm$(BINEXT) ../ - -uninstall: -	rm -f ../q3asm$(BINEXT) diff --git a/code/tools/asm/q3asm.sln b/code/tools/asm/q3asm.sln deleted file mode 100644 index 48438df..0000000 --- a/code/tools/asm/q3asm.sln +++ /dev/null @@ -1,28 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3asm", "q3asm.vcproj", "{E0D6B319-6F95-4ABA-9BE0-5454CAA5C8CD}" -	ProjectSection(ProjectDependencies) = postProject -	EndProjectSection -EndProject -Global -	GlobalSection(SourceCodeControl) = preSolution -		SccNumberOfProjects = 1 -		SccProjectUniqueName0 = q3asm.vcproj -		SccProjectName0 = \u0022$/source/q3asm\u0022,\u0020YUCAAAAA -		SccLocalPath0 = . -		SccProvider0 = MSSCCI:Perforce\u0020SCM -	EndGlobalSection -	GlobalSection(SolutionConfiguration) = preSolution -		Debug = Debug -		Release = Release -	EndGlobalSection -	GlobalSection(ProjectConfiguration) = postSolution -		{E0D6B319-6F95-4ABA-9BE0-5454CAA5C8CD}.Debug.ActiveCfg = Debug|Win32 -		{E0D6B319-6F95-4ABA-9BE0-5454CAA5C8CD}.Debug.Build.0 = Debug|Win32 -		{E0D6B319-6F95-4ABA-9BE0-5454CAA5C8CD}.Release.ActiveCfg = Release|Win32 -		{E0D6B319-6F95-4ABA-9BE0-5454CAA5C8CD}.Release.Build.0 = Release|Win32 -	EndGlobalSection -	GlobalSection(ExtensibilityGlobals) = postSolution -	EndGlobalSection -	GlobalSection(ExtensibilityAddIns) = postSolution -	EndGlobalSection -EndGlobal diff --git a/code/tools/asm/q3asm.vcproj b/code/tools/asm/q3asm.vcproj deleted file mode 100644 index f79b891..0000000 --- a/code/tools/asm/q3asm.vcproj +++ /dev/null @@ -1,191 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
 -<VisualStudioProject
 -	ProjectType="Visual C++"
 -	Version="7.10"
 -	Name="q3asm"
 -	SccProjectName=""$/source/q3asm", YUCAAAAA"
 -	SccLocalPath=".">
 -	<Platforms>
 -		<Platform
 -			Name="Win32"/>
 -	</Platforms>
 -	<Configurations>
 -		<Configuration
 -			Name="Release|Win32"
 -			OutputDirectory=".\"
 -			IntermediateDirectory=".\build\release"
 -			ConfigurationType="1"
 -			UseOfMFC="0"
 -			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 -			CharacterSet="2">
 -			<Tool
 -				Name="VCCLCompilerTool"
 -				Optimization="2"
 -				InlineFunctionExpansion="1"
 -				AdditionalIncludeDirectories="../common"
 -				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 -				StringPooling="TRUE"
 -				RuntimeLibrary="4"
 -				EnableFunctionLevelLinking="TRUE"
 -				UsePrecompiledHeader="2"
 -				PrecompiledHeaderFile="$(IntDir)\q3asm.pch"
 -				AssemblerListingLocation="$(IntDir)\"
 -				ObjectFile="$(IntDir)\"
 -				ProgramDataBaseFileName="$(IntDir)\"
 -				WarningLevel="3"
 -				SuppressStartupBanner="TRUE"
 -				CompileAs="0"/>
 -			<Tool
 -				Name="VCCustomBuildTool"/>
 -			<Tool
 -				Name="VCLinkerTool"
 -				OutputFile="$(OutDir)\q3asm.exe"
 -				LinkIncremental="1"
 -				SuppressStartupBanner="TRUE"
 -				ProgramDatabaseFile="$(IntDir)\q3asm.pdb"
 -				SubSystem="1"
 -				TargetMachine="1"/>
 -			<Tool
 -				Name="VCMIDLTool"
 -				TypeLibraryName=".\Release/q3asm.tlb"
 -				HeaderFileName=""/>
 -			<Tool
 -				Name="VCPostBuildEventTool"/>
 -			<Tool
 -				Name="VCPreBuildEventTool"/>
 -			<Tool
 -				Name="VCPreLinkEventTool"/>
 -			<Tool
 -				Name="VCResourceCompilerTool"
 -				PreprocessorDefinitions="NDEBUG"
 -				Culture="1033"/>
 -			<Tool
 -				Name="VCWebServiceProxyGeneratorTool"/>
 -			<Tool
 -				Name="VCXMLDataGeneratorTool"/>
 -			<Tool
 -				Name="VCWebDeploymentTool"/>
 -			<Tool
 -				Name="VCManagedWrapperGeneratorTool"/>
 -			<Tool
 -				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 -		</Configuration>
 -		<Configuration
 -			Name="Debug|Win32"
 -			OutputDirectory=".\"
 -			IntermediateDirectory=".\build\debug"
 -			ConfigurationType="1"
 -			UseOfMFC="0"
 -			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 -			CharacterSet="2">
 -			<Tool
 -				Name="VCCLCompilerTool"
 -				Optimization="0"
 -				AdditionalIncludeDirectories="../common"
 -				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 -				BasicRuntimeChecks="3"
 -				RuntimeLibrary="5"
 -				UsePrecompiledHeader="2"
 -				PrecompiledHeaderFile="$(IntDir)\q3asm.pch"
 -				AssemblerListingLocation="$(IntDir)\"
 -				ObjectFile="$(IntDir)\"
 -				ProgramDataBaseFileName="$(IntDir)\"
 -				WarningLevel="3"
 -				SuppressStartupBanner="TRUE"
 -				DebugInformationFormat="4"
 -				CompileAs="0"/>
 -			<Tool
 -				Name="VCCustomBuildTool"/>
 -			<Tool
 -				Name="VCLinkerTool"
 -				OutputFile="$(OutDir)\q3asm.exe"
 -				LinkIncremental="2"
 -				SuppressStartupBanner="TRUE"
 -				GenerateDebugInformation="TRUE"
 -				ProgramDatabaseFile="$(IntDir)\q3asm.pdb"
 -				SubSystem="1"
 -				TargetMachine="1"/>
 -			<Tool
 -				Name="VCMIDLTool"
 -				TypeLibraryName=".\Debug/q3asm.tlb"
 -				HeaderFileName=""/>
 -			<Tool
 -				Name="VCPostBuildEventTool"/>
 -			<Tool
 -				Name="VCPreBuildEventTool"/>
 -			<Tool
 -				Name="VCPreLinkEventTool"/>
 -			<Tool
 -				Name="VCResourceCompilerTool"
 -				PreprocessorDefinitions="_DEBUG"
 -				Culture="1033"/>
 -			<Tool
 -				Name="VCWebServiceProxyGeneratorTool"/>
 -			<Tool
 -				Name="VCXMLDataGeneratorTool"/>
 -			<Tool
 -				Name="VCWebDeploymentTool"/>
 -			<Tool
 -				Name="VCManagedWrapperGeneratorTool"/>
 -			<Tool
 -				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 -		</Configuration>
 -	</Configurations>
 -	<References>
 -	</References>
 -	<Files>
 -		<Filter
 -			Name="Source Files"
 -			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
 -			<File
 -				RelativePath="cmdlib.c">
 -				<FileConfiguration
 -					Name="Release|Win32">
 -					<Tool
 -						Name="VCCLCompilerTool"
 -						Optimization="2"
 -						AdditionalIncludeDirectories=""
 -						PreprocessorDefinitions=""/>
 -				</FileConfiguration>
 -				<FileConfiguration
 -					Name="Debug|Win32">
 -					<Tool
 -						Name="VCCLCompilerTool"
 -						Optimization="0"
 -						AdditionalIncludeDirectories=""
 -						PreprocessorDefinitions=""
 -						BasicRuntimeChecks="3"/>
 -				</FileConfiguration>
 -			</File>
 -			<File
 -				RelativePath="q3asm.c">
 -				<FileConfiguration
 -					Name="Release|Win32">
 -					<Tool
 -						Name="VCCLCompilerTool"
 -						Optimization="2"
 -						AdditionalIncludeDirectories=""
 -						PreprocessorDefinitions=""/>
 -				</FileConfiguration>
 -				<FileConfiguration
 -					Name="Debug|Win32">
 -					<Tool
 -						Name="VCCLCompilerTool"
 -						Optimization="0"
 -						AdditionalIncludeDirectories=""
 -						PreprocessorDefinitions=""
 -						BasicRuntimeChecks="3"/>
 -				</FileConfiguration>
 -			</File>
 -		</Filter>
 -		<Filter
 -			Name="Header Files"
 -			Filter="h;hpp;hxx;hm;inl">
 -			<File
 -				RelativePath="..\common\cmdlib.h">
 -			</File>
 -		</Filter>
 -	</Files>
 -	<Globals>
 -	</Globals>
 -</VisualStudioProject>
  | 
