Changeset 24998

Timestamp:

Mar 3, 2021, 5:11:41 PM (3 years ago)

Author:

s0600204

Message:

Use pkgconfig to find libpng

Should hopefully resolve an issue raised on IRC by @spcman and @Xavi92

Reviewed By: wraitii
Differential Revision: ​https://code.wildfiregames.com/D3610

Location:

ps/trunk/build

Files:

• premake/extern_libs5.lua (modified) (1 diff)
• workspaces/update-workspaces.sh (modified) (1 diff)

ps/trunk/build/premake/extern_libs5.lua

@@ -412 +412 @@
     libpng = {
         compile_settings = function()
-            if os.istarget("windows") or os.istarget("macosx") then
+            if os.istarget("windows") then
                 add_default_include_paths("libpng")
-            end
-            if os.getversion().description == "OpenBSD" then
-                sysincludedirs { "/usr/local/include/libpng" }
-            end
-        end,
-        link_settings = function()
-            if os.istarget("windows") or os.istarget("macosx") then
+            else
+                -- Support LIBPNG_CONFIG for overriding the default (pkg-config --cflags libpng)
+                -- i.e. on OSX where it gets set in update-workspaces.sh
+                pkgconfig.add_includes("libpng", os.getenv("LIBPNG_CONFIG"))
+            end
+        end,
+        link_settings = function()
+            if os.istarget("windows") then
                 add_default_lib_paths("libpng")
-            end
-            add_default_links({
-                win_names  = { "libpng16" },
-                unix_names = { "png" },
-                -- Otherwise ld will sometimes pull in ancient 1.2 from the SDK, which breaks the build :/
-                -- TODO: Figure out why that happens
-                osx_names = { "png16" },
-            })
+                add_default_links({
+                    win_names  = { "libpng16" },
+                })
+            else
+                pkgconfig.add_links("libpng", os.getenv("LIBPNG_CONFIG"), "--ldflags")
+            end
         end,
     },

ps/trunk/build/workspaces/update-workspaces.sh

@@ -74 +74 @@
   export GLOOX_CONFIG=${GLOOX_CONFIG:="$(pwd)/../../libraries/osx/gloox/bin/gloox-config"}
   export ICU_CONFIG=${ICU_CONFIG:="$(pwd)/../../libraries/osx/icu/bin/icu-config"}
+
   export SDL2_CONFIG=${SDL2_CONFIG:="$(pwd)/../../libraries/osx/sdl2/bin/sdl2-config"}
   export WX_CONFIG=${WX_CONFIG:="$(pwd)/../../libraries/osx/wxwidgets/bin/wx-config"}