premake-scripts/build-flac.lua

@@ -57,7 +57,7 @@ function m.generateproject(liboutdir, intdir)
 end
 
 function m.link()
-	includedirs
+	externalincludedirs
 	{
 		path.join(rootdir, "flac/include"),
 		path.join(rootdir, "flac/src/libFLAC/include"),

premake-scripts/build-freetype.lua

@@ -79,11 +79,6 @@ function m.generateproject(liboutdir, intdir)
 		path.join(rootdir, "freetype/builds/windows/ftdebug.c"),
 	}
 
-	removefiles
-	{
-		path.join(rootdir, "freetype/src/base/ftdebug.c"),
-	}
-
 	filter"system:linux"
 	files{path.join(rootdir, "freetype/builds/unix/ftsystem.c")}
 
@@ -94,7 +89,7 @@ function m.generateproject(liboutdir, intdir)
 end
 
 function m.link()
-	includedirs{path.join(rootdir, "freetype/include")}
+	externalincludedirs{path.join(rootdir, "freetype/include")}
 	links {"freetype"}
 end
 

premake-scripts/build-imgui-sfml.lua

@@ -1,7 +1,7 @@
 local m = {}
 
 local rootdir = path.join(path.getabsolute(path.getdirectory(_SCRIPT)), "../")
-local sfml = require("build-sfml")
+local sfml = require("../build-sfml")
 
 function m.generateproject(liboutdir, intdir)
     project"imgui-sfml"
@@ -11,28 +11,29 @@ function m.generateproject(liboutdir, intdir)
         objdir(intdir)
         warnings"Off"
 
-        defines{"IMGUI_USER_CONFIG=\"imconfig-SFML.h\"", "SFML_STATIC"}
+        defines{"IMGUI_USER_CONFIG=\"imconfig-SFML.h\""}
 
-        files
-        {
-            path.join(rootdir, "imgui-sfml/imgui-SFML.cpp"),
-        }
+        sfml.link()
 
         includedirs
         {
             path.join(rootdir, "imgui-sfml"),
             path.join(rootdir, "imgui"),
-            path.join(rootdir, "SFML/include"),
         }
 
-        links {"sfml"}
+        files
+        {
+            path.join(rootdir, "imgui-sfml/imgui-SFML.cpp"),
+        }
 end
 
 function m.config() -- use this in build imgui instead of link() to avoid circular dependency
 
     defines { "IMGUI_USER_CONFIG=\"imconfig-SFML.h\"" }
 
-    includedirs { path.join(rootdir, "imgui-sfml"), path.join(rootdir, "SFML/include") }
+    externalincludedirs { path.join(rootdir, "imgui-sfml") }
+
+    sfml.link()
 end
 
 function m.link()

premake-scripts/build-imgui.lua

@@ -11,6 +11,7 @@ function m.generateproject(liboutdir, intdir)
     objdir(intdir)
     warnings"Off"
 
+    imguisfml.config() -- needed so imgui can be aware of imconfig-sfml.h
 
     includedirs
     {
@@ -24,14 +25,12 @@ function m.generateproject(liboutdir, intdir)
         path.join(rootdir, "imgui/imgui_tables.cpp"),
         path.join(rootdir, "imgui/imgui_widgets.cpp"),
     }
-
-    imguisfml.config() -- needed so imgui can be aware of imconfig-sfml.h
 end
 
 function m.link()
     links {"imgui"}
 
-    includedirs { path.join(rootdir, "imgui") }
+    externalincludedirs { path.join(rootdir, "imgui") }
 end
 
 return m

premake-scripts/build-ogg.lua

@@ -22,7 +22,7 @@ end
 
 function m.link()
 	links{"ogg"}
-	includedirs{path.join(rootdir, "ogg/include")}
+	externalincludedirs{path.join(rootdir, "ogg/include")}
 end
 
 return m

premake-scripts/build-sfml.lua

@@ -15,6 +15,12 @@ function m.generateproject(liboutdir, intdir)
 	objdir(intdir)
 	warnings"Off"
 
+
+	freetype.link()
+	ogg.link()
+	flac.link()
+	vorbis.link()
+
 	defines
 	{
 		"SFML_STATIC",
@@ -43,6 +49,7 @@ function m.generateproject(liboutdir, intdir)
 		path.join(rootdir, "SFML/extlibs/headers/vulkan"),
 
 	}
+
 	files
 	{
 		path.join(rootdir, "SFML/include/SFML/**.hpp"),
@@ -51,11 +58,6 @@ function m.generateproject(liboutdir, intdir)
 		path.join(rootdir, "SFML/src/SFML/**.cpp"),
 	}
 
-	freetype.link()
-	ogg.link()
-	flac.link()
-	vorbis.link()
-
 	filter"system:windows"
 	removefiles
 	{
@@ -71,8 +73,6 @@ function m.generateproject(liboutdir, intdir)
 		path.join(rootdir, "SFML/src/SFML/Window/DRM/**"),
 		path.join(rootdir, "SFML/src/SFML/Window/Android/**"),
 		path.join(rootdir, "SFML/src/SFML/System/Android/**"),
-		path.join(rootdir, "SFML/src/SFML/Main/MainAndroid.cpp"),
-		path.join(rootdir, "SFML/src/SFML/Main/MainiOS.cpp"),
 	}
 
 	filter"system:linux"
@@ -97,7 +97,7 @@ end
 
 function m.link()
 	defines{"SFML_STATIC"}
-	includedirs
+	externalincludedirs
 	{
 		path.join(rootdir, "SFML/include"),
 	}

premake-scripts/build-vorbis.lua

@@ -71,7 +71,7 @@ end
 function m.link()
 	links {"vorbis"}
 	ogg.link()
-	includedirs
+	externalincludedirs
 	{
 		path.join(rootdir, "vorbis/include"),
 	}