diff --git a/premake/bgfx.lua b/premake/bgfx.lua
index 11767491..d0cfb5b2 100755
--- a/premake/bgfx.lua
+++ b/premake/bgfx.lua
@@ -25,6 +25,11 @@ project "bgfx"
 			"$(DXSDK_DIR)/include",
 		}
 
+	configuration { "macosx" }
+		files {
+			BGFX_DIR .. "src/**.mm",
+		}
+
 	configuration { "not nacl" }
 		includedirs {
 			--nacl has GLES2 headers modified...
@@ -41,7 +46,6 @@ project "bgfx"
 		BGFX_DIR .. "include/**.h",
 		BGFX_DIR .. "src/**.cpp",
 		BGFX_DIR .. "src/**.h",
-		BGFX_DIR .. "src/**.mm",
 	}
 
 	excludes {
diff --git a/premake/example-00-helloworld.lua b/premake/example-00-helloworld.lua
index 4490b7ad..97e2cefb 100755
--- a/premake/example-00-helloworld.lua
+++ b/premake/example-00-helloworld.lua
@@ -10,7 +10,6 @@ project "example-00-helloworld"
 	files {
 		BGFX_DIR .. "examples/common/**.cpp",
 		BGFX_DIR .. "examples/common/**.h",
-		BGFX_DIR .. "examples/common/**.mm",
 		BGFX_DIR .. "examples/00-helloworld/**.cpp",
 		BGFX_DIR .. "examples/00-helloworld/**.h",
 	}
@@ -38,6 +37,9 @@ project "example-00-helloworld"
 		}
 
 	configuration { "macosx" }
+		files {
+			BGFX_DIR .. "examples/common/**.mm",
+		}
 		links {
 			"Cocoa.framework",
 			"OpenGL.framework",
diff --git a/premake/example-01-cubes.lua b/premake/example-01-cubes.lua
index fcddb906..504e4572 100755
--- a/premake/example-01-cubes.lua
+++ b/premake/example-01-cubes.lua
@@ -12,7 +12,6 @@ project "example-01-cubes"
 	files {
 		BGFX_DIR .. "examples/common/**.cpp",
 		BGFX_DIR .. "examples/common/**.h",
-		BGFX_DIR .. "examples/common/**.mm",
 		BGFX_DIR .. "examples/01-cubes/**.cpp",
 		BGFX_DIR .. "examples/01-cubes/**.h",
 	}
@@ -40,6 +39,9 @@ project "example-01-cubes"
 		}
 
 	configuration { "macosx" }
+		files {
+			BGFX_DIR .. "examples/common/**.mm",
+		}
 		links {
 			"Cocoa.framework",
 			"OpenGL.framework",
diff --git a/premake/example-02-metaballs.lua b/premake/example-02-metaballs.lua
index d7eea560..2d812bad 100755
--- a/premake/example-02-metaballs.lua
+++ b/premake/example-02-metaballs.lua
@@ -12,7 +12,6 @@ project "example-02-metaballs"
 	files {
 		BGFX_DIR .. "examples/common/**.cpp",
 		BGFX_DIR .. "examples/common/**.h",
-		BGFX_DIR .. "examples/common/**.mm",
 		BGFX_DIR .. "examples/02-metaballs/**.cpp",
 		BGFX_DIR .. "examples/02-metaballs/**.h",
 	}
@@ -40,6 +39,9 @@ project "example-02-metaballs"
 		}
 
 	configuration { "macosx" }
+		files {
+			BGFX_DIR .. "examples/common/**.mm",
+		}
 		links {
 			"Cocoa.framework",
 			"OpenGL.framework",
diff --git a/premake/example-03-raymarch.lua b/premake/example-03-raymarch.lua
index 096aa00d..51b432ac 100755
--- a/premake/example-03-raymarch.lua
+++ b/premake/example-03-raymarch.lua
@@ -12,7 +12,6 @@ project "example-03-raymarch"
 	files {
 		BGFX_DIR .. "examples/common/**.cpp",
 		BGFX_DIR .. "examples/common/**.h",
-		BGFX_DIR .. "examples/common/**.mm",
 		BGFX_DIR .. "examples/03-raymarch/**.cpp",
 		BGFX_DIR .. "examples/03-raymarch/**.h",
 	}
@@ -40,6 +39,9 @@ project "example-03-raymarch"
 		}
 
 	configuration { "macosx" }
+		files {
+			BGFX_DIR .. "examples/common/**.mm",
+		}
 		links {
 			"Cocoa.framework",
 			"OpenGL.framework",
diff --git a/premake/example-04-mesh.lua b/premake/example-04-mesh.lua
index 0881b1a4..6f3914ed 100755
--- a/premake/example-04-mesh.lua
+++ b/premake/example-04-mesh.lua
@@ -12,7 +12,6 @@ project "example-04-mesh"
 	files {
 		BGFX_DIR .. "examples/common/**.cpp",
 		BGFX_DIR .. "examples/common/**.h",
-		BGFX_DIR .. "examples/common/**.mm",
 		BGFX_DIR .. "examples/04-mesh/**.cpp",
 		BGFX_DIR .. "examples/04-mesh/**.h",
 	}
@@ -40,6 +39,9 @@ project "example-04-mesh"
 		}
 
 	configuration { "macosx" }
+		files {
+			BGFX_DIR .. "examples/common/**.mm",
+		}
 		links {
 			"Cocoa.framework",
 			"OpenGL.framework",
diff --git a/premake/example-05-instancing.lua b/premake/example-05-instancing.lua
index 5b13a36e..e5ef108b 100755
--- a/premake/example-05-instancing.lua
+++ b/premake/example-05-instancing.lua
@@ -12,7 +12,6 @@ project "example-05-instancing"
 	files {
 		BGFX_DIR .. "examples/common/**.cpp",
 		BGFX_DIR .. "examples/common/**.h",
-		BGFX_DIR .. "examples/common/**.mm",
 		BGFX_DIR .. "examples/05-instancing/**.cpp",
 		BGFX_DIR .. "examples/05-instancing/**.h",
 	}
@@ -40,6 +39,9 @@ project "example-05-instancing"
 		}
 
 	configuration { "macosx" }
+		files {
+			BGFX_DIR .. "examples/common/**.mm",
+		}
 		links {
 			"Cocoa.framework",
 			"OpenGL.framework",
diff --git a/premake/example-06-bump.lua b/premake/example-06-bump.lua
index 9c21d5c5..4a0caa3a 100755
--- a/premake/example-06-bump.lua
+++ b/premake/example-06-bump.lua
@@ -12,7 +12,6 @@ project "example-06-bump"
 	files {
 		BGFX_DIR .. "examples/common/**.cpp",
 		BGFX_DIR .. "examples/common/**.h",
-		BGFX_DIR .. "examples/common/**.mm",
 		BGFX_DIR .. "examples/06-bump/**.cpp",
 		BGFX_DIR .. "examples/06-bump/**.h",
 	}
@@ -37,6 +36,9 @@ project "example-06-bump"
 		}
 
 	configuration { "macosx" }
+		files {
+			BGFX_DIR .. "examples/common/**.mm",
+		}
 		links {
 			"Cocoa.framework",
 			"OpenGL.framework",
diff --git a/premake/example-07-callback.lua b/premake/example-07-callback.lua
index 787351fe..ce95bfae 100755
--- a/premake/example-07-callback.lua
+++ b/premake/example-07-callback.lua
@@ -12,7 +12,6 @@ project "example-07-callback"
 	files {
 		BGFX_DIR .. "examples/common/**.cpp",
 		BGFX_DIR .. "examples/common/**.h",
-		BGFX_DIR .. "examples/common/**.mm",
 		BGFX_DIR .. "examples/07-callback/**.cpp",
 		BGFX_DIR .. "examples/07-callback/**.h",
 	}
@@ -37,6 +36,9 @@ project "example-07-callback"
 		}
 
 	configuration { "macosx" }
+		files {
+			BGFX_DIR .. "examples/common/**.mm",
+		}
 		links {
 			"Cocoa.framework",
 			"OpenGL.framework",
diff --git a/premake/example-08-update.lua b/premake/example-08-update.lua
index 447e2abe..49dc4368 100755
--- a/premake/example-08-update.lua
+++ b/premake/example-08-update.lua
@@ -12,7 +12,6 @@ project "example-08-update"
 	files {
 		BGFX_DIR .. "examples/common/**.cpp",
 		BGFX_DIR .. "examples/common/**.h",
-		BGFX_DIR .. "examples/common/**.mm",
 		BGFX_DIR .. "examples/08-update/**.cpp",
 		BGFX_DIR .. "examples/08-update/**.h",
 	}
@@ -40,6 +39,9 @@ project "example-08-update"
 		}
 
 	configuration { "macosx" }
+		files {
+			BGFX_DIR .. "examples/common/**.mm",
+		}
 		links {
 			"Cocoa.framework",
 			"OpenGL.framework",