Home Explore Help
Sign In
Godot
/
godot
mirror of https://github.com/godotengine/godot.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

png: Allow building shared freetype with bundled libpng

This was the behaviour when building Godot 2.1, which allows to build against
Ubuntu 12.04 and its freetype that links old libpng12, while still bundling
libpng16.

(cherry picked from commit 4965ddfaa1536fb179d4b156d1ecb8a72a3c565f)
Rémi Verschelde 8 years ago
parent
326978dcce
commit
a3582fa3cb
2 changed files with 0 additions and 2 deletions
Unified View Show Diff Stats
  1. 0 1
      platform/server/detect.py
  2. 0 1
      platform/x11/detect.py

+ 0 - 1
platform/server/detect.py
View File 

@@ -76,7 +76,6 @@ def configure(env):
 
         env.ParseConfig('pkg-config libwebp --cflags --libs')
 
         env.ParseConfig('pkg-config libwebp --cflags --libs')
 
 
 
     if (env['builtin_freetype'] == 'no'):
 
     if (env['builtin_freetype'] == 'no'):
 
-        env['builtin_libpng'] = 'no'  # Freetype links against libpng
 
         env.ParseConfig('pkg-config freetype2 --cflags --libs')
 
         env.ParseConfig('pkg-config freetype2 --cflags --libs')
 
 
 
     if (env['builtin_libpng'] == 'no'):
 
     if (env['builtin_libpng'] == 'no'):

+ 0 - 1
platform/x11/detect.py
View File 

@@ -140,7 +140,6 @@ def configure(env):
 
         env.ParseConfig('pkg-config libwebp --cflags --libs')
 
         env.ParseConfig('pkg-config libwebp --cflags --libs')
 
 
 
     if (env['builtin_freetype'] == 'no'):
 
     if (env['builtin_freetype'] == 'no'):
 
-        env['builtin_libpng'] = 'no'  # Freetype links against libpng
 
         env.ParseConfig('pkg-config freetype2 --cflags --libs')
 
         env.ParseConfig('pkg-config freetype2 --cflags --libs')
 
 
 
     if (env['builtin_libpng'] == 'no'):
 
     if (env['builtin_libpng'] == 'no'):