From 815bb17644746bd59736250540f8e28ed3fe7213 Mon Sep 17 00:00:00 2001 From: mjbudd77 Date: Fri, 7 Aug 2020 10:00:22 -0400 Subject: [PATCH] Modified SConstruct to use more reliable pkg-config. --- SConstruct | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SConstruct b/SConstruct index 97b30bce..5d97b46c 100644 --- a/SConstruct +++ b/SConstruct @@ -98,16 +98,16 @@ else: conf.env.Append(CCFLAGS = "-DHAVE_ASPRINTF") if env['SYSTEM_MINIZIP']: 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"]) 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 not conf.CheckLib('SDL2'): - print('Did not find libSDL2 or SDL2.lib, exiting!') - Exit(1) + assert env.ParseConfig('pkg-config sdl2 --cflags --libs'), "please install: sdl2" env.Append(CPPDEFINES=["_SDL2"]) - env.ParseConfig('pkg-config sdl2 --cflags --libs') + #env.ParseConfig('pkg-config sdl2 --cflags --libs') else: if not conf.CheckLib('SDL'): print('Did not find libSDL or SDL.lib, exiting!')