diff --git a/premake/toolchain.lua b/premake/toolchain.lua
index d09ce7a..25213ee 100755
--- a/premake/toolchain.lua
+++ b/premake/toolchain.lua
@@ -701,6 +701,12 @@ function toolchain(_buildDir, _libDir)
 		}
 
 	configuration { "rpi" }
+		targetdir (_buildDir .. "rpi" .. "/bin")
+		objdir (_buildDir .. "rpi" .. "/obj")
+		libdirs {
+			_libDir .. "lib/rpi",
+			"/opt/vc/lib",
+		}
 		defines {
 			"BCM2708", -- There is no special prefedined compiler symbol to detect RaspberryPi, faking it.
 		}
@@ -715,9 +721,6 @@ function toolchain(_buildDir, _libDir)
 			"/opt/vc/include/interface/vcos/pthreads",
 			"/opt/vc/include/interface/vmcs_host/linux",
 		}
-		libdirs {
-			"/opt/vc/lib",
-		}
 		links {
 			"rt",
 		}