diff --git a/scripts/genie.lua b/scripts/genie.lua
index fe34647f7..2e8a64a17 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -500,14 +500,12 @@ function exampleProject(_combined, ...)
 
 end
 
+group "libs"
 dofile(path.join(BX_DIR,   "scripts/bx.lua"))
 dofile(path.join(BIMG_DIR, "scripts/bimg.lua"))
 dofile(path.join(BIMG_DIR, "scripts/bimg_decode.lua"))
-
 dofile "bgfx.lua"
 
-group "libs"
-
 local function userdefines()
 	local defines = {}
 	local BGFX_CONFIG = os.getenv("BGFX_CONFIG")
@@ -524,7 +522,13 @@ BGFX_CONFIG = userdefines()
 
 bgfxProject("", "StaticLib", BGFX_CONFIG)
 
+if _OPTIONS["with-shared-lib"] then
+	group "libs"
+	bgfxProject("-shared-lib", "SharedLib", BGFX_CONFIG)
+end
+
 if _OPTIONS["with-tools"] then
+	group "libs"
 	dofile(path.join(BIMG_DIR, "scripts/bimg_encode.lua"))
 end
 
@@ -598,11 +602,6 @@ or _OPTIONS["with-combined-examples"] then
 	end
 end
 
-if _OPTIONS["with-shared-lib"] then
-	group "libs"
-	bgfxProject("-shared-lib", "SharedLib", BGFX_CONFIG)
-end
-
 if _OPTIONS["with-tools"] then
 	group "tools"
 	dofile "shaderc.lua"