mirror of
https://github.com/mangosfour/server.git
synced 2025-12-19 04:37:06 +00:00
Merge commit 'origin/master' into 310
This commit is contained in:
tomrus88
commit
c86290fa50
183 changed files with 689 additions and 21043 deletions
|
|
@ -44,11 +44,11 @@
|
|||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/MACHINE:I386"
|
||||
AdditionalDependencies="zthread.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib"
|
||||
AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib"
|
||||
OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories=""..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)""
|
||||
AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.pdb"
|
||||
GenerateMapFile="TRUE"
|
||||
|
|
@ -110,11 +110,11 @@
|
|||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/MACHINE:I386"
|
||||
AdditionalDependencies="zthread.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib"
|
||||
AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib"
|
||||
OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories=""..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)""
|
||||
AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.pdb"
|
||||
GenerateMapFile="TRUE"
|
||||
|
|
|
|||
|
|
@ -33,10 +33,10 @@
|
|||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="mangosd.lib zlib.lib zthread.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib"
|
||||
AdditionalDependencies="mangosd.lib zlib.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib aced.lib"
|
||||
OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\MaNGOSScript.dll"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="".\mangosd__$(PlatformName)_$(ConfigurationName)";"..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zlib__$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)""
|
||||
AdditionalLibraryDirectories=";.\mangosd__$(PlatformName)_$(ConfigurationName);.\zlib__$(PlatformName)_$(ConfigurationName);..\..\dep\lib\$(PlatformName)_$(ConfigurationName)"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile="$(OutDir)/MaNGOSScript.pdb"
|
||||
SubSystem="2"
|
||||
|
|
@ -83,10 +83,10 @@
|
|||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="mangosd.lib zlib.lib zthread.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib"
|
||||
AdditionalDependencies="mangosd.lib zlib.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib ace.lib"
|
||||
OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\MaNGOSScript.dll"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="".\mangosd__$(PlatformName)_$(ConfigurationName)";"..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zlib__$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)""
|
||||
AdditionalLibraryDirectories=";.\mangosd__$(PlatformName)_$(ConfigurationName);.\zlib__$(PlatformName)_$(ConfigurationName);..\..\dep\lib\$(PlatformName)_$(ConfigurationName)"
|
||||
GenerateDebugInformation="FALSE"
|
||||
SubSystem="2"
|
||||
OptimizeReferences="2"
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@
|
|||
Name="VCLibrarianTool"
|
||||
AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib"
|
||||
OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
|
||||
AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)"
|
||||
SuppressStartupBanner="TRUE"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
|
|
@ -98,6 +99,7 @@
|
|||
Name="VCLibrarianTool"
|
||||
AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib"
|
||||
OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
|
||||
AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)"
|
||||
SuppressStartupBanner="TRUE"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
|
|
@ -395,6 +397,9 @@
|
|||
<File
|
||||
RelativePath="..\..\src\shared\Common.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\shared\LockedQueue.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\shared\revision.h">
|
||||
<FileConfiguration
|
||||
|
|
@ -450,6 +455,12 @@
|
|||
Outputs="..\..\src\shared\SystemConfig.h"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\shared\Threading.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\shared\Threading.h">
|
||||
</File>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
|
|
|
|||
|
|
@ -1,381 +0,0 @@
|
|||
<?xml version="1.0" encoding="windows-1251"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.10"
|
||||
Name="zthread"
|
||||
ProjectGUID="{262199E8-EEDF-4700-A1D1-E9CC901CF480}"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
<Platforms>
|
||||
<Platform
|
||||
Name="Win32"/>
|
||||
</Platforms>
|
||||
<Configurations>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory=".\zthread__$(PlatformName)_$(ConfigurationName)"
|
||||
IntermediateDirectory=".\zthread__$(PlatformName)_$(ConfigurationName)"
|
||||
ConfigurationType="4"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\dep\include"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
|
||||
MinimalRebuild="TRUE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
UsePrecompiledHeader="2"
|
||||
PrecompiledHeaderFile=".\zthread__$(PlatformName)_$(ConfigurationName)\zthread.pch"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="TRUE"
|
||||
DebugInformationFormat="3"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="$(OutDir)/zthread.lib"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory=".\zthread__$(PlatformName)_$(ConfigurationName)"
|
||||
IntermediateDirectory=".\zthread__$(PlatformName)_$(ConfigurationName)"
|
||||
ConfigurationType="4"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories="..\..\dep\include"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
|
||||
RuntimeLibrary="2"
|
||||
EnableEnhancedInstructionSet="1"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
UsePrecompiledHeader="2"
|
||||
PrecompiledHeaderFile=".\zthread__$(PlatformName)_$(ConfigurationName)\zthread.pch"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="TRUE"
|
||||
DebugInformationFormat="3"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="$(OutDir)/zthread.lib"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Source Files"
|
||||
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
|
||||
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\AtomicCount.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\ConcurrentExecutor.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\Condition.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\ConditionImpl.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\config.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\CountingSemaphore.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\Debug.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\DeferredInterruptionScope.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\FastLock.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\FastMutex.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\FastRecursiveLock.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\FastRecursiveMutex.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\IntrusivePtr.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\Monitor.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\Monitor.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\Mutex.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\MutexImpl.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\PoolExecutor.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\PriorityCondition.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\PriorityInheritanceMutex.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\PriorityMutex.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\PrioritySemaphore.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\RecursiveMutex.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\RecursiveMutexImpl.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\RecursiveMutexImpl.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\Scheduling.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\Semaphore.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\SemaphoreImpl.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\State.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\Status.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\SynchronousExecutor.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\Thread.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\ThreadedExecutor.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\ThreadImpl.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\ThreadImpl.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\ThreadLocalImpl.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\ThreadOps.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\ThreadOps.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\ThreadQueue.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\ThreadQueue.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\Time.cxx">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\TimeStrategy.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\src\zthread\TSS.h">
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Header Files"
|
||||
Filter="h;hpp;hxx;hm;inl;inc;xsd"
|
||||
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\AtomicCount.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\Barrier.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\BiasedReadWriteLock.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\BlockingQueue.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\BoundedQueue.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\Cancelable.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\ClassLockable.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\ConcurrentExecutor.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\Condition.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\Config.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\CountedPtr.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\CountingSemaphore.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\Exceptions.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\Executor.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\FairReadWriteLock.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\FastMutex.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\FastRecursiveMutex.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\Guard.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\GuardedClass.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\Lockable.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\LockedQueue.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\MonitoredQueue.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\Mutex.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\NonCopyable.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\PoolExecutor.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\Priority.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\PriorityCondition.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\PriorityInheritanceMutex.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\PriorityMutex.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\PrioritySemaphore.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\Queue.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\ReadWriteLock.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\RecursiveMutex.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\Runnable.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\Semaphore.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\Singleton.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\SynchronousExecutor.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\Task.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\Thread.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\ThreadedExecutor.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\ThreadLocal.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\ThreadLocalImpl.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\Time.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\Waitable.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\dep\include\zthread\ZThread.h">
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
</VisualStudioProject>
|
||||
Loading…
Add table
Add a link
Reference in a new issue