diff --git a/Walnut/premake5.lua b/Walnut/premake5.lua
index c2d4b3e4..9e99da8b 100644
--- a/Walnut/premake5.lua
+++ b/Walnut/premake5.lua
@@ -12,7 +12,7 @@ project "Walnut"
       "src",
 
       "../vendor/imgui",
-      "../vendor/glfw/include",
+      "../vendor/GLFW/include",
       "../vendor/stb_image",
 
       "%{IncludeDir.VulkanSDK}",
diff --git a/Walnut/src/Walnut/EntryPoint.h b/Walnut/src/Walnut/EntryPoint.h
index 8e88cffb..3b53c200 100644
--- a/Walnut/src/Walnut/EntryPoint.h
+++ b/Walnut/src/Walnut/EntryPoint.h
@@ -38,5 +38,26 @@ int main(int argc, char** argv)
 }
 
 #endif // WL_DIST
+#else // Linux/Mac
 
+extern Walnut::Application* Walnut::CreateApplication(int argc, char** argv);
+bool g_ApplicationRunning = true;
+
+namespace Walnut {
+    int Main(int argc, char** argv)
+    {
+        while (g_ApplicationRunning)
+        {
+            Walnut::Application* app = Walnut::CreateApplication(argc, argv);
+            app->Run();
+            delete app;
+        }
+        return 0;
+    }
+}
+
+int main(int argc, char** argv)
+{
+    return Walnut::Main(argc, argv);
+}
 #endif // WL_PLATFORM_WINDOWS
diff --git a/WalnutExternal.lua b/WalnutExternal.lua
index 651c4001..b04b8114 100644
--- a/WalnutExternal.lua
+++ b/WalnutExternal.lua
@@ -14,9 +14,9 @@ Library["Vulkan"] = "%{LibraryDir.VulkanSDK}/vulkan-1.lib"
 
 group "Dependencies"
    include "vendor/imgui"
-   include "vendor/glfw"
+   include "vendor/GLFW"
 group ""
 
 group "Core"
 include "Walnut"
-group ""
\ No newline at end of file
+group ""
diff --git a/premake5.lua b/premake5.lua
index 409fa096..8603b04f 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -7,4 +7,12 @@ workspace "WalnutApp"
 outputdir = "%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}"
 
 include "WalnutExternal.lua"
-include "WalnutApp"
\ No newline at end of file
+include "WalnutApp"
+
+filter "system:windows"
+    systemversion "latest"
+    defines { "WL_PLATFORM_WINDOWS" }
+    links { "%{Library.Vulkan}" }
+
+filter "system:linux"
+    links { "vulkan" }
diff --git a/vendor/GLFW b/vendor/GLFW
index d516e668..026a148d 160000
--- a/vendor/GLFW
+++ b/vendor/GLFW
@@ -1 +1 @@
-Subproject commit d516e6680183bed7096c8fb58c31365deb2cc9b7
+Subproject commit 026a148d7dd78d597de380c4e77ca0869f0ceaab