Reorganise code to use Kinc on Windows and Switch

.gitignore

@@ -67,14 +67,18 @@ build/visualstudio/*.log
 build/visualstudio/*.XGD
 # Emscripten cruft
 a.out*
-doc/samples/*.html
-doc/samples/*.wasm
-doc/samples/*.wasm.*
-doc/samples/*.js
-doc/samples/*/*.html
-doc/samples/*/*.wasm
-doc/samples/*/*.wasm.*
-doc/samples/*/*.js
+doc/examples/*.html
+doc/examples/*.wasm
+doc/examples/*.wasm.*
+doc/examples/*.js
+doc/legacy/*.html
+doc/legacy/*.wasm
+doc/legacy/*.wasm.*
+doc/legacy/*.js
+doc/legacy/*/*.html
+doc/legacy/*/*.wasm
+doc/legacy/*/*.wasm.*
+doc/legacy/*/*.js
 doc/tutorial/*.html
 doc/tutorial/*.wasm
 doc/tutorial/*.wasm.*
@@ -98,13 +102,13 @@ _ReSharper.*
 src/private
 # Our binaries
 demos/lol.js/lol.js
-doc/samples/benchsuite
-doc/samples/bluenoise
-doc/samples/btphystest
-doc/samples/sandbox/sample
-doc/samples/math/pi
-doc/samples/math/poly
-doc/samples/simplex
+doc/legacy/benchsuite
+doc/legacy/bluenoise
+doc/legacy/btphystest
+doc/legacy/sandbox/sample
+doc/legacy/math/pi
+doc/legacy/math/poly
+doc/legacy/simplex
 doc/tutorial/01_triangle
 doc/tutorial/02_cube
 doc/tutorial/03_noise

build.config

@@ -5,8 +5,14 @@
     <!-- yes/no values -->
     <enable_bullet>yes</enable_bullet>
     <enable_ffmpeg>yes</enable_ffmpeg>
-    <enable_gl>yes</enable_gl>
-    <enable_sdl>yes</enable_sdl>
+
+    <enable_gl Condition="'$(KINC_SDK_PATH)'==''">yes</enable_gl>
+    <enable_gl Condition="'$(KINC_SDK_PATH)'!=''">no</enable_gl>
+    <enable_sdl Condition="'$(KINC_SDK_PATH)'==''">yes</enable_sdl>
+    <enable_sdl Condition="'$(KINC_SDK_PATH)'!=''">no</enable_sdl>
+
+    <enable_kinc Condition="'$(KINC_SDK_PATH)'!=''">yes</enable_kinc>
+
     <enable_imlib2>yes</enable_imlib2>
     <!-- not available yet -->
     <enable_png>no</enable_png>

build/msbuild/lol-core.props

@@ -7,4 +7,28 @@
     </ProjectReference>
   </ItemGroup>
 
+  <ItemGroup Condition="'$(enable_kinc)'!='no'">
+    <ClCompile Include="$(KINC_SDK_PATH)/Sources/kinc/*.c" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Sources/kinc/*/*.c" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(enable_kinc)'!='no' And '$(Platform)'=='x64'">
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/Audio2/WASAPI/Sources/kinc/backend/*.c" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/Graphics4/Direct3D11/Sources/kinc/backend/*/*.c" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/Graphics5/G5onG4/Sources/kinc/backend/*/*.c" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/System/Microsoft/Sources/kinc/backend/*.c" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/System/Windows/Libraries/DirectShow/BaseClasses/*.cpp" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/System/Windows/Sources/kinc/backend/*.c" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/System/Windows/Sources/kinc/backend/*.cpp" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/System/Windows/Sources/kinc/backend/*/*.c" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/System/Windows/Sources/kinc/backend/*/*.cpp" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(enable_kinc)'!='no' And '$(Platform)'=='NX64'">
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/Graphics4/G4onG5/Sources/kinc/backend/*/*.c" />
+    <ClCompile Include="$(KINC_SDK_PATH)/../Backends/Switch/Sources/kinc/backend/*.cpp" />
+    <ClCompile Include="$(KINC_SDK_PATH)/../Backends/Switch/Sources/kinc/backend/*.c" />
+    <ClCompile Include="$(KINC_SDK_PATH)/../Backends/Switch/Sources/kinc/backend/*/*.cpp" />
+  </ItemGroup>
+
 </Project>

build/msbuild/lol-kinc.vars.props

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+
+  <PropertyGroup Label="UserMacros">
+    <KincIncludes>
+      $(KINC_SDK_PATH)\Sources
+    </KincIncludes>
+    <KincDefines>
+      LOL_USE_KINC;
+      KORE_G1;
+      KORE_G2;
+      KORE_G3;
+      KORE_A1;
+      KORE_A2;
+      KORE_LZ4X;
+      KORE_G4;
+      KORE_G5;
+    </KincDefines>
+  </PropertyGroup>
+
+  <PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">
+    <KincIncludes>
+      $(KincIncludes);
+      $(KINC_SDK_PATH)\Backends\System\Windows\Sources;
+      $(KINC_SDK_PATH)\Backends\System\Microsoft\Sources;
+      $(KINC_SDK_PATH)\Backends\System\Windows\Libraries\DirectShow\BaseClasses;
+      $(KINC_SDK_PATH)\Backends\Graphics4\Direct3D11\Sources;
+      $(KINC_SDK_PATH)\Backends\Audio2\WASAPI\Sources;
+      $(KINC_SDK_PATH)\Backends\Graphics5\G5onG4\Sources;
+    </KincIncludes>
+    <KincDefines>
+      $(KincDefines);
+      KORE_DIRECT3D;
+      KORE_DIRECT3D11;
+      KORE_G5ONG4;
+      KINC_NO_MAIN;
+    </KincDefines>
+    <KincDeps>
+      winhttp.lib;
+      d3d11.lib;
+      dxguid.lib;
+      dinput8.lib;
+      strmiids.lib;
+      winmm.lib;
+      wbemuuid.lib;
+    </KincDeps>
+  </PropertyGroup>
+
+  <PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='NX32' Or '$(Platform)'=='NX64'">
+    <KincIncludes>
+      $(KincIncludes);
+      $(KINC_SDK_PATH)\Backends\Graphics4\G4onG5\Sources;
+      $(KINC_SDK_PATH)\..\Backends\Switch\Sources;
+    </KincIncludes>
+    <KincDefines>
+      $(KincDefines);
+      KORE_G4ONG5;
+      KORE_SWITCH;
+      KORE_CONSOLE;
+    </KincDefines>
+    <KincDeps>
+      libnn_profiler.a;
+    </KincDeps>
+  </PropertyGroup>
+
+  <ItemGroup Label="UserMacros">
+    <BuildMacro Include="KincDeps"><Value>$(KincDeps)</Value></BuildMacro>
+    <BuildMacro Include="KincLibs"><Value>$(KincLibs)</Value></BuildMacro>
+    <BuildMacro Include="KincDefines"><Value>$(KincDefines)</Value></BuildMacro>
+    <BuildMacro Include="KincIncludes"><Value>$(KincIncludes)</Value></BuildMacro>
+  </ItemGroup>
+
+</Project>

build/msbuild/lol.rules.props

@@ -28,6 +28,7 @@
       <AdditionalIncludeDirectories>
           $(LolDir)\lol\include;
           $(LolDir)\src\include;
+          $(KincIncludes);
           $(PegtlIncludes);
           $(ImguiIncludes);
           $(BtPhysIncludes);
@@ -45,6 +46,7 @@
       </AdditionalIncludeDirectories>
 
       <AdditionalPreprocessorDefinitions>
+          $(KincDefines);
           NOMINMAX;
           _CRT_SECURE_NO_WARNINGS;
           B3_USE_CLEW;
@@ -83,7 +85,7 @@
 
     <Link Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">
       <!-- FIXME: not for the static library! -->
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(SdlDeps);$(FfmpegDeps);$(AssimpDeps);$(LibGccDeps);$(GdiDeps);$(XinputDeps);$(GlDeps);$(CppHttpDeps);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(SdlDeps);$(KincDeps);$(FfmpegDeps);$(AssimpDeps);$(LibGccDeps);$(GdiDeps);$(XinputDeps);$(GlDeps);$(CppHttpDeps);%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(LibGccLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalLibraryDirectories>$(SdlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalLibraryDirectories>$(CppHttpLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

build/msbuild/lol.vars.props

@@ -91,6 +91,9 @@
     <Win32Defines>LOL_USE_SDL_MIXER;LOL_USE_SDL_IMAGE;$(Win32Defines)</Win32Defines>
   </PropertyGroup>
 
+  <!-- Kinc -->
+  <Import Condition="'$(enable_kinc)'!='no'" Project="lol-kinc.vars.props" />
+
   <!-- FFmpeg -->
   <PropertyGroup Condition="'$(enable_ffmpeg)'!='no'" Label="UserMacros">
     <FfmpegDir>$(ExternalDir)\ffmpeg-20190130</FfmpegDir>

configure.ac

@@ -96,8 +96,10 @@ AC_ARG_ENABLE(tools,
   [  --enable-tools          build miscellaneous tools (default yes)])
 AC_ARG_ENABLE(tutorial,
   [  --enable-tutorial       build tutorial applications (default yes)])
-AC_ARG_ENABLE(samples,
-  [  --enable-samples        build sample applications (default yes)])
+AC_ARG_ENABLE(examples,
+  [  --enable-examples       build example applications (default yes)])
+AC_ARG_ENABLE(legacy,
+  [  --enable-legacy         build legacy sample applications (default yes)])
 AC_ARG_ENABLE(doc,
   [  --enable-doc            build documentation (needs doxygen and LaTeX)])
 
@@ -254,7 +256,8 @@ dnl  Optional features
 AM_CONDITIONAL(BUILD_TEST, test "${enable_test}" != "no" -a "${enable_subproject}" != "yes")
 AM_CONDITIONAL(BUILD_TOOLS, test "${enable_tools}" != "no" -a "${enable_subproject}" != "yes")
 AM_CONDITIONAL(BUILD_TUTORIAL, test "${enable_tutorial}" != "no" -a "${enable_subproject}" != "yes")
-AM_CONDITIONAL(BUILD_SAMPLES, test "${enable_samples}" != "no" -a "${enable_subproject}" != "yes")
+AM_CONDITIONAL(BUILD_EXAMPLES, test "${enable_examples}" != "no" -a "${enable_subproject}" != "yes")
+AM_CONDITIONAL(BUILD_LEGACY, test "${enable_legacy}" != "no" -a "${enable_subproject}" != "yes")
 
 
 LOL_AC_FINI()
@@ -272,9 +275,10 @@ AC_CONFIG_FILES(
   binaries/Makefile
   doc/Makefile
   doc/doxygen.cfg
-  doc/samples/Makefile
-  doc/samples/math/Makefile
-  doc/samples/sandbox/Makefile
+  doc/examples/Makefile
+  doc/legacy/Makefile
+  doc/legacy/math/Makefile
+  doc/legacy/sandbox/Makefile
   doc/tutorial/Makefile
   tools/Makefile
   tools/vimlol/Makefile

doc/Makefile.am

@@ -2,7 +2,8 @@ include $(top_srcdir)/build/autotools/common.am
 
 SUBDIRS =
 SUBDIRS += tutorial
-SUBDIRS += samples
+SUBDIRS += examples
+SUBDIRS += legacy
 
 EXTRA_DIST += doxygen.cfg.in doxygen.css footer.html header.html \
               $(man_MANS) $(doxygen_DOX)

doc/examples/Makefile.am

@@ -0,0 +1,12 @@
+
+include $(top_srcdir)/build/autotools/common.am
+
+if BUILD_EXAMPLES
+noinst_PROGRAMS = $(examples)
+endif
+
+examples = window
+
+window_SOURCES = window.cpp
+window_CPPFLAGS = $(AM_CPPFLAGS)
+window_LDFLAGS = @LOL_DEPS@

doc/examples/window.cpp

@@ -0,0 +1,24 @@
+//
+//  Lol Engine — Window example
+//
+//  Copyright © 2012–2024 Sam Hocevar <sam@hocevar.net>
+//
+//  Lol Engine is free software. It comes without any warranty, to
+//  the extent permitted by applicable law. You can redistribute it
+//  and/or modify it under the terms of the Do What the Fuck You Want
+//  to Public License, Version 2, as published by the WTFPL Task Force.
+//  See http://www.wtfpl.net/ for more details.
+//
+
+#if HAVE_CONFIG_H
+#   include "config.h"
+#endif
+
+#include <lol/engine/sys>
+
+int main(int argc, char **argv)
+{
+    lol::sys::init(argc, argv, "window", 640, 480);
+    lol::sys::run();
+    return EXIT_SUCCESS;
+}

doc/examples/window.vcxproj

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="LolMacros">
+    <LolDir>$(SolutionDir)</LolDir>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|NX64">
+      <Configuration>Debug</Configuration>
+      <Platform>NX64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ORBIS">
+      <Configuration>Debug</Configuration>
+      <Platform>ORBIS</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|NX64">
+      <Configuration>Release</Configuration>
+      <Platform>NX64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ORBIS">
+      <Configuration>Release</Configuration>
+      <Platform>ORBIS</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="window.cpp" />
+  </ItemGroup>
+  <Import Project="$(LolDir)\build\msbuild\lol-core.props" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C57C9F9F-8EAE-4265-A210-B0CAA717A3A0}</ProjectGuid>
+    <ConfigurationType>Application</ConfigurationType>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(LolDir)\build\msbuild\lol.config.props" />
+  <ImportGroup Label="ExtensionSettings">
+    <Import Project="$(LolDir)\build\msbuild\lolfx.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(LolDir)\build\msbuild\lol.vars.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <Import Project="$(LolDir)\build\msbuild\lol.rules.props" />
+  <ItemDefinitionGroup />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="$(LolDir)\build\msbuild\lolfx.targets" />
+  </ImportGroup>
+</Project>

doc/samples/Makefile.am → doc/legacy/Makefile.am

@@ -6,7 +6,7 @@ SUBDIRS = math sandbox
 bench: benchsuite$(EXEEXT)
 	./benchsuite$(EXEEXT)
 
-if BUILD_SAMPLES
+if BUILD_LEGACY
 noinst_PROGRAMS = bluenoise benchsuite simplex
 if LOL_USE_GL
 if LOL_USE_BULLET

doc/samples/math/Makefile.am → doc/legacy/math/Makefile.am

@@ -1,7 +1,7 @@
 
 include $(top_srcdir)/build/autotools/common.am
 
-if BUILD_SAMPLES
+if BUILD_LEGACY
 noinst_PROGRAMS = pi poly
 endif
 

doc/samples/sandbox/Makefile.am → doc/legacy/sandbox/Makefile.am

@@ -1,7 +1,7 @@
 
 include $(top_srcdir)/build/autotools/common.am
 
-if BUILD_SAMPLES
+if BUILD_LEGACY
 bin_PROGRAMS = sample
 endif
 

lolengine.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.329
+# Visual Studio Version 17
+VisualStudioVersion = 17.8.34511.84
 MinimumVisualStudioVersion = 15.0.26730.03
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lol-core", "src\lol-core.vcxproj", "{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}"
 EndProject
@@ -19,7 +19,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-image", "src\t\test-im
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-entity", "src\t\test-entity.vcxproj", "{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchsuite", "doc\samples\benchsuite.vcxproj", "{B1E10086-A1DA-401A-834D-969C9DBB5CC1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchsuite", "doc\legacy\benchsuite.vcxproj", "{B1E10086-A1DA-401A-834D-969C9DBB5CC1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tutorial", "Tutorial", "{E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}"
 EndProject
@@ -36,7 +36,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{1AFD58
 		msbuild\config-build.xml = msbuild\config-build.xml
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btphystest", "doc\samples\btphystest.vcxproj", "{EE203B88-44CF-4859-9D42-7A1F43FECB52}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btphystest", "doc\legacy\btphystest.vcxproj", "{EE203B88-44CF-4859-9D42-7A1F43FECB52}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "08_fbo", "doc\tutorial\08_fbo.vcxproj", "{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}"
 EndProject
@@ -54,7 +54,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{E4DFEBF9-C
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "13_shader_builder", "doc\tutorial\13_shader_builder.vcxproj", "{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{B6297FF2-63D0-41EE-BE13-EFF720C9B0FA}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Legacy", "Legacy", "{B6297FF2-63D0-41EE-BE13-EFF720C9B0FA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "15_gui", "doc\tutorial\15_gui.vcxproj", "{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}"
 EndProject
@@ -66,16 +66,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "17_net", "doc\tutorial\17_n
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "09_sound", "doc\tutorial\09_sound.vcxproj", "{51626A22-DD68-4450-9696-13B03BF7A2C5}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{4FD6944D-7D73-400F-B040-437021707A83}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "window", "doc\examples\window.vcxproj", "{C57C9F9F-8EAE-4265-A210-B0CAA717A3A0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|NX64 = Debug|NX64
 		Debug|ORBIS = Debug|ORBIS
 		Debug|Win32 = Debug|Win32
-		Debug|Win64 = Debug|Win64
+		Debug|x64 = Debug|x64
 		Release|NX64 = Release|NX64
 		Release|ORBIS = Release|ORBIS
 		Release|Win32 = Release|Win32
-		Release|Win64 = Release|Win64
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|NX64.ActiveCfg = Debug|NX64
@@ -83,375 +87,391 @@ Global
 		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|ORBIS.ActiveCfg = Debug|Win32
 		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Win32.Build.0 = Debug|Win32
-		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Win64.ActiveCfg = Debug|x64
-		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Win64.Build.0 = Debug|x64
+		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|x64.ActiveCfg = Debug|x64
+		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|x64.Build.0 = Debug|x64
 		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|NX64.ActiveCfg = Release|NX64
 		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|NX64.Build.0 = Release|NX64
 		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|ORBIS.ActiveCfg = Release|Win32
 		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Win32.ActiveCfg = Release|Win32
 		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Win32.Build.0 = Release|Win32
-		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Win64.ActiveCfg = Release|x64
-		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Win64.Build.0 = Release|x64
+		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|x64.ActiveCfg = Release|x64
+		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|x64.Build.0 = Release|x64
 		{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|NX64.ActiveCfg = Debug|NX64
 		{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|NX64.Build.0 = Debug|NX64
 		{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|ORBIS.ActiveCfg = Debug|Win32
 		{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|Win32.ActiveCfg = Debug|Win32
 		{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|Win32.Build.0 = Debug|Win32
-		{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|Win64.ActiveCfg = Debug|x64
-		{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|Win64.Build.0 = Debug|x64
+		{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|x64.ActiveCfg = Debug|x64
+		{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|x64.Build.0 = Debug|x64
 		{83D3B207-C601-4025-8F41-01DEDC354661}.Release|NX64.ActiveCfg = Release|NX64
 		{83D3B207-C601-4025-8F41-01DEDC354661}.Release|NX64.Build.0 = Release|NX64
 		{83D3B207-C601-4025-8F41-01DEDC354661}.Release|ORBIS.ActiveCfg = Release|Win32
 		{83D3B207-C601-4025-8F41-01DEDC354661}.Release|Win32.ActiveCfg = Release|Win32
 		{83D3B207-C601-4025-8F41-01DEDC354661}.Release|Win32.Build.0 = Release|Win32
-		{83D3B207-C601-4025-8F41-01DEDC354661}.Release|Win64.ActiveCfg = Release|x64
-		{83D3B207-C601-4025-8F41-01DEDC354661}.Release|Win64.Build.0 = Release|x64
+		{83D3B207-C601-4025-8F41-01DEDC354661}.Release|x64.ActiveCfg = Release|x64
+		{83D3B207-C601-4025-8F41-01DEDC354661}.Release|x64.Build.0 = Release|x64
 		{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|NX64.ActiveCfg = Debug|NX64
 		{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|NX64.Build.0 = Debug|NX64
 		{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|ORBIS.ActiveCfg = Debug|Win32
 		{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Win32.Build.0 = Debug|Win32
-		{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Win64.ActiveCfg = Debug|x64
-		{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Win64.Build.0 = Debug|x64
+		{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|x64.ActiveCfg = Debug|x64
+		{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|x64.Build.0 = Debug|x64
 		{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|NX64.ActiveCfg = Release|NX64
 		{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|NX64.Build.0 = Release|NX64
 		{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|ORBIS.ActiveCfg = Release|Win32
 		{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Win32.ActiveCfg = Release|Win32
 		{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Win32.Build.0 = Release|Win32
-		{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Win64.ActiveCfg = Release|x64
-		{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Win64.Build.0 = Release|x64
+		{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|x64.ActiveCfg = Release|x64
+		{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|x64.Build.0 = Release|x64
 		{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|NX64.ActiveCfg = Debug|NX64
 		{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|NX64.Build.0 = Debug|NX64
 		{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|ORBIS.ActiveCfg = Debug|Win32
 		{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Win32.Build.0 = Debug|Win32
-		{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Win64.ActiveCfg = Debug|x64
-		{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Win64.Build.0 = Debug|x64
+		{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|x64.ActiveCfg = Debug|x64
+		{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|x64.Build.0 = Debug|x64
 		{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|NX64.ActiveCfg = Release|NX64
 		{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|NX64.Build.0 = Release|NX64
 		{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|ORBIS.ActiveCfg = Release|Win32
 		{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Win32.ActiveCfg = Release|Win32
 		{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Win32.Build.0 = Release|Win32
-		{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Win64.ActiveCfg = Release|x64
-		{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Win64.Build.0 = Release|x64
+		{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|x64.ActiveCfg = Release|x64
+		{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|x64.Build.0 = Release|x64
 		{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|NX64.ActiveCfg = Debug|NX64
 		{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|NX64.Build.0 = Debug|NX64
 		{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|ORBIS.ActiveCfg = Debug|Win32
 		{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Win32.Build.0 = Debug|Win32
-		{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Win64.ActiveCfg = Debug|x64
-		{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Win64.Build.0 = Debug|x64
+		{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|x64.ActiveCfg = Debug|x64
+		{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|x64.Build.0 = Debug|x64
 		{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|NX64.ActiveCfg = Release|NX64
 		{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|NX64.Build.0 = Release|NX64
 		{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|ORBIS.ActiveCfg = Release|Win32
 		{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Win32.ActiveCfg = Release|Win32
 		{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Win32.Build.0 = Release|Win32
-		{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Win64.ActiveCfg = Release|x64
-		{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Win64.Build.0 = Release|x64
+		{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|x64.ActiveCfg = Release|x64
+		{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|x64.Build.0 = Release|x64
 		{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|NX64.ActiveCfg = Debug|NX64
 		{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|NX64.Build.0 = Debug|NX64
 		{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|ORBIS.ActiveCfg = Debug|Win32
 		{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Win32.Build.0 = Debug|Win32
-		{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Win64.ActiveCfg = Debug|x64
-		{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Win64.Build.0 = Debug|x64
+		{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|x64.ActiveCfg = Debug|x64
+		{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|x64.Build.0 = Debug|x64
 		{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|NX64.ActiveCfg = Release|NX64
 		{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|NX64.Build.0 = Release|NX64
 		{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|ORBIS.ActiveCfg = Release|Win32
 		{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Win32.ActiveCfg = Release|Win32
 		{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Win32.Build.0 = Release|Win32
-		{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Win64.ActiveCfg = Release|x64
-		{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Win64.Build.0 = Release|x64
+		{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|x64.ActiveCfg = Release|x64
+		{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|x64.Build.0 = Release|x64
 		{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|NX64.ActiveCfg = Debug|NX64
 		{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|NX64.Build.0 = Debug|NX64
 		{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|ORBIS.ActiveCfg = Debug|Win32
 		{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Win32.Build.0 = Debug|Win32
-		{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Win64.ActiveCfg = Debug|x64
-		{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Win64.Build.0 = Debug|x64
+		{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|x64.ActiveCfg = Debug|x64
+		{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|x64.Build.0 = Debug|x64
 		{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|NX64.ActiveCfg = Release|NX64
 		{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|NX64.Build.0 = Release|NX64
 		{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|ORBIS.ActiveCfg = Release|Win32
 		{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Win32.ActiveCfg = Release|Win32
 		{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Win32.Build.0 = Release|Win32
-		{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Win64.ActiveCfg = Release|x64
-		{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Win64.Build.0 = Release|x64
+		{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|x64.ActiveCfg = Release|x64
+		{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|x64.Build.0 = Release|x64
 		{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|NX64.ActiveCfg = Debug|NX64
 		{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|NX64.Build.0 = Debug|NX64
 		{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|ORBIS.ActiveCfg = Debug|Win32
 		{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Win32.Build.0 = Debug|Win32
-		{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Win64.ActiveCfg = Debug|x64
-		{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Win64.Build.0 = Debug|x64
+		{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|x64.ActiveCfg = Debug|x64
+		{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|x64.Build.0 = Debug|x64
 		{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|NX64.ActiveCfg = Release|NX64
 		{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|NX64.Build.0 = Release|NX64
 		{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|ORBIS.ActiveCfg = Release|Win32
 		{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Win32.ActiveCfg = Release|Win32
 		{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Win32.Build.0 = Release|Win32
-		{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Win64.ActiveCfg = Release|x64
-		{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Win64.Build.0 = Release|x64
+		{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|x64.ActiveCfg = Release|x64
+		{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|x64.Build.0 = Release|x64
 		{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|NX64.ActiveCfg = Debug|NX64
 		{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|NX64.Build.0 = Debug|NX64
 		{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|ORBIS.ActiveCfg = Debug|Win32
 		{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Win32.Build.0 = Debug|Win32
-		{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Win64.ActiveCfg = Debug|x64
-		{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Win64.Build.0 = Debug|x64
+		{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|x64.ActiveCfg = Debug|x64
+		{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|x64.Build.0 = Debug|x64
 		{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|NX64.ActiveCfg = Release|NX64
 		{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|NX64.Build.0 = Release|NX64
 		{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|ORBIS.ActiveCfg = Release|Win32
 		{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Win32.ActiveCfg = Release|Win32
 		{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Win32.Build.0 = Release|Win32
-		{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Win64.ActiveCfg = Release|x64
-		{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Win64.Build.0 = Release|x64
+		{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|x64.ActiveCfg = Release|x64
+		{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|x64.Build.0 = Release|x64
 		{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|NX64.ActiveCfg = Debug|NX64
 		{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|NX64.Build.0 = Debug|NX64
 		{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|ORBIS.ActiveCfg = Debug|Win32
 		{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Win32.Build.0 = Debug|Win32
-		{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Win64.ActiveCfg = Debug|x64
-		{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Win64.Build.0 = Debug|x64
+		{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|x64.ActiveCfg = Debug|x64
+		{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|x64.Build.0 = Debug|x64
 		{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|NX64.ActiveCfg = Release|NX64
 		{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|NX64.Build.0 = Release|NX64
 		{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|ORBIS.ActiveCfg = Release|Win32
 		{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Win32.ActiveCfg = Release|Win32
 		{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Win32.Build.0 = Release|Win32
-		{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Win64.ActiveCfg = Release|x64
-		{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Win64.Build.0 = Release|x64
+		{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|x64.ActiveCfg = Release|x64
+		{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|x64.Build.0 = Release|x64
 		{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|NX64.ActiveCfg = Debug|NX64
 		{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|NX64.Build.0 = Debug|NX64
 		{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|ORBIS.ActiveCfg = Debug|Win32
 		{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|Win32.Build.0 = Debug|Win32
-		{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|Win64.ActiveCfg = Debug|x64
-		{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|Win64.Build.0 = Debug|x64
+		{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|x64.ActiveCfg = Debug|x64
+		{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|x64.Build.0 = Debug|x64
 		{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|NX64.ActiveCfg = Release|NX64
 		{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|NX64.Build.0 = Release|NX64
 		{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|ORBIS.ActiveCfg = Release|Win32
 		{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Win32.ActiveCfg = Release|Win32
 		{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Win32.Build.0 = Release|Win32
-		{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Win64.ActiveCfg = Release|x64
-		{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Win64.Build.0 = Release|x64
+		{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|x64.ActiveCfg = Release|x64
+		{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|x64.Build.0 = Release|x64
 		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|NX64.ActiveCfg = Debug|NX64
 		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|NX64.Build.0 = Debug|NX64
 		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|ORBIS.ActiveCfg = Debug|Win32
 		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|Win32.Build.0 = Debug|Win32
-		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|Win64.ActiveCfg = Debug|x64
-		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|Win64.Build.0 = Debug|x64
+		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|x64.ActiveCfg = Debug|x64
+		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|x64.Build.0 = Debug|x64
 		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|NX64.ActiveCfg = Release|NX64
 		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|NX64.Build.0 = Release|NX64
 		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|ORBIS.ActiveCfg = Release|Win32
 		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Win32.ActiveCfg = Release|Win32
 		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Win32.Build.0 = Release|Win32
-		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Win64.ActiveCfg = Release|x64
-		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Win64.Build.0 = Release|x64
+		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|x64.ActiveCfg = Release|x64
+		{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|x64.Build.0 = Release|x64
 		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|NX64.ActiveCfg = Debug|NX64
 		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|NX64.Build.0 = Debug|NX64
 		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|ORBIS.ActiveCfg = Debug|Win32
 		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|Win32.Build.0 = Debug|Win32
-		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|Win64.ActiveCfg = Debug|x64
-		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|Win64.Build.0 = Debug|x64
+		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|x64.ActiveCfg = Debug|x64
+		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|x64.Build.0 = Debug|x64
 		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|NX64.ActiveCfg = Release|NX64
 		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|NX64.Build.0 = Release|NX64
 		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|ORBIS.ActiveCfg = Release|Win32
 		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Win32.ActiveCfg = Release|Win32
 		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Win32.Build.0 = Release|Win32
-		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Win64.ActiveCfg = Release|x64
-		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Win64.Build.0 = Release|x64
+		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|x64.ActiveCfg = Release|x64
+		{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|x64.Build.0 = Release|x64
 		{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|NX64.ActiveCfg = Debug|NX64
 		{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|NX64.Build.0 = Debug|NX64
 		{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|ORBIS.ActiveCfg = Debug|Win32
 		{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|Win32.ActiveCfg = Debug|Win32
 		{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|Win32.Build.0 = Debug|Win32
-		{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|Win64.ActiveCfg = Debug|x64
-		{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|Win64.Build.0 = Debug|x64
+		{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|x64.ActiveCfg = Debug|x64
+		{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|x64.Build.0 = Debug|x64
 		{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|NX64.ActiveCfg = Release|NX64
 		{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|NX64.Build.0 = Release|NX64
 		{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|ORBIS.ActiveCfg = Release|Win32
 		{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|Win32.ActiveCfg = Release|Win32
 		{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|Win32.Build.0 = Release|Win32
-		{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|Win64.ActiveCfg = Release|x64
-		{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|Win64.Build.0 = Release|x64
+		{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|x64.ActiveCfg = Release|x64
+		{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|x64.Build.0 = Release|x64
 		{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|NX64.ActiveCfg = Debug|NX64
 		{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|NX64.Build.0 = Debug|NX64
 		{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|ORBIS.ActiveCfg = Debug|Win32
 		{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|Win32.Build.0 = Debug|Win32
-		{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|Win64.ActiveCfg = Debug|x64
-		{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|Win64.Build.0 = Debug|x64
+		{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|x64.ActiveCfg = Debug|x64
+		{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|x64.Build.0 = Debug|x64
 		{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|NX64.ActiveCfg = Release|NX64
 		{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|NX64.Build.0 = Release|NX64
 		{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|ORBIS.ActiveCfg = Release|Win32
 		{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|Win32.ActiveCfg = Release|Win32
 		{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|Win32.Build.0 = Release|Win32
-		{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|Win64.ActiveCfg = Release|x64
-		{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|Win64.Build.0 = Release|x64
+		{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|x64.ActiveCfg = Release|x64
+		{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|x64.Build.0 = Release|x64
 		{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|NX64.ActiveCfg = Debug|NX64
 		{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|NX64.Build.0 = Debug|NX64
 		{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|ORBIS.ActiveCfg = Debug|Win32
 		{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|Win32.Build.0 = Debug|Win32
-		{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|Win64.ActiveCfg = Debug|x64
-		{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|Win64.Build.0 = Debug|x64
+		{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|x64.ActiveCfg = Debug|x64
+		{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|x64.Build.0 = Debug|x64
 		{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|NX64.ActiveCfg = Release|NX64
 		{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|NX64.Build.0 = Release|NX64
 		{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|ORBIS.ActiveCfg = Release|Win32
 		{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|Win32.ActiveCfg = Release|Win32
 		{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|Win32.Build.0 = Release|Win32
-		{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|Win64.ActiveCfg = Release|x64
-		{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|Win64.Build.0 = Release|x64
+		{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|x64.ActiveCfg = Release|x64
+		{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|x64.Build.0 = Release|x64
 		{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|NX64.ActiveCfg = Debug|NX64
 		{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|NX64.Build.0 = Debug|NX64
 		{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|ORBIS.ActiveCfg = Debug|Win32
 		{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|Win32.ActiveCfg = Debug|Win32
 		{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|Win32.Build.0 = Debug|Win32
-		{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|Win64.ActiveCfg = Debug|x64
-		{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|Win64.Build.0 = Debug|x64
+		{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|x64.ActiveCfg = Debug|x64
+		{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|x64.Build.0 = Debug|x64
 		{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|NX64.ActiveCfg = Release|NX64
 		{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|NX64.Build.0 = Release|NX64
 		{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|ORBIS.ActiveCfg = Release|Win32
 		{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Win32.ActiveCfg = Release|Win32
 		{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Win32.Build.0 = Release|Win32
-		{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Win64.ActiveCfg = Release|x64
-		{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Win64.Build.0 = Release|x64
+		{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|x64.ActiveCfg = Release|x64
+		{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|x64.Build.0 = Release|x64
 		{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|NX64.ActiveCfg = Debug|NX64
 		{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|NX64.Build.0 = Debug|NX64
 		{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|ORBIS.ActiveCfg = Debug|Win32
 		{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|Win32.Build.0 = Debug|Win32
-		{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|Win64.ActiveCfg = Debug|x64
-		{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|Win64.Build.0 = Debug|x64
+		{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|x64.ActiveCfg = Debug|x64
+		{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|x64.Build.0 = Debug|x64
 		{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|NX64.ActiveCfg = Release|NX64
 		{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|NX64.Build.0 = Release|NX64
 		{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|ORBIS.ActiveCfg = Release|Win32
 		{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|Win32.ActiveCfg = Release|Win32
 		{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|Win32.Build.0 = Release|Win32
-		{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|Win64.ActiveCfg = Release|x64
-		{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|Win64.Build.0 = Release|x64
+		{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|x64.ActiveCfg = Release|x64
+		{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|x64.Build.0 = Release|x64
 		{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|NX64.ActiveCfg = Debug|NX64
 		{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|NX64.Build.0 = Debug|NX64
 		{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|ORBIS.ActiveCfg = Debug|Win32
 		{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|Win32.ActiveCfg = Debug|Win32
 		{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|Win32.Build.0 = Debug|Win32
-		{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|Win64.ActiveCfg = Debug|x64
-		{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|Win64.Build.0 = Debug|x64
+		{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|x64.ActiveCfg = Debug|x64
+		{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|x64.Build.0 = Debug|x64
 		{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|NX64.ActiveCfg = Release|NX64
 		{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|NX64.Build.0 = Release|NX64
 		{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|ORBIS.ActiveCfg = Release|Win32
 		{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|Win32.ActiveCfg = Release|Win32
 		{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|Win32.Build.0 = Release|Win32
-		{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|Win64.ActiveCfg = Release|x64
-		{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|Win64.Build.0 = Release|x64
+		{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|x64.ActiveCfg = Release|x64
+		{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|x64.Build.0 = Release|x64
 		{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|NX64.ActiveCfg = Debug|NX64
 		{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|NX64.Build.0 = Debug|NX64
 		{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|ORBIS.ActiveCfg = Debug|Win32
 		{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|Win32.Build.0 = Debug|Win32
-		{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|Win64.ActiveCfg = Debug|x64
-		{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|Win64.Build.0 = Debug|x64
+		{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|x64.ActiveCfg = Debug|x64
+		{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|x64.Build.0 = Debug|x64
 		{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|NX64.ActiveCfg = Release|NX64
 		{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|NX64.Build.0 = Release|NX64
 		{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|ORBIS.ActiveCfg = Release|Win32
 		{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|Win32.ActiveCfg = Release|Win32
 		{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|Win32.Build.0 = Release|Win32
-		{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|Win64.ActiveCfg = Release|x64
-		{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|Win64.Build.0 = Release|x64
+		{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|x64.ActiveCfg = Release|x64
+		{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|x64.Build.0 = Release|x64
 		{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|NX64.ActiveCfg = Debug|NX64
 		{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|NX64.Build.0 = Debug|NX64
 		{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|ORBIS.ActiveCfg = Debug|Win32
 		{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|Win32.Build.0 = Debug|Win32
-		{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|Win64.ActiveCfg = Debug|x64
-		{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|Win64.Build.0 = Debug|x64
+		{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|x64.ActiveCfg = Debug|x64
+		{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|x64.Build.0 = Debug|x64
 		{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|NX64.ActiveCfg = Release|NX64
 		{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|NX64.Build.0 = Release|NX64
 		{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|ORBIS.ActiveCfg = Release|Win32
 		{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|Win32.ActiveCfg = Release|Win32
 		{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|Win32.Build.0 = Release|Win32
-		{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|Win64.ActiveCfg = Release|x64
-		{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|Win64.Build.0 = Release|x64
+		{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|x64.ActiveCfg = Release|x64
+		{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|x64.Build.0 = Release|x64
 		{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|NX64.ActiveCfg = Debug|NX64
 		{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|NX64.Build.0 = Debug|NX64
 		{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
 		{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|ORBIS.Build.0 = Debug|ORBIS
 		{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|Win32.Build.0 = Debug|Win32
-		{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|Win64.ActiveCfg = Debug|x64
-		{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|Win64.Build.0 = Debug|x64
+		{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|x64.ActiveCfg = Debug|x64
+		{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|x64.Build.0 = Debug|x64
 		{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|NX64.ActiveCfg = Release|NX64
 		{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|NX64.Build.0 = Release|NX64
 		{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|ORBIS.ActiveCfg = Release|ORBIS
 		{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|ORBIS.Build.0 = Release|ORBIS
 		{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|Win32.ActiveCfg = Release|Win32
 		{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|Win32.Build.0 = Release|Win32
-		{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|Win64.ActiveCfg = Release|x64
-		{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|Win64.Build.0 = Release|x64
+		{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|x64.ActiveCfg = Release|x64
+		{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|x64.Build.0 = Release|x64
 		{31B96262-1C41-43B9-BA38-27AA385B05DB}.Debug|NX64.ActiveCfg = Debug|NX64
 		{31B96262-1C41-43B9-BA38-27AA385B05DB}.Debug|NX64.Build.0 = Debug|NX64
 		{31B96262-1C41-43B9-BA38-27AA385B05DB}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
 		{31B96262-1C41-43B9-BA38-27AA385B05DB}.Debug|ORBIS.Build.0 = Debug|ORBIS
 		{31B96262-1C41-43B9-BA38-27AA385B05DB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{31B96262-1C41-43B9-BA38-27AA385B05DB}.Debug|Win32.Build.0 = Debug|Win32
-		{31B96262-1C41-43B9-BA38-27AA385B05DB}.Debug|Win64.ActiveCfg = Debug|x64
-		{31B96262-1C41-43B9-BA38-27AA385B05DB}.Debug|Win64.Build.0 = Debug|x64
+		{31B96262-1C41-43B9-BA38-27AA385B05DB}.Debug|x64.ActiveCfg = Debug|x64
+		{31B96262-1C41-43B9-BA38-27AA385B05DB}.Debug|x64.Build.0 = Debug|x64
 		{31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|NX64.ActiveCfg = Release|NX64
 		{31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|NX64.Build.0 = Release|NX64
 		{31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|ORBIS.ActiveCfg = Release|ORBIS
 		{31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|ORBIS.Build.0 = Release|ORBIS
 		{31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|Win32.ActiveCfg = Release|Win32
 		{31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|Win32.Build.0 = Release|Win32
-		{31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|Win64.ActiveCfg = Release|x64
-		{31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|Win64.Build.0 = Release|x64
+		{31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|x64.ActiveCfg = Release|x64
+		{31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|x64.Build.0 = Release|x64
 		{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|NX64.ActiveCfg = Debug|NX64
 		{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|NX64.Build.0 = Debug|NX64
 		{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
 		{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|ORBIS.Build.0 = Debug|ORBIS
 		{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|Win32.Build.0 = Debug|Win32
-		{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|Win64.ActiveCfg = Debug|x64
-		{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|Win64.Build.0 = Debug|x64
+		{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|x64.ActiveCfg = Debug|x64
+		{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|x64.Build.0 = Debug|x64
 		{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|NX64.ActiveCfg = Release|NX64
 		{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|NX64.Build.0 = Release|NX64
 		{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|ORBIS.ActiveCfg = Release|ORBIS
 		{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|ORBIS.Build.0 = Release|ORBIS
 		{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|Win32.ActiveCfg = Release|Win32
 		{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|Win32.Build.0 = Release|Win32
-		{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|Win64.ActiveCfg = Release|x64
-		{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|Win64.Build.0 = Release|x64
+		{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|x64.ActiveCfg = Release|x64
+		{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|x64.Build.0 = Release|x64
 		{46910277-18E3-4151-9AD9-DC5B551772A9}.Debug|NX64.ActiveCfg = Debug|NX64
 		{46910277-18E3-4151-9AD9-DC5B551772A9}.Debug|NX64.Build.0 = Debug|NX64
 		{46910277-18E3-4151-9AD9-DC5B551772A9}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
 		{46910277-18E3-4151-9AD9-DC5B551772A9}.Debug|ORBIS.Build.0 = Debug|ORBIS
 		{46910277-18E3-4151-9AD9-DC5B551772A9}.Debug|Win32.ActiveCfg = Debug|Win32
 		{46910277-18E3-4151-9AD9-DC5B551772A9}.Debug|Win32.Build.0 = Debug|Win32
-		{46910277-18E3-4151-9AD9-DC5B551772A9}.Debug|Win64.ActiveCfg = Debug|x64
-		{46910277-18E3-4151-9AD9-DC5B551772A9}.Debug|Win64.Build.0 = Debug|x64
+		{46910277-18E3-4151-9AD9-DC5B551772A9}.Debug|x64.ActiveCfg = Debug|x64
+		{46910277-18E3-4151-9AD9-DC5B551772A9}.Debug|x64.Build.0 = Debug|x64
 		{46910277-18E3-4151-9AD9-DC5B551772A9}.Release|NX64.ActiveCfg = Release|NX64
 		{46910277-18E3-4151-9AD9-DC5B551772A9}.Release|NX64.Build.0 = Release|NX64
 		{46910277-18E3-4151-9AD9-DC5B551772A9}.Release|ORBIS.ActiveCfg = Release|ORBIS
 		{46910277-18E3-4151-9AD9-DC5B551772A9}.Release|ORBIS.Build.0 = Release|ORBIS
 		{46910277-18E3-4151-9AD9-DC5B551772A9}.Release|Win32.ActiveCfg = Release|Win32
 		{46910277-18E3-4151-9AD9-DC5B551772A9}.Release|Win32.Build.0 = Release|Win32
-		{46910277-18E3-4151-9AD9-DC5B551772A9}.Release|Win64.ActiveCfg = Release|x64
-		{46910277-18E3-4151-9AD9-DC5B551772A9}.Release|Win64.Build.0 = Release|x64
+		{46910277-18E3-4151-9AD9-DC5B551772A9}.Release|x64.ActiveCfg = Release|x64
+		{46910277-18E3-4151-9AD9-DC5B551772A9}.Release|x64.Build.0 = Release|x64
 		{51626A22-DD68-4450-9696-13B03BF7A2C5}.Debug|NX64.ActiveCfg = Debug|NX64
 		{51626A22-DD68-4450-9696-13B03BF7A2C5}.Debug|NX64.Build.0 = Debug|NX64
 		{51626A22-DD68-4450-9696-13B03BF7A2C5}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
 		{51626A22-DD68-4450-9696-13B03BF7A2C5}.Debug|ORBIS.Build.0 = Debug|ORBIS
 		{51626A22-DD68-4450-9696-13B03BF7A2C5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{51626A22-DD68-4450-9696-13B03BF7A2C5}.Debug|Win32.Build.0 = Debug|Win32
-		{51626A22-DD68-4450-9696-13B03BF7A2C5}.Debug|Win64.ActiveCfg = Debug|x64
-		{51626A22-DD68-4450-9696-13B03BF7A2C5}.Debug|Win64.Build.0 = Debug|x64
+		{51626A22-DD68-4450-9696-13B03BF7A2C5}.Debug|x64.ActiveCfg = Debug|x64
+		{51626A22-DD68-4450-9696-13B03BF7A2C5}.Debug|x64.Build.0 = Debug|x64
 		{51626A22-DD68-4450-9696-13B03BF7A2C5}.Release|NX64.ActiveCfg = Release|NX64
 		{51626A22-DD68-4450-9696-13B03BF7A2C5}.Release|NX64.Build.0 = Release|NX64
 		{51626A22-DD68-4450-9696-13B03BF7A2C5}.Release|ORBIS.ActiveCfg = Release|ORBIS
 		{51626A22-DD68-4450-9696-13B03BF7A2C5}.Release|ORBIS.Build.0 = Release|ORBIS
 		{51626A22-DD68-4450-9696-13B03BF7A2C5}.Release|Win32.ActiveCfg = Release|Win32
 		{51626A22-DD68-4450-9696-13B03BF7A2C5}.Release|Win32.Build.0 = Release|Win32
-		{51626A22-DD68-4450-9696-13B03BF7A2C5}.Release|Win64.ActiveCfg = Release|x64
-		{51626A22-DD68-4450-9696-13B03BF7A2C5}.Release|Win64.Build.0 = Release|x64
+		{51626A22-DD68-4450-9696-13B03BF7A2C5}.Release|x64.ActiveCfg = Release|x64
+		{51626A22-DD68-4450-9696-13B03BF7A2C5}.Release|x64.Build.0 = Release|x64
+		{C57C9F9F-8EAE-4265-A210-B0CAA717A3A0}.Debug|NX64.ActiveCfg = Debug|NX64
+		{C57C9F9F-8EAE-4265-A210-B0CAA717A3A0}.Debug|NX64.Build.0 = Debug|NX64
+		{C57C9F9F-8EAE-4265-A210-B0CAA717A3A0}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
+		{C57C9F9F-8EAE-4265-A210-B0CAA717A3A0}.Debug|ORBIS.Build.0 = Debug|ORBIS
+		{C57C9F9F-8EAE-4265-A210-B0CAA717A3A0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C57C9F9F-8EAE-4265-A210-B0CAA717A3A0}.Debug|Win32.Build.0 = Debug|Win32
+		{C57C9F9F-8EAE-4265-A210-B0CAA717A3A0}.Debug|x64.ActiveCfg = Debug|x64
+		{C57C9F9F-8EAE-4265-A210-B0CAA717A3A0}.Debug|x64.Build.0 = Debug|x64
+		{C57C9F9F-8EAE-4265-A210-B0CAA717A3A0}.Release|NX64.ActiveCfg = Release|NX64
+		{C57C9F9F-8EAE-4265-A210-B0CAA717A3A0}.Release|NX64.Build.0 = Release|NX64
+		{C57C9F9F-8EAE-4265-A210-B0CAA717A3A0}.Release|ORBIS.ActiveCfg = Release|ORBIS
+		{C57C9F9F-8EAE-4265-A210-B0CAA717A3A0}.Release|ORBIS.Build.0 = Release|ORBIS
+		{C57C9F9F-8EAE-4265-A210-B0CAA717A3A0}.Release|Win32.ActiveCfg = Release|Win32
+		{C57C9F9F-8EAE-4265-A210-B0CAA717A3A0}.Release|Win32.Build.0 = Release|Win32
+		{C57C9F9F-8EAE-4265-A210-B0CAA717A3A0}.Release|x64.ActiveCfg = Release|x64
+		{C57C9F9F-8EAE-4265-A210-B0CAA717A3A0}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -483,6 +503,7 @@ Global
 		{5F5714D0-1C3D-4522-A409-214C5A2951AA} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
 		{46910277-18E3-4151-9AD9-DC5B551772A9} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
 		{51626A22-DD68-4450-9696-13B03BF7A2C5} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
+		{C57C9F9F-8EAE-4265-A210-B0CAA717A3A0} = {4FD6944D-7D73-400F-B040-437021707A83}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {47D50023-EEA2-48DA-8902-F96357602A79}

src/Makefile.am

@@ -29,6 +29,7 @@ liblol_core_headers = \
 liblol_core_sources = \
     net/http.cpp \
     \
-    sys/init.cpp
+    sys/init.cpp \
+    sys/main.cpp
 
 include 3rdparty/lol-imgui.am

src/include/lol/engine/private/sys/init.h

@@ -19,6 +19,14 @@
 
 #include <string> // std::string
 
+//
+// Override main() on platforms and systems that require it
+//
+
+#if LOL_USE_KINC && !KINC_NO_MAIN
+#   define main lol_kinc_kickstart
+#endif
+
 //
 // Module-specific macros. These can be overridden by the build process,
 // typically with compiler command-line flags.
@@ -45,10 +53,14 @@ namespace lol::sys
 {
 
 extern void init(int argc, char *argv[],
+                 std::string const &name, int width, int height,
                  std::string const &projectdir = LOL_CONFIG_PROJECTDIR,
                  std::string const &solutiondir = LOL_CONFIG_SOLUTIONDIR,
                  std::string const &sourcesubdir = LOL_CONFIG_SOURCESUBDIR);
 
+extern void run();
+extern void stop();
+
 extern void add_data_dir(std::string const &dir);
 extern std::string get_data_path(std::string const &file);
 

src/lol-core.vcxproj

@@ -46,40 +46,6 @@
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(LolDir)\build\msbuild\lol.config.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NX64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'" Label="Configuration">
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|NX64'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'" Label="Configuration">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
   <ImportGroup Label="ExtensionSettings">
     <Import Project="$(LolDir)\build\msbuild\lolfx.props" />
   </ImportGroup>
@@ -97,6 +63,7 @@
   <ItemGroup>
     <ClCompile Include="net\http.cpp" />
     <ClCompile Include="sys\init.cpp" />
+    <ClCompile Include="sys\main.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\lol\engine\net" />

src/lol-core.vcxproj.filters

@@ -7,6 +7,9 @@
     <ClCompile Include="sys\init.cpp">
       <Filter>sys</Filter>
     </ClCompile>
+    <ClCompile Include="sys\main.cpp">
+      <Filter>sys</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\lol\engine\private\net\http.h">

src/net/http.cpp

@@ -54,7 +54,7 @@ public:
 #if __NX__
     void get(std::string const &url)
     {
-        msg::error("downloading %s failed: not implemented\n", url);
+        msg::error("downloading %s failed: not implemented\n", url.c_str());
         m_status = status::error;
     }
 #elif __EMSCRIPTEN__

src/sys/init.cpp

@@ -20,6 +20,8 @@
 #   include <filesystem> // std::filesystem::exists
 #endif
 
+#include <kinc/system.h>
+
 namespace lol::sys
 {
 
@@ -32,12 +34,17 @@ namespace lol::sys
 static std::vector<std::string> data_dir;
 
 void init(int argc, char *argv[],
+          std::string const &name, int width, int height,
           std::string const &projectdir,
           std::string const &solutiondir,
           std::string const &sourcesubdir)
 {
     using namespace std;
 
+#if LOL_USE_KINC
+    kinc_init(name.c_str(), width, height, nullptr, nullptr);
+#endif
+
     msg::debug("project dir: “%s”\n", projectdir.c_str());
     msg::debug("solution dir: “%s”\n", solutiondir.c_str());
     msg::debug("source subdir: “%s”\n", sourcesubdir.c_str());
@@ -134,6 +141,20 @@ void init(int argc, char *argv[],
                    data_dir[i].c_str());
 }
 
+void run()
+{
+#if LOL_USE_KINC
+    kinc_start();
+#endif
+}
+
+void stop()
+{
+#if LOL_USE_KINC
+    kinc_stop();
+#endif
+}
+
 //
 // Data directory handling
 //

src/sys/main.cpp

@@ -0,0 +1,31 @@
+//
+//  Lol Engine
+//
+//  Copyright © 2010–2024 Sam Hocevar <sam@hocevar.net>
+//
+//  Lol Engine is free software. It comes without any warranty, to
+//  the extent permitted by applicable law. You can redistribute it
+//  and/or modify it under the terms of the Do What the Fuck You Want
+//  to Public License, Version 2, as published by the WTFPL Task Force.
+//  See http://www.wtfpl.net/ for more details.
+//
+
+// One of these wrappers will be overridden by the user’s version, the
+// others will just be NOPs.
+int lol_kinc_kickstart(void) __attribute__((weak));
+int lol_kinc_kickstart(int argc, char **argv) __attribute__((weak));
+int lol_kinc_kickstart(int argc, char **argv, char **envp) __attribute__((weak));
+
+int lol_kinc_kickstart(void) { return 0; }
+int lol_kinc_kickstart(int, char **) { return 0; }
+int lol_kinc_kickstart(int, char **, char **) { return 0; }
+
+#if LOL_USE_KINC && !KINC_NO_MAIN
+extern "C" int kickstart(int argc, char **argv)
+{
+    char *env[] = { nullptr };
+    return lol_kinc_kickstart()
+         | lol_kinc_kickstart(argc, argv)
+         | lol_kinc_kickstart(argc, argv, env);
+}
+#endif