2 files changed, 32 insertions, 14 deletions
diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj b/Projects/VisualStudio/Editor/Editor.vcxproj
index 14bdfb3..972d606 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj
@@ -87,12 +87,12 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;GAMELAB_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;GAMELAB_DEBUG;GAMELAB_EDITOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\;$(SolutionDir)..\..\ThirdParty\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
-      <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -163,7 +163,8 @@
     <ClCompile Include="..\..\..\Editor\Scripting\IMGUI\GUIButton.bind.cpp" />
     <ClCompile Include="..\..\..\Editor\Shaders\BuiltinShaders.cpp" />
     <ClCompile Include="..\..\..\Editor\Utils\HelperFuncs.cpp" />
-    <ClCompile Include="..\..\..\Editor\Utils\Log.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Debug\Log.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Graphics\OpenGL.cpp" />
     <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindCFunctions.cpp" />
     <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindClass.cpp" />
     <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindEnum.cpp" />
@@ -175,7 +176,8 @@
     <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindWatchDog.cpp" />
     <ClCompile Include="..\..\..\Runtime\Math\Vector2.cpp" />
     <ClCompile Include="..\..\..\Runtime\Math\Vector3.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\GL.bind.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\Debug\Debug.bind.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\GL\GL.bind.cpp" />
     <ClCompile Include="..\..\..\Runtime\Utilities\Base64.cpp" />
     <ClCompile Include="..\..\..\Runtime\Utilities\Utf8.cpp" />
   </ItemGroup>
@@ -190,7 +192,8 @@
     <ClInclude Include="..\..\..\Editor\Scripting\EditorScripting.h" />
     <ClInclude Include="..\..\..\Editor\Shaders\BuiltinShaders.h" />
     <ClInclude Include="..\..\..\Editor\Utils\HelperFuncs.h" />
-    <ClInclude Include="..\..\..\Editor\Utils\Log.h" />
+    <ClInclude Include="..\..\..\Runtime\Debug\Log.h" />
+    <ClInclude Include="..\..\..\Runtime\Graphics\OpenGL.h" />
     <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBind.h" />
     <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindCFunctions.h" />
     <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindClass.hpp" />
diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj.filters b/Projects/VisualStudio/Editor/Editor.vcxproj.filters
index cf4698b..7aff217 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj.filters
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj.filters
@@ -55,6 +55,12 @@
     <Filter Include="Editor\Shaders">
       <UniqueIdentifier>{707a995f-6856-44c8-857c-14e7834e86e3}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Runtime\Debug">
+      <UniqueIdentifier>{df6cfcb1-ec0a-4b6d-b80d-8ee197425509}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Runtime\Scripting\Debug">
+      <UniqueIdentifier>{be13ccc9-0b31-4d22-b512-e2a05d7f3c5b}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Editor\GUI\Dock.cpp">
@@ -84,9 +90,6 @@
     <ClCompile Include="..\..\..\Editor\GUI\SplitWindow.cpp">
       <Filter>Editor\GUI</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Editor\Utils\Log.cpp">
-      <Filter>Editor\Utils</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\Editor\GUI\WindowUtil.cpp">
       <Filter>Editor\GUI</Filter>
     </ClCompile>
@@ -159,12 +162,21 @@
     <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindWatchDog.cpp">
       <Filter>Runtime\LuaBind</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\GL.bind.cpp">
-      <Filter>Runtime\Scripting\GL</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\Editor\Shaders\BuiltinShaders.cpp">
       <Filter>Editor\Shaders</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Debug\Log.cpp">
+      <Filter>Runtime\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\GL\GL.bind.cpp">
+      <Filter>Runtime\Scripting\GL</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\Debug\Debug.bind.cpp">
+      <Filter>Runtime\Scripting\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Graphics\OpenGL.cpp">
+      <Filter>Runtime\Graphics</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\Editor\GUI\Dock.h">
@@ -218,9 +230,6 @@
     <ClInclude Include="..\..\..\Editor\GUI\WinUtils.h">
       <Filter>Editor\GUI</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Editor\Utils\Log.h">
-      <Filter>Editor\Utils</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\Editor\GUI\Rect.h">
       <Filter>Editor\GUI</Filter>
     </ClInclude>
@@ -284,6 +293,12 @@
     <ClInclude Include="..\..\..\Editor\Shaders\BuiltinShaders.h">
       <Filter>Editor\Shaders</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Debug\Log.h">
+      <Filter>Runtime\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Graphics\OpenGL.h">
+      <Filter>Runtime\Graphics</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\Runtime\LuaBind\LuaBindClass.inc">