Modified SConstruct to use more reliable pkg-config.
This commit is contained in:
parent
27875aac17
commit
815bb17644
12
SConstruct
12
SConstruct
|
@ -98,16 +98,16 @@ else:
|
||||||
conf.env.Append(CCFLAGS = "-DHAVE_ASPRINTF")
|
conf.env.Append(CCFLAGS = "-DHAVE_ASPRINTF")
|
||||||
if env['SYSTEM_MINIZIP']:
|
if env['SYSTEM_MINIZIP']:
|
||||||
assert env.ParseConfig('pkg-config minizip --cflags --libs'), "please install: libminizip"
|
assert env.ParseConfig('pkg-config minizip --cflags --libs'), "please install: libminizip"
|
||||||
assert conf.CheckLibWithHeader('z', 'zlib.h', 'c', 'inflate;', 1), "please install: zlib"
|
assert env.ParseConfig('pkg-config zlib --cflags --libs'), "please install: zlib"
|
||||||
|
#assert conf.CheckLibWithHeader('z', 'zlib.h', 'c', 'inflate;', 1), "please install: zlib"
|
||||||
env.Append(CPPDEFINES=["_SYSTEM_MINIZIP"])
|
env.Append(CPPDEFINES=["_SYSTEM_MINIZIP"])
|
||||||
else:
|
else:
|
||||||
assert conf.CheckLibWithHeader('z', 'zlib.h', 'c', 'inflate;', 1), "please install: zlib"
|
assert env.ParseConfig('pkg-config zlib --cflags --libs'), "please install: zlib"
|
||||||
|
#assert conf.CheckLibWithHeader('z', 'zlib.h', 'c', 'inflate;', 1), "please install: zlib"
|
||||||
if env['SDL2']:
|
if env['SDL2']:
|
||||||
if not conf.CheckLib('SDL2'):
|
assert env.ParseConfig('pkg-config sdl2 --cflags --libs'), "please install: sdl2"
|
||||||
print('Did not find libSDL2 or SDL2.lib, exiting!')
|
|
||||||
Exit(1)
|
|
||||||
env.Append(CPPDEFINES=["_SDL2"])
|
env.Append(CPPDEFINES=["_SDL2"])
|
||||||
env.ParseConfig('pkg-config sdl2 --cflags --libs')
|
#env.ParseConfig('pkg-config sdl2 --cflags --libs')
|
||||||
else:
|
else:
|
||||||
if not conf.CheckLib('SDL'):
|
if not conf.CheckLib('SDL'):
|
||||||
print('Did not find libSDL or SDL.lib, exiting!')
|
print('Did not find libSDL or SDL.lib, exiting!')
|
||||||
|
|
Loading…
Reference in New Issue