mirror of
https://github.com/TTimo/GtkRadiant.git
synced 2025-01-24 18:31:36 +00:00
xml2-config -> pkg-config, from @magicmyth's GtkR flatpak work
This commit is contained in:
parent
a050102e2a
commit
d69257d0b7
1 changed files with 3 additions and 3 deletions
|
@ -229,11 +229,11 @@ class Config:
|
||||||
env['CC'] = self.cc
|
env['CC'] = self.cc
|
||||||
env['CXX'] = self.cxx
|
env['CXX'] = self.cxx
|
||||||
try:
|
try:
|
||||||
xml2 = subprocess.check_output( ['xml2-config', '--cflags'] ).decode( 'utf-8' )
|
xml2 = subprocess.check_output( ['pkg-config', '--cflags', 'libxml-2.0'] ).decode( 'utf-8' )
|
||||||
except subprocess.CalledProcessError as cpe:
|
except subprocess.CalledProcessError as cpe:
|
||||||
print( 'xml2-config failed with error code {} and output:{}'.format( cpe.returncode, cpe.output ) )
|
print( 'pkg-config could not find libxml-2.0: failed with error code {} and output:{}'.format( cpe.returncode, cpe.output ) )
|
||||||
assert( False )
|
assert( False )
|
||||||
env.ParseConfig( 'xml2-config --libs' )
|
env.ParseConfig( 'pkg-config --libs libxml-2.0' )
|
||||||
#Need to strip on xml2-config output. It has a stray \n and that completely screws up scons calling g++
|
#Need to strip on xml2-config output. It has a stray \n and that completely screws up scons calling g++
|
||||||
baseflags = [ '-pipe', '-Wall', '-fmessage-length=0', '-fvisibility=hidden', xml2.strip().split( ' ' ) ]
|
baseflags = [ '-pipe', '-Wall', '-fmessage-length=0', '-fvisibility=hidden', xml2.strip().split( ' ' ) ]
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue