diff --git a/engine/premake5.lua b/engine/premake5.lua
index 03684ba..e74c550 100644
--- a/engine/premake5.lua
+++ b/engine/premake5.lua
@@ -96,18 +96,35 @@ function gf_generateheader(headerfile, placeholder, precstr)
 end
 
 function gf_link_stuffs(cond)
+	filter({})
 	filter({
 		"platforms:Native",
 		"system:not windows"
 	})
 		includedirs({
 			"/usr/local/include",
-			"/usr/X11R*/include"
+			"/usr/X11R6/include",
+			"/usr/X11R7/include",
+			"/usr/X11/include"
 		})
 		libdirs({
 			"/usr/local/lib",
-			"/usr/X11R*/lib"
+			"/usr/X11R6/lib",
+			"/usr/X11R7/lib",
+			"/usr/X11/lib"
 		})
+	filter({
+		"platforms:Native",
+		"system:not windows",
+		"toolset:gcc or toolset:clang"
+	})
+		linkoptions({
+			"-Wl,-R/usr/local/lib",
+			"-Wl,-R/usr/X11R6/lib",
+			"-Wl,-R/usr/X11R7/lib",
+			"-Wl,-R/usr/X11/lib"
+		})
+
 	filter({
 		"platforms:Native",
 		"system:bsd"
@@ -118,7 +135,14 @@ function gf_link_stuffs(cond)
 		libdirs({
 			"/usr/pkg/lib"
 		})
-
+	filter({
+		"platforms:Native",
+		"system:bsd",
+		"toolset:gcc or toolset:clang"
+	})
+		linkoptions({
+			"-Wl,-R/usr/pkg/lib"
+		})
 
 	filter({
 		"toolset:gcc or toolset:clang",
@@ -176,6 +200,7 @@ function gf_link_stuffs(cond)
 			"m",
 			"pthread"
 		})
+	filter({})
 end
 
 function gf_msvc_filters()
@@ -201,10 +226,10 @@ function gf_msvc_filters()
 		runtime(rt)
 		staticruntime("On")
 	end
+	filter({})
 end
 
 project("GoldFish")
-	language("C")
 	filter("options:engine=static")
 		kind("StaticLib")
 		defines({
@@ -216,7 +241,6 @@ project("GoldFish")
 			"ODE_DLL",
 			"_DLL"
 		})
-	gf_link_stuffs("options:engine=dynamic")
 	filter("configurations:Debug")
 		defines({
 			"DEBUG",
@@ -226,11 +250,10 @@ project("GoldFish")
 	filter("configurations:Release")
 		defines({
 			"NDEBUG",
-			"dNODEBUG",
+			"dNODEBUG"
 		})
 		optimize("On")
 	gf_msvc_filters()
-	filter({})
 	targetdir("lib/%{cfg.buildcfg}/%{cfg.platform}")
 	targetname("goldfish")
 	includedirs({
@@ -272,7 +295,6 @@ project("GoldFish")
 		files({
 			"thread/posix/gf_thread.c"
 		})
-	filter({})
 
 	-- Begin ODE
 	includedirs({
@@ -337,6 +359,7 @@ project("GoldFish")
 	-- End ODE
 
 	gf_default_stuffs()
+	gf_link_stuffs("options:engine=dynamic")
 	for k,v in pairs(gf_backends) do
 		for k2,v2 in pairs(v["backends"]) do
 			filter({
diff --git a/premake5.lua b/premake5.lua
index becda5a..1981262 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -20,6 +20,8 @@ filter("platforms:Win64")
 	architecture("x86_64")
 	gccprefix("x86_64-w64-mingw32-")
 
+filter({})
+
 newaction({
 	trigger = "clean",
 	description = "Clean the files",
@@ -58,6 +60,7 @@ function msvc_filters()
 		postbuildcommands({
 			"mt -manifest $(TargetDir)$(TargetName).exe.manifest -outputresource:$(TargetDir)$(TargetName).exe"
 		})
+	filter({})
 end
 
 include "engine"
@@ -111,7 +114,6 @@ project("EngineInfo")
 		})
 		optimize("On")
 	msvc_filters()
-	filter({})
 
 project("NishBoxServer")
 	kind("ConsoleApp")
@@ -147,7 +149,6 @@ project("NishBoxServer")
 		})
 		optimize("On")
 	msvc_filters()
-	filter({})
 
 project("NishBox")
 	kind("ConsoleApp")
@@ -183,4 +184,3 @@ project("NishBox")
 		})
 		optimize("On")
 	msvc_filters()
-	filter({})