mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-14 02:27:40 -04:00
Build 918 chunk 1: Revert MsDevProjects to (almost) the state of build 906 (0a67197a0c11)
Except for the addition of the plClipboard project, the partial CWE-ou state that was mistakenly taken into CWE in "Build 912" (a757a1fda0a3) was never actually used to build MOULa products.
This commit is contained in:
@ -64,6 +64,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MaxMain", "..\Tools\MaxMain
|
||||
{65C4DE61-E599-4F0F-9B75-66C0DA887BB6} = {65C4DE61-E599-4F0F-9B75-66C0DA887BB6}
|
||||
{C664C563-FA33-4E48-BE77-7CCCD922B040} = {C664C563-FA33-4E48-BE77-7CCCD922B040}
|
||||
{D6D56A64-A79B-4F48-BB9D-8C216D66632F} = {D6D56A64-A79B-4F48-BB9D-8C216D66632F}
|
||||
{CA2D4E65-EA68-465F-843A-4AF75243B474} = {CA2D4E65-EA68-465F-843A-4AF75243B474}
|
||||
{A927606C-7646-43C0-A3BB-B21836CC7D02} = {A927606C-7646-43C0-A3BB-B21836CC7D02}
|
||||
{8E44FB70-5EA0-4D33-B829-E4D16D7C11E3} = {8E44FB70-5EA0-4D33-B829-E4D16D7C11E3}
|
||||
{CA208971-6C77-47F6-AA4B-FB6ECC071132} = {CA208971-6C77-47F6-AA4B-FB6ECC071132}
|
||||
@ -487,6 +488,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plCyDebug", "..\Plasma\Apps
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plClipboard", "..\Plasma\PubUtilLib\plClipboard\plClipboard.vcproj", "{CA2D4E65-EA68-465F-843A-4AF75243B474}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfiguration) = preSolution
|
||||
Debug = Debug
|
||||
@ -1436,6 +1441,16 @@ Global
|
||||
{DE62CF05-8E3E-40A4-967D-330216C2D2ED}.Release.Build.0 = Release|Win32
|
||||
{DE62CF05-8E3E-40A4-967D-330216C2D2ED}.Release_Server.ActiveCfg = Release|Win32
|
||||
{DE62CF05-8E3E-40A4-967D-330216C2D2ED}.Release_Server.Build.0 = Release|Win32
|
||||
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Debug.ActiveCfg = Debug|Win32
|
||||
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Debug.Build.0 = Debug|Win32
|
||||
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Debug_Server.ActiveCfg = Debug|Win32
|
||||
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Debug_Server.Build.0 = Debug|Win32
|
||||
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Ethereal Build.ActiveCfg = Debug|Win32
|
||||
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Ethereal Build.Build.0 = Debug|Win32
|
||||
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Release.ActiveCfg = Release|Win32
|
||||
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Release.Build.0 = Release|Win32
|
||||
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Release_Server.ActiveCfg = Release|Win32
|
||||
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Release_Server.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
EndGlobalSection
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -105,7 +105,7 @@ xcopy /Y ..\..\..\..\..\StaticSDKs\Win32\PhysX\Bin\win32\PhysXLoader.dll ..\..\.
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories=""../../../../SDKs/XPlatform/Cypython-2.3.3/Include";"../../../../SDKs/XPlatform/Cypython-2.3.3/PC";../../../../../StaticSDKs/Win32/HawkVoice/src;../../../../../StaticSDKs/Win32/HawkVoice/Release;../../../../../StaticSDKs/Win32/dx9.0c/include;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/FeatureLib;../../../../Sources/Plasma/FeatureLib/inc;"../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static";../../../../../StaticSDKs/Win32/PlatformSDK/Include;"../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include";../../../../../StaticSDKs/Win32/OpenSSL/include"
|
||||
AdditionalIncludeDirectories=""../../../../SDKs/XPlatform/Cypython-2.3.3/Include";"../../../../SDKs/XPlatform/Cypython-2.3.3/PC";../../../../../StaticSDKs/Win32/HawkVoice/src;../../../../../StaticSDKs/Win32/HawkVoice/Release;../../../../../StaticSDKs/Win32/dx9.0c/include;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/FeatureLib;../../../../Sources/Plasma/FeatureLib/inc;"../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static";../../../../../StaticSDKs/Win32/PlatformSDK/Include"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="2"
|
||||
@ -124,11 +124,11 @@ xcopy /Y ..\..\..\..\..\StaticSDKs\Win32\PhysX\Bin\win32\PhysXLoader.dll ..\..\.
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="winhttp.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib strmiids.lib wininet.lib vfw32.lib winmm.lib libjpeg.lib libeay32.lib ws2_32.lib version.lib odbc32.lib odbccp32.lib libspeex.lib Rpcrt4.lib largeint.lib Iphlpapi.lib OpenAL32.lib"
|
||||
AdditionalDependencies="winhttp.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib strmiids.lib eax.lib wininet.lib vfw32.lib winmm.lib ijl15l.lib libcrypto.a ws2_32.lib version.lib odbc32.lib odbccp32.lib eaxguid.lib libspeex.lib binkw32.lib Rpcrt4.lib largeint.lib Iphlpapi.lib OpenAL32.lib"
|
||||
OutputFile=".\Release/plClient.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories=""..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32";"..\..\..\..\..\StaticSDKs\Win32\speex-1.0.1\Win32\libspeex\Release";..\..\..\..\..\StaticSDKs\Win32\Bink\lib;..\..\..\..\..\StaticSDKs\Win32\oggvorbis\lib;..\..\..\..\..\STATICSDKS\XPLATFORM\STLPORT\lib;..\..\..\..\..\StaticSDKs\Win32\WMSDK\lib;..\..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86;..\..\..\..\..\StaticSDKs\Win32\PhysX\lib\win32;"..\..\..\..\..\StaticSDKs\Win32\OpenAL 1.1 with EFX SDK\libs\Win32";..\..\..\..\..\StaticSDKs\Win32\PlatformSDK\Lib;"..\..\..\..\..\StaticSDKs\XPlatform\jpeg-8c-rgba""
|
||||
AdditionalLibraryDirectories=""..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32";"..\..\..\..\..\StaticSDKs\Win32\speex-1.0.1\Win32\libspeex\Release";..\..\..\..\..\StaticSDKs\Win32\Bink\lib;..\..\..\..\..\StaticSDKs\Win32\eax\lib;..\..\..\..\..\StaticSDKs\Win32\oggvorbis\lib;..\..\..\..\..\STATICSDKS\XPLATFORM\STLPORT\lib;..\..\..\..\..\STATICSDKS\Win32\ijl\lib;..\..\..\..\..\StaticSDKs\Win32\WMSDK\lib;..\..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\..\StaticSDKs\Win32\dx9.0csdk\lib;..\..\..\..\..\StaticSDKs\Win32\PhysX\lib\win32;..\..\..\..\..\StaticSDKs\Win32\OpenAL 1.1 with EFX SDK\libs\Win32;..\..\..\..\..\StaticSDKs\Win32\PlatformSDK\Lib"
|
||||
IgnoreDefaultLibraryNames="libc.lib,libci.lib,libcmt.lib"
|
||||
GenerateDebugInformation="TRUE"
|
||||
AssemblyDebug="1"
|
||||
@ -155,8 +155,8 @@ xcopy /Y /E /I ..\..\..\..\Sources\Plasma\PubUtilLib\plSDL\SDL\*.sdl ..\..\..\..
|
||||
xcopy /Y /E /I ..\..\..\..\Scripts\Python\plasma\*.py ..\..\..\..\test\python\plasma
|
||||
xcopy /Y /E /I ..\..\..\..\Scripts\Python\system\*.py ..\..\..\..\test\python\system
|
||||
xcopy /Y /E /I ..\..\..\..\Scripts\Python\system\*.pyd ..\..\..\..\test\python\system
|
||||
REM xcopy /Y ..\..\..\..\..\StaticSDKs\Win32\EAX\lib\eax.dll ..\..\..\..\test\
|
||||
REM xcopy /Y ..\..\..\..\..\StaticSDKs\Win32\Bink\lib\binkw32.dll ..\..\..\..\test\
|
||||
xcopy /Y ..\..\..\..\..\StaticSDKs\Win32\EAX\lib\eax.dll ..\..\..\..\test\
|
||||
xcopy /Y ..\..\..\..\..\StaticSDKs\Win32\Bink\lib\binkw32.dll ..\..\..\..\test\
|
||||
xcopy /Y ..\..\..\..\..\StaticSDKs\Win32\PhysX\Bin\win32\NxCharacter.dll ..\..\..\..\test\
|
||||
xcopy /Y ..\..\..\..\..\StaticSDKs\Win32\PhysX\Bin\win32\NxCooking.dll ..\..\..\..\test\
|
||||
xcopy /Y ..\..\..\..\..\StaticSDKs\Win32\PhysX\Bin\win32\NxExtensions.dll ..\..\..\..\test\
|
||||
@ -529,7 +529,7 @@ xcopy /Y ..\..\..\..\..\StaticSDKs\Win32\PhysX\Bin\win32\PhysXLoader.dll ..\..\.
|
||||
Name="Text"
|
||||
Filter="*.txt">
|
||||
<File
|
||||
RelativePath="..\..\..\..\Docs\ReleaseNotes\ReleaseNotes.txt">
|
||||
RelativePath="..\..\..\..\Docs\ReleaseNotes.txt">
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
@ -551,22 +551,22 @@ xcopy /Y ..\..\..\..\..\StaticSDKs\Win32\PhysX\Bin\win32\PhysXLoader.dll ..\..\.
|
||||
Name="DX9"
|
||||
Filter="">
|
||||
<File
|
||||
RelativePath="..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86\d3dx9.lib">
|
||||
RelativePath="..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\d3dx9.lib">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86\dinput8.lib">
|
||||
RelativePath="..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\dinput8.lib">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86\dplayx.lib">
|
||||
RelativePath="..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\dplayx.lib">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86\dsound.lib">
|
||||
RelativePath="..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\dsound.lib">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86\DxErr9.lib">
|
||||
RelativePath="..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\DxErr9.lib">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86\dxguid.lib">
|
||||
RelativePath="..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\dxguid.lib">
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
|
@ -3,7 +3,6 @@
|
||||
ProjectType="Visual C++"
|
||||
Version="7.10"
|
||||
Name="plFileEncrypt"
|
||||
ProjectGUID="{728CE37F-B032-45D1-B3B5-EF94D4B8A919}"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
<Platforms>
|
||||
@ -52,9 +51,7 @@
|
||||
TypeLibraryName=".\Debug/plFileEncrypt.tlb"
|
||||
HeaderFileName=""/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
Description="Copy to Tools directory"
|
||||
CommandLine="xcopy /Y "$(TargetPath)" ..\..\..\..\tools\"/>
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
@ -115,9 +112,7 @@
|
||||
TypeLibraryName=".\Release/plFileEncrypt.tlb"
|
||||
HeaderFileName=""/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
Description="Copy to Tools directory"
|
||||
CommandLine="xcopy /Y "$(TargetPath)" ..\..\..\..\tools\"/>
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
|
@ -52,9 +52,7 @@
|
||||
TypeLibraryName=".\Debug/plFileSecure.tlb"
|
||||
HeaderFileName=""/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
Description="Copy to Tools directory"
|
||||
CommandLine="xcopy /Y "$(TargetPath)" ..\..\..\..\tools\"/>
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
@ -103,11 +101,10 @@
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="rpcrt4.lib CoreLib.lib CoreLibExe.lib plFile.lib plUnifiedTime.lib pnProduct.lib pnUtils.lib"
|
||||
AdditionalDependencies="rpcrt4.lib"
|
||||
OutputFile=".\Release/plFileSecure.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="../../NucleusLib/pnUtils/Release;../../NucleusLib/pnProduct/Release;../../CoreLibExe/Release;../../CoreLib/Release;../../PubUtilLib/plUnifiedTime/Release;../../PubUtilLib/plFile/Release"
|
||||
ProgramDatabaseFile=".\Release/plFileSecure.pdb"
|
||||
SubSystem="1"
|
||||
TargetMachine="1"/>
|
||||
@ -116,9 +113,7 @@
|
||||
TypeLibraryName=".\Release/plFileSecure.tlb"
|
||||
HeaderFileName=""/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
Description="Copy to Tools directory"
|
||||
CommandLine="xcopy /Y "$(TargetPath)" ..\..\..\..\tools\"/>
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
|
Reference in New Issue
Block a user