diff --git a/Community.CsharpSqlite/Community.CsharpSqlite.csproj b/Community.CsharpSqlite/Community.CsharpSqlite.csproj index 4cacb580c..2f946a68a 100644 --- a/Community.CsharpSqlite/Community.CsharpSqlite.csproj +++ b/Community.CsharpSqlite/Community.CsharpSqlite.csproj @@ -61,7 +61,7 @@ bin\x86\Debug\ DEBUG;SQLITE_DEBUG TRUE WIN32 _MSC_VER NO_TCL SQLITE_ASCII SQLITE_DISABLE_LFS SQLITE_HAS_CODEC SQLITE_MEM_POOL SQLITE_MUTEX_W32 SQLITE_THREADSAFE SQLITE_OMIT_AUTHORIZATION SQLITE_OMIT_DEPRECATED SQLITE_OMIT_GET_TABLE SQLITE_OMIT_INCRBLOB SQLITE_OMIT_LOOKASIDE SQLITE_OMIT_SHARED_CACHE SQLITE_OMIT_UTF16 SQLITE_OMIT_WAL SQLITE_OS_WIN SQLITE_SYSTEM_MALLOC VDBE_PROFILE_OFF full - x86 + AnyCPU prompt AllRules.ruleset 4 diff --git a/Launcher/Launcher.csproj b/Launcher/Launcher.csproj index 56dcbe3b1..b6584e423 100644 --- a/Launcher/Launcher.csproj +++ b/Launcher/Launcher.csproj @@ -29,8 +29,8 @@ prompt 4 True - x86 - false + AnyCPU + true pdbonly diff --git a/MatterControl.OpenGL/MatterControl.OpenGL.csproj b/MatterControl.OpenGL/MatterControl.OpenGL.csproj index 182a1910f..dd29ffa91 100644 --- a/MatterControl.OpenGL/MatterControl.OpenGL.csproj +++ b/MatterControl.OpenGL/MatterControl.OpenGL.csproj @@ -21,7 +21,7 @@ prompt 4 true - x86 + AnyCPU pdbonly diff --git a/MatterControl.Printing/MatterControl.Printing.csproj b/MatterControl.Printing/MatterControl.Printing.csproj index 4f2beb013..1a6e69deb 100644 --- a/MatterControl.Printing/MatterControl.Printing.csproj +++ b/MatterControl.Printing/MatterControl.Printing.csproj @@ -20,7 +20,7 @@ DEBUG;TRACE prompt 4 - x86 + AnyCPU pdbonly diff --git a/MatterControl.csproj b/MatterControl.csproj index 0e895133b..f982fad18 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -51,9 +51,9 @@ TRACE;DEBUG;USE_OPENGL;IS_WINDOWS;IS_WINDOWS_FORMS prompt 4 - x86 + AnyCPU SHOW_MEMORY - false + true none @@ -653,4 +653,8 @@ QuadTree + + + + \ No newline at end of file diff --git a/PluginSystem/MatterControlPluginSystem.csproj b/PluginSystem/MatterControlPluginSystem.csproj index 4c136e432..5d1a4a8ac 100644 --- a/PluginSystem/MatterControlPluginSystem.csproj +++ b/PluginSystem/MatterControlPluginSystem.csproj @@ -28,7 +28,7 @@ prompt 4 True - x86 + AnyCPU false @@ -153,4 +153,4 @@ - + \ No newline at end of file diff --git a/PrinterDriverInstaller/InfInstaller.csproj b/PrinterDriverInstaller/InfInstaller.csproj index 5bba1e400..9fa4f8c54 100644 --- a/PrinterDriverInstaller/InfInstaller.csproj +++ b/PrinterDriverInstaller/InfInstaller.csproj @@ -29,8 +29,8 @@ prompt 4 True - x86 - false + AnyCPU + true pdbonly diff --git a/PrinterEmulator/PrinterEmulator.csproj b/PrinterEmulator/PrinterEmulator.csproj index 0ece4adf1..8bd2a5dac 100644 --- a/PrinterEmulator/PrinterEmulator.csproj +++ b/PrinterEmulator/PrinterEmulator.csproj @@ -30,7 +30,7 @@ true - x86 + AnyCPU true full false diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index 7f5f7e069..f56f628a3 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit 7f5f7e0693b3831832266c343b7982b058a64efa +Subproject commit f56f628a3d139937ce3251ffa4e317c82d225b42 diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index f0dbc7ece..452813b6e 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit f0dbc7ece8f2f3e3fb89723a37ecb3ef8d91ddd8 +Subproject commit 452813b6e4ea80f526a86e3fca5ff999e92e84a1 diff --git a/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj b/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj index 0867846cb..e19b57ba2 100644 --- a/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj +++ b/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj @@ -21,7 +21,7 @@ DEBUG;TRACE prompt 4 - x86 + AnyCPU pdbonly diff --git a/Tests/MatterControl.Tests/MatterControl.Tests.csproj b/Tests/MatterControl.Tests/MatterControl.Tests.csproj index 1865c1dbd..4d0b68577 100644 --- a/Tests/MatterControl.Tests/MatterControl.Tests.csproj +++ b/Tests/MatterControl.Tests/MatterControl.Tests.csproj @@ -25,7 +25,7 @@ DEBUG;TRACE prompt 4 - x86 + AnyCPU pdbonly diff --git a/TextCreator/TextCreator.csproj b/TextCreator/TextCreator.csproj index c08a0cab9..a5760ca82 100644 --- a/TextCreator/TextCreator.csproj +++ b/TextCreator/TextCreator.csproj @@ -27,7 +27,7 @@ prompt 4 True - x86 + AnyCPU false