mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-12 23:54:35 +00:00
SVN r402 (trunk)
This commit is contained in:
Randy Heit
parent
c7644ca34e
commit
511e11e8b4
4 changed files with 94 additions and 103 deletions
|
|
@ -1,3 +1,10 @@
|
||||||
|
December 3, 2006
|
||||||
|
- Modified the trustInfo for updaterevision.exe so that it should be
|
||||||
|
fine even with the buggy mt.exe that comes with Visual C++ 2005.
|
||||||
|
(Note that the Platform SDK for Windows Server 2003 R2, and later
|
||||||
|
versions of the Windows SDK also come with a working mt.exe that
|
||||||
|
work fine with the old trustInfo.)
|
||||||
|
|
||||||
December 2, 2006 (Changes by Graf Zahl)
|
December 2, 2006 (Changes by Graf Zahl)
|
||||||
- Converted the Heretic sound sequences and the particle fountains to DECORATE.
|
- Converted the Heretic sound sequences and the particle fountains to DECORATE.
|
||||||
- Added DECORATE support for setting an actor's args. If this is done
|
- Added DECORATE support for setting an actor's args. If this is done
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,16 @@
|
||||||
|
<!-- Ignore any warnings about Unrecognized Element "trustInfo" -->
|
||||||
|
|
||||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
||||||
<assemblyIdentity version="1.0.0.0"
|
<assemblyIdentity version="1.0.0.0"
|
||||||
processorArchitecture="X86"
|
processorArchitecture="X86"
|
||||||
name="UpdateRevision"
|
name="UpdateRevision"
|
||||||
type="win32" />
|
type="win32" />
|
||||||
<description>Update svnrevision.h for the ZDoom source build process.</description>
|
<description>Update svnrevision.h for the ZDoom source build process.</description>
|
||||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
|
<ms_asmv3:trustInfo xmlns:ms_asmv3="urn:schemas-microsoft-com:asm.v3">
|
||||||
<security>
|
<ms_asmv3:security>
|
||||||
<requestedPrivileges>
|
<ms_asmv3:requestedPrivileges>
|
||||||
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
|
<ms_asmv3:requestedExecutionLevel level="asInvoker" uiAccess="false" />
|
||||||
</requestedPrivileges>
|
</ms_asmv3:requestedPrivileges>
|
||||||
</security>
|
</ms_asmv3:security>
|
||||||
</trustInfo>
|
</ms_asmv3:trustInfo>
|
||||||
</assembly>
|
</assembly>
|
||||||
|
|
|
||||||
|
|
@ -3,23 +3,6 @@
|
||||||
* Public domain. This program uses the svnversion command to get the
|
* Public domain. This program uses the svnversion command to get the
|
||||||
* repository revision for a particular directory and writes it into
|
* repository revision for a particular directory and writes it into
|
||||||
* a header file so that it can be used as a project's build number.
|
* a header file so that it can be used as a project's build number.
|
||||||
*
|
|
||||||
* VERY IMPORTANT:
|
|
||||||
*
|
|
||||||
* When building with Visual Studio 2005, you must copy
|
|
||||||
* the mt.exe from %VSINSTALLDIR%\Common7\Tools\bin on top of the version
|
|
||||||
* in %VSINSTALLDIR%\VC\bin or your computer may restart while building.
|
|
||||||
* This is due to the interaction of two separate bugs in both the old
|
|
||||||
* mt.exe installed in the VC\bin directory and the loader in XP SP2.
|
|
||||||
* Microsoft has a hotfix for XP SP2 but has yet to release it to the
|
|
||||||
* general public, but fortunately they already have a fixed mt.exe
|
|
||||||
* available.
|
|
||||||
*
|
|
||||||
* To check that you have done this correctly, the project is now set to
|
|
||||||
* have the manifest tool output its version when it executes. The buggy
|
|
||||||
* version is 5.2.3790.2014, and the fixed version is 6.0.4071.0.
|
|
||||||
*
|
|
||||||
* Ignore any warnings about Unrecognized Element "trustInfo".
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define _CRT_SECURE_NO_DEPRECATE
|
#define _CRT_SECURE_NO_DEPRECATE
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
>
|
>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
Name="VCPreBuildEventTool"
|
||||||
CommandLine="echo ------------------- VERY IMPORTANT: --------------------
echo You must copy the mt.exe from
echo $(VSINSTALLDIR)\Common7\Tools\bin
echo on top of the version in
echo $(VSINSTALLDIR)\VC\bin
echo or your computer may restart while building.
"
|
CommandLine=""
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCustomBuildTool"
|
Name="VCCustomBuildTool"
|
||||||
|
|
@ -75,7 +75,83 @@
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManifestTool"
|
Name="VCManifestTool"
|
||||||
AdditionalManifestFiles="$(InputDir)trustinfo.txt"
|
AdditionalManifestFiles="$(InputDir)trustinfo.txt"
|
||||||
SuppressStartupBanner="false"
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCXDCMakeTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCBscMakeTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCFxCopTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCAppVerifierTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCWebDeploymentTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCPostBuildEventTool"
|
||||||
|
/>
|
||||||
|
</Configuration>
|
||||||
|
<Configuration
|
||||||
|
Name="Release|Win32"
|
||||||
|
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
|
||||||
|
IntermediateDirectory="$(ConfigurationName)"
|
||||||
|
ConfigurationType="1"
|
||||||
|
CharacterSet="1"
|
||||||
|
WholeProgramOptimization="1"
|
||||||
|
>
|
||||||
|
<Tool
|
||||||
|
Name="VCPreBuildEventTool"
|
||||||
|
CommandLine=""
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCCustomBuildTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCXMLDataGeneratorTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCWebServiceProxyGeneratorTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCMIDLTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCCLCompilerTool"
|
||||||
|
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
|
||||||
|
RuntimeLibrary="2"
|
||||||
|
UsePrecompiledHeader="0"
|
||||||
|
WarningLevel="3"
|
||||||
|
Detect64BitPortabilityProblems="true"
|
||||||
|
DebugInformationFormat="3"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCManagedResourceCompilerTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCResourceCompilerTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCPreLinkEventTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCLinkerTool"
|
||||||
|
LinkIncremental="1"
|
||||||
|
GenerateDebugInformation="true"
|
||||||
|
SubSystem="1"
|
||||||
|
OptimizeReferences="2"
|
||||||
|
EnableCOMDATFolding="2"
|
||||||
|
TargetMachine="1"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCALinkTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCManifestTool"
|
||||||
|
AdditionalManifestFiles="$(InputDir)trustinfo.txt"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCXDCMakeTool"
|
Name="VCXDCMakeTool"
|
||||||
|
|
@ -172,83 +248,6 @@
|
||||||
Name="VCPostBuildEventTool"
|
Name="VCPostBuildEventTool"
|
||||||
/>
|
/>
|
||||||
</Configuration>
|
</Configuration>
|
||||||
<Configuration
|
|
||||||
Name="Release|Win32"
|
|
||||||
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
|
|
||||||
IntermediateDirectory="$(ConfigurationName)"
|
|
||||||
ConfigurationType="1"
|
|
||||||
CharacterSet="1"
|
|
||||||
WholeProgramOptimization="1"
|
|
||||||
>
|
|
||||||
<Tool
|
|
||||||
Name="VCPreBuildEventTool"
|
|
||||||
CommandLine="echo ------------------- VERY IMPORTANT: --------------------
echo You must copy the mt.exe from
echo $(VSINSTALLDIR)\Common7\Tools\bin
echo on top of the version in
echo $(VSINSTALLDIR)\VC\bin
echo or your computer may restart while building.
"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCCustomBuildTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCXMLDataGeneratorTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCWebServiceProxyGeneratorTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCMIDLTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCCLCompilerTool"
|
|
||||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
|
|
||||||
RuntimeLibrary="2"
|
|
||||||
UsePrecompiledHeader="0"
|
|
||||||
WarningLevel="3"
|
|
||||||
Detect64BitPortabilityProblems="true"
|
|
||||||
DebugInformationFormat="3"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCManagedResourceCompilerTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCResourceCompilerTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCPreLinkEventTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCLinkerTool"
|
|
||||||
LinkIncremental="1"
|
|
||||||
GenerateDebugInformation="true"
|
|
||||||
SubSystem="1"
|
|
||||||
OptimizeReferences="2"
|
|
||||||
EnableCOMDATFolding="2"
|
|
||||||
TargetMachine="1"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCALinkTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCManifestTool"
|
|
||||||
AdditionalManifestFiles="$(InputDir)trustinfo.txt"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCXDCMakeTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCBscMakeTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCFxCopTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCAppVerifierTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCWebDeploymentTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
|
||||||
Name="VCPostBuildEventTool"
|
|
||||||
/>
|
|
||||||
</Configuration>
|
|
||||||
<Configuration
|
<Configuration
|
||||||
Name="Release|x64"
|
Name="Release|x64"
|
||||||
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
|
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue