Compare commits
2 Commits
39f570a3b1
...
345bd1d2be
| Author | SHA1 | Date | |
|---|---|---|---|
| 345bd1d2be | |||
| c012f46962 |
@@ -105,6 +105,7 @@
|
|||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||||
|
<DisableSpecificWarnings>4996;4819;4482;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Lib>
|
<Lib>
|
||||||
@@ -122,6 +123,7 @@
|
|||||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<OpenMPSupport>true</OpenMPSupport>
|
<OpenMPSupport>true</OpenMPSupport>
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
||||||
|
<DisableSpecificWarnings>4996;4819;4482;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Lib>
|
<Lib>
|
||||||
<OutputFile>$(OutDir)CharacterActionControl.lib</OutputFile>
|
<OutputFile>$(OutDir)CharacterActionControl.lib</OutputFile>
|
||||||
|
|||||||
@@ -105,6 +105,7 @@
|
|||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||||
|
<DisableSpecificWarnings>4996;4819;4482;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Lib>
|
<Lib>
|
||||||
@@ -122,6 +123,7 @@
|
|||||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<OpenMPSupport>true</OpenMPSupport>
|
<OpenMPSupport>true</OpenMPSupport>
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
||||||
|
<DisableSpecificWarnings>4996;4819;4482;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Lib>
|
<Lib>
|
||||||
<OutputFile>$(OutDir)GlobalScript.lib</OutputFile>
|
<OutputFile>$(OutDir)GlobalScript.lib</OutputFile>
|
||||||
|
|||||||
@@ -301,7 +301,7 @@ namespace Item
|
|||||||
|
|
||||||
namespace GiveItem
|
namespace GiveItem
|
||||||
{
|
{
|
||||||
enum ExceptionUID
|
enum ExceptionUID : unsigned __int64
|
||||||
{
|
{
|
||||||
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>ӽ<EFBFBD> <20>κ<EFBFBD><CEBA>丮<EFBFBD><E4B8AE> <20><><EFBFBD><EFBFBD> <20><><EFBFBD>¶<EFBFBD><C2B6><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ѵ<EFBFBD>. <20><> <20><>, <20><><EFBFBD><EFBFBD><EFBFBD>Ǵ<EFBFBD> <20><><EFBFBD><EFBFBD> UID
|
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>ӽ<EFBFBD> <20>κ<EFBFBD><CEBA>丮<EFBFBD><E4B8AE> <20><><EFBFBD><EFBFBD> <20><><EFBFBD>¶<EFBFBD><C2B6><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ѵ<EFBFBD>. <20><> <20><>, <20><><EFBFBD><EFBFBD><EFBFBD>Ǵ<EFBFBD> <20><><EFBFBD><EFBFBD> UID
|
||||||
PENDING_ITEM_UID = 0xFFFFFFFFFFFFFFFF
|
PENDING_ITEM_UID = 0xFFFFFFFFFFFFFFFF
|
||||||
|
|||||||
@@ -113,6 +113,7 @@
|
|||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||||
|
<DisableSpecificWarnings>4996;4819;4482;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||||
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
|
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
|
||||||
<RuntimeTypeInfo>true</RuntimeTypeInfo>
|
<RuntimeTypeInfo>true</RuntimeTypeInfo>
|
||||||
@@ -122,7 +123,7 @@
|
|||||||
<AdditionalDependencies>ws2_32.lib;dsound.lib;eaxguid.lib;d3d8.lib;d3dx8.lib;dxguid.lib;dinput8.lib;shlwapi.lib;ole32.lib;wbemuuid.lib;winmm.lib;dxerr8.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;ijl15.lib;imm32.lib;../../Engine/SoundLib/vorbis_sdk/lib/ogg_static_d.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbis_static_d.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbisfile_static_d.lib;luad.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>ws2_32.lib;dsound.lib;eaxguid.lib;d3d8.lib;d3dx8.lib;dxguid.lib;dinput8.lib;shlwapi.lib;ole32.lib;wbemuuid.lib;winmm.lib;dxerr8.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;ijl15.lib;imm32.lib;../../Engine/SoundLib/vorbis_sdk/lib/ogg_static_d.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbis_static_d.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbisfile_static_d.lib;luad.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
<OutputFile>$(OutDir)Client.exe</OutputFile>
|
<OutputFile>$(OutDir)Client.exe</OutputFile>
|
||||||
<AdditionalLibraryDirectories>../../Engine/SoundLib/vorbis_sdk/lib;../../Library/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>../../Engine/SoundLib/vorbis_sdk/lib;../../Library/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
<IgnoreSpecificDefaultLibraries>LIBC;LIBCD;MSVCRT;MSVCRTD;LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<ProgramDatabaseFile>$(OutDir)Client.pdb</ProgramDatabaseFile>
|
<ProgramDatabaseFile>$(OutDir)Client.pdb</ProgramDatabaseFile>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
@@ -150,6 +151,7 @@
|
|||||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
||||||
<OpenMPSupport>true</OpenMPSupport>
|
<OpenMPSupport>true</OpenMPSupport>
|
||||||
|
<DisableSpecificWarnings>4996;4819;4482;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>ws2_32.lib;dsound.lib;eaxguid.lib;d3d8.lib;d3dx8.lib;dxguid.lib;dinput8.lib;shlwapi.lib;ole32.lib;wbemuuid.lib;winmm.lib;dxerr8.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;ijl15.lib;imm32.lib;lua.lib;../../Engine/SoundLib/vorbis_sdk/lib/ogg_static.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbis_static.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbisfile_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>ws2_32.lib;dsound.lib;eaxguid.lib;d3d8.lib;d3dx8.lib;dxguid.lib;dinput8.lib;shlwapi.lib;ole32.lib;wbemuuid.lib;winmm.lib;dxerr8.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;ijl15.lib;imm32.lib;lua.lib;../../Engine/SoundLib/vorbis_sdk/lib/ogg_static.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbis_static.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbisfile_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
@@ -162,6 +164,7 @@
|
|||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
<TargetMachine>MachineX86</TargetMachine>
|
||||||
<ManifestFile>Client.exe.manifest</ManifestFile>
|
<ManifestFile>Client.exe.manifest</ManifestFile>
|
||||||
|
<IgnoreSpecificDefaultLibraries>LIBC;LIBCD;MSVCRT;MSVCRTD;LIBCMTD;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||||
</Link>
|
</Link>
|
||||||
<ResourceCompile>
|
<ResourceCompile>
|
||||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
|||||||
@@ -105,6 +105,7 @@
|
|||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||||
|
<DisableSpecificWarnings>4996;4819;4482;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Lib>
|
<Lib>
|
||||||
@@ -122,6 +123,7 @@
|
|||||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
||||||
<OpenMPSupport>true</OpenMPSupport>
|
<OpenMPSupport>true</OpenMPSupport>
|
||||||
|
<DisableSpecificWarnings>4996;4819;4482;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Lib>
|
<Lib>
|
||||||
<OutputFile>$(OutDir)ScriptEngine.lib</OutputFile>
|
<OutputFile>$(OutDir)ScriptEngine.lib</OutputFile>
|
||||||
|
|||||||
@@ -1,56 +0,0 @@
|
|||||||
# Fix Runtime Library Settings for All Projects
|
|
||||||
# Changes all Debug configurations to /MDd (MultiThreadedDebugDLL)
|
|
||||||
# Changes all Release configurations to /MD (MultiThreadedDLL)
|
|
||||||
|
|
||||||
Write-Host "========================================" -ForegroundColor Cyan
|
|
||||||
Write-Host "Runtime Library Fix Script" -ForegroundColor Cyan
|
|
||||||
Write-Host "========================================`n" -ForegroundColor Cyan
|
|
||||||
|
|
||||||
$projectFiles = Get-ChildItem -Recurse -Filter "*.vcxproj" | Where-Object {
|
|
||||||
$_.Name -notlike "*LUA.vcxproj" # LUA project may need different settings
|
|
||||||
}
|
|
||||||
|
|
||||||
$totalFiles = $projectFiles.Count
|
|
||||||
$currentFile = 0
|
|
||||||
|
|
||||||
Write-Host "Found $totalFiles project files to process`n" -ForegroundColor Green
|
|
||||||
|
|
||||||
foreach ($file in $projectFiles) {
|
|
||||||
$currentFile++
|
|
||||||
Write-Host "[$currentFile/$totalFiles] Processing: $($file.Name)" -ForegroundColor Yellow
|
|
||||||
|
|
||||||
$content = Get-Content $file.FullName -Raw -Encoding UTF8
|
|
||||||
$originalContent = $content
|
|
||||||
|
|
||||||
# Debug configurations: Change to MultiThreadedDebugDLL (/MDd)
|
|
||||||
$content = $content -replace '<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>', '<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>'
|
|
||||||
|
|
||||||
# Release configurations: Change to MultiThreadedDLL (/MD)
|
|
||||||
$content = $content -replace '<RuntimeLibrary>MultiThreaded</RuntimeLibrary>', '<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>'
|
|
||||||
|
|
||||||
if ($content -ne $originalContent) {
|
|
||||||
# Backup original file
|
|
||||||
$backupPath = $file.FullName + ".bak"
|
|
||||||
Copy-Item $file.FullName $backupPath -Force
|
|
||||||
|
|
||||||
# Save modified content
|
|
||||||
[System.IO.File]::WriteAllText($file.FullName, $content, [System.Text.Encoding]::UTF8)
|
|
||||||
Write-Host " -> Modified (backup saved as $($file.Name).bak)" -ForegroundColor Green
|
|
||||||
} else {
|
|
||||||
Write-Host " -> No changes needed" -ForegroundColor Gray
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Write-Host "`n========================================" -ForegroundColor Cyan
|
|
||||||
Write-Host "Summary" -ForegroundColor Cyan
|
|
||||||
Write-Host "========================================" -ForegroundColor Cyan
|
|
||||||
Write-Host "Processed $totalFiles project files" -ForegroundColor Green
|
|
||||||
Write-Host "`nAll Debug configurations -> /MDd (MultiThreadedDebugDLL)" -ForegroundColor Green
|
|
||||||
Write-Host "All Release configurations -> /MD (MultiThreadedDLL)" -ForegroundColor Green
|
|
||||||
Write-Host "`nBackup files created with .bak extension" -ForegroundColor Yellow
|
|
||||||
Write-Host "`nNext steps:" -ForegroundColor Cyan
|
|
||||||
Write-Host "1. Close Visual Studio if it's open" -ForegroundColor White
|
|
||||||
Write-Host "2. Run: Clean solution (delete Intermediate/ folder)" -ForegroundColor White
|
|
||||||
Write-Host "3. Rebuild solution" -ForegroundColor White
|
|
||||||
Write-Host "`nPress any key to exit..." -ForegroundColor Gray
|
|
||||||
$null = $Host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
|
|
||||||
@@ -66,6 +66,12 @@
|
|||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<PropertyGroup Label="UserMacros" />
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TrackFileAccess>false</TrackFileAccess>
|
||||||
|
<CLToolExe>cl.exe</CLToolExe>
|
||||||
|
<CLToolPath>C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin</CLToolPath>
|
||||||
|
<ExecutablePath>C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;$(ExecutablePath)</ExecutablePath>
|
||||||
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
|
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
|
||||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../Library/$(Configuration)\</OutDir>
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../Library/$(Configuration)\</OutDir>
|
||||||
@@ -93,7 +99,6 @@
|
|||||||
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
|
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
|
||||||
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
|
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
|
||||||
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
|
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
|
||||||
<ExecutablePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ExecutablePath>$(ExecutablePath)</ExecutablePath>
|
<ExecutablePath>$(VCInstallDir)bin;$(WindowsSdkDir)bin;$(VSInstallDir)Common7\Tools;$(VSInstallDir)Common7\IDE;$(ExecutablePath)</ExecutablePath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<IncludePath>$(IncludePath);D:\RowProjeckt\Client\Library\dxx8\include</IncludePath>
|
<IncludePath>$(IncludePath);D:\RowProjeckt\Client\Library\dxx8\include</IncludePath>
|
||||||
|
|||||||
Reference in New Issue
Block a user