Dropped x86 suffix from dll names.

This commit is contained in:
Artem Kharytoniuk 2016-07-12 09:06:01 +03:00
parent 19b403cda8
commit a9ec999a1c
4 changed files with 7 additions and 13 deletions

View File

@ -51,10 +51,10 @@
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetName>cgamex86</TargetName>
<TargetName>cgame</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<TargetName>cgamex86</TargetName>
<TargetName>cgame</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
@ -84,7 +84,6 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<BaseAddress>0x30000000</BaseAddress>
<ImportLibrary>$(TargetDir)cgamex86.lib</ImportLibrary>
</Link>
<Bscmake>
<OutputFile>
@ -120,7 +119,6 @@
<ModuleDefinitionFile>cgame.def</ModuleDefinitionFile>
<SubSystem>Windows</SubSystem>
<BaseAddress>0x30000000</BaseAddress>
<ImportLibrary>$(TargetDir)cgamex86.lib</ImportLibrary>
</Link>
<Bscmake>
<OutputFile>

View File

@ -51,10 +51,10 @@
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetName>qagamex86</TargetName>
<TargetName>qagame</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<TargetName>qagamex86</TargetName>
<TargetName>qagame</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
@ -84,7 +84,6 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<BaseAddress>0x20000000</BaseAddress>
<ImportLibrary>$(TargetDir)qagamex86.lib</ImportLibrary>
</Link>
<Bscmake>
<OutputFile>
@ -120,7 +119,6 @@
<ModuleDefinitionFile>game.def</ModuleDefinitionFile>
<SubSystem>Windows</SubSystem>
<BaseAddress>0x20000000</BaseAddress>
<ImportLibrary>$(TargetDir)qagamex86.lib</ImportLibrary>
</Link>
<Bscmake>
<OutputFile>

View File

@ -53,10 +53,10 @@
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetName>uix86</TargetName>
<TargetName>ui</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<TargetName>uix86</TargetName>
<TargetName>ui</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
@ -84,7 +84,6 @@
<Link>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ModuleDefinitionFile>ui.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)uix86.lib</ImportLibrary>
</Link>
<Bscmake>
<OutputFile>
@ -119,7 +118,6 @@
<ModuleDefinitionFile>ui.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<BaseAddress>0x40000000</BaseAddress>
<ImportLibrary>$(TargetDir)uix86.lib</ImportLibrary>
</Link>
<Bscmake>
<OutputFile>

View File

@ -543,7 +543,7 @@ void * QDECL Sys_LoadDll( const char *name, char *fqpath , intptr_t (QDECL **ent
*fqpath = 0 ; // added 7/20/02 by T.Ray
Com_sprintf( filename, sizeof( filename ), "%sx86.dll", name );
Com_sprintf( filename, sizeof( filename ), "%s.dll", name );
#ifdef NDEBUG
timestamp = Sys_Milliseconds();