Skip to content

M
magicseteditor
Commit 0f9169b8 authored by twanvl's avatar twanvl
Browse files
Options

Hopefully solved the <P4 crashes of the unicode build

parent ce2a4b57
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 8 deletions
src/mse.sln
View file @ 0f9169b8
...@@ -25,6 +25,7 @@ Global ...@@ -25,6 +25,7 @@ Global
{A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Profile Unicode.ActiveCfg = Release Profile Unicode|Win32 {A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Profile Unicode.ActiveCfg = Release Profile Unicode|Win32
{A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Profile Unicode.Build.0 = Release Profile Unicode|Win32 {A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Profile Unicode.Build.0 = Release Profile Unicode|Win32
{A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Unicode.ActiveCfg = Release Unicode|Win32 {A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Unicode.ActiveCfg = Release Unicode|Win32
{A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Unicode.Build.0 = Release Unicode|Win32
{A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Unicode fast build.ActiveCfg = Release Unicode fast build|Win32 {A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Unicode fast build.ActiveCfg = Release Unicode fast build|Win32
{A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Unicode fast build.Build.0 = Release Unicode fast build|Win32 {A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Unicode fast build.Build.0 = Release Unicode fast build|Win32
EndGlobalSection EndGlobalSection
......
src/mse.vcproj
View file @ 0f9169b8
...@@ -87,8 +87,8 @@ ...@@ -87,8 +87,8 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
GlobalOptimizations="TRUE" GlobalOptimizations="TRUE"
InlineFunctionExpansion="1" InlineFunctionExpansion="0"
ImproveFloatingPointConsistency="TRUE" ImproveFloatingPointConsistency="FALSE"
OmitFramePointers="TRUE" OmitFramePointers="TRUE"
OptimizeForProcessor="0" OptimizeForProcessor="0"
OptimizeForWindowsApplication="TRUE" OptimizeForWindowsApplication="TRUE"
...@@ -226,11 +226,12 @@ ...@@ -226,11 +226,12 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="3" Optimization="3"
GlobalOptimizations="TRUE" GlobalOptimizations="TRUE"
InlineFunctionExpansion="1" InlineFunctionExpansion="0"
ImproveFloatingPointConsistency="TRUE" EnableIntrinsicFunctions="TRUE"
FavorSizeOrSpeed="1" ImproveFloatingPointConsistency="FALSE"
FavorSizeOrSpeed="0"
OmitFramePointers="TRUE" OmitFramePointers="TRUE"
OptimizeForProcessor="3" OptimizeForProcessor="2"
OptimizeForWindowsApplication="TRUE" OptimizeForWindowsApplication="TRUE"
AdditionalIncludeDirectories=".; &quot;$(WX_PATH)/include&quot;; &quot;$(WX_PATH)\lib\vc_lib\mswu&quot;" AdditionalIncludeDirectories=".; &quot;$(WX_PATH)/include&quot;; &quot;$(WX_PATH)\lib\vc_lib\mswu&quot;"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;UNICODE;_UNICODE;wxUSE_UNICODE" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;UNICODE;_UNICODE;wxUSE_UNICODE"
...@@ -379,8 +380,8 @@ ...@@ -379,8 +380,8 @@
Optimization="3" Optimization="3"
GlobalOptimizations="TRUE" GlobalOptimizations="TRUE"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
ImproveFloatingPointConsistency="TRUE" ImproveFloatingPointConsistency="FALSE"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="2"
OmitFramePointers="TRUE" OmitFramePointers="TRUE"
OptimizeForProcessor="3" OptimizeForProcessor="3"
OptimizeForWindowsApplication="TRUE" OptimizeForWindowsApplication="TRUE"
...@@ -2366,6 +2367,12 @@ ...@@ -2366,6 +2367,12 @@
</File> </File>
<File <File
RelativePath=".\gfx\blend_image.cpp"> RelativePath=".\gfx\blend_image.cpp">
<FileConfiguration
Name="Release Unicode|Win32">
<Tool
Name="VCCLCompilerTool"
FavorSizeOrSpeed="1"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\gfx\color.cpp"> RelativePath=".\gfx\color.cpp">
...@@ -2427,6 +2434,7 @@ ...@@ -2427,6 +2434,7 @@
Name="Release Unicode|Win32"> Name="Release Unicode|Win32">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
FavorSizeOrSpeed="1"
ObjectFile="$(IntDir)/$(InputName)1.obj"/> ObjectFile="$(IntDir)/$(InputName)1.obj"/>
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
...@@ -2453,9 +2461,21 @@ ...@@ -2453,9 +2461,21 @@
</File> </File>
<File <File
RelativePath=".\gfx\image_effects.cpp"> RelativePath=".\gfx\image_effects.cpp">
<FileConfiguration
Name="Release Unicode|Win32">
<Tool
Name="VCCLCompilerTool"
FavorSizeOrSpeed="1"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\gfx\mask_image.cpp"> RelativePath=".\gfx\mask_image.cpp">
<FileConfiguration
Name="Release Unicode|Win32">
<Tool
Name="VCCLCompilerTool"
FavorSizeOrSpeed="1"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\gfx\polynomial.cpp"> RelativePath=".\gfx\polynomial.cpp">
...@@ -2465,6 +2485,12 @@ ...@@ -2465,6 +2485,12 @@
</File> </File>
<File <File
RelativePath=".\gfx\resample_image.cpp"> RelativePath=".\gfx\resample_image.cpp">
<FileConfiguration
Name="Release Unicode|Win32">
<Tool
Name="VCCLCompilerTool"
FavorSizeOrSpeed="1"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\gfx\resample_text.cpp"> RelativePath=".\gfx\resample_text.cpp">
...@@ -2478,6 +2504,7 @@ ...@@ -2478,6 +2504,7 @@
Name="Release Unicode|Win32"> Name="Release Unicode|Win32">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
FavorSizeOrSpeed="1"
ObjectFile="$(IntDir)/$(InputName)1.obj"/> ObjectFile="$(IntDir)/$(InputName)1.obj"/>
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
...@@ -2505,6 +2532,7 @@ ...@@ -2505,6 +2532,7 @@
Name="Release Unicode|Win32"> Name="Release Unicode|Win32">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
FavorSizeOrSpeed="1"
ObjectFile="$(IntDir)/$(InputName)1.obj"/> ObjectFile="$(IntDir)/$(InputName)1.obj"/>
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
...@@ -2660,6 +2688,12 @@ ...@@ -2660,6 +2688,12 @@
Filter=""> Filter="">
<File <File
RelativePath=".\script\context.cpp"> RelativePath=".\script\context.cpp">
<FileConfiguration
Name="Release Unicode|Win32">
<Tool
Name="VCCLCompilerTool"
FavorSizeOrSpeed="1"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\script\context.hpp"> RelativePath=".\script\context.hpp">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment