OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Merge MOULa build 918 from Cyan

Browse Source 
Too many changes to describe in detail, see commits on parent branch build918chunks.
Some of them break buildability outside of Cyan, to be fixed in subsequent commits.

Merge conflicts in some .sln and .vcproj files all resolved by taking the Cyan version.
This commit is contained in:
Christian Walther
2014-01-02 23:43:54 +01:00
parent 9743c73a44 e0b363f3a2
commit 189c9b0221
73 changed files with 333 additions and 1293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plAudio/plAudio.vcproj
View File

@ -22,8 +22,8 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/dx9.0c/include;../../../../SDKs/Win32/HawkVoice/src;../../../../SDKs/Win32/HawkVoice/Release;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/WMSDK/include;../../../../../StaticSDKs/Win32/EAX/include;../../../../../StaticSDKs/Win32/oggvorbis/include;"../../../../../StaticSDKs/Win32/speex-1.0.1/libspeex";../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/dx9.0c/include;../../../../SDKs/Win32/HawkVoice/src;../../../../SDKs/Win32/HawkVoice/Release;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/WMSDK/include;../../../../../StaticSDKs/Win32/EAX/include;../../../../../StaticSDKs/Win32/oggvorbis/include;"../../../../../StaticSDKs/Win32/speex-1.0.1/libspeex";"../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include""
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;EAX_SDK_AVAILABLE"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@ -74,8 +74,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/dx9.0c/include;../../../../SDKs/Win32/HawkVoice/src;../../../../SDKs/Win32/HawkVoice/Release;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/WMSDK/include;../../../../../StaticSDKs/Win32/EAX/include;../../../../../StaticSDKs/Win32/oggvorbis/include;&quot;../../../../../StaticSDKs/Win32/speex-1.0.1/libspeex&quot;;../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/dx9.0c/include;../../../../SDKs/Win32/HawkVoice/src;../../../../SDKs/Win32/HawkVoice/Release;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/WMSDK/include;../../../../../StaticSDKs/Win32/EAX/include;../../../../../StaticSDKs/Win32/oggvorbis/include;&quot;../../../../../StaticSDKs/Win32/speex-1.0.1/libspeex&quot;;&quot;../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;EAX_SDK_AVAILABLE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
ForceConformanceInForLoopScope="TRUE"