ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build fixes for RHEL8 systems. CheckLibWithHeader of minizip installation is failing so I resorted to a simpler pkg-config check. Fixed lua library check, include path and linker flag references.

This commit is contained in:
Matthew Budd 2020-05-02 14:31:19 -04:00
parent 16a965d15c
commit aaa432d0f4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SConstruct
View File

@ -97,7 +97,7 @@ else:
if conf.CheckFunc('asprintf'): if conf.CheckFunc('asprintf'):
conf.env.Append(CCFLAGS = "-DHAVE_ASPRINTF") conf.env.Append(CCFLAGS = "-DHAVE_ASPRINTF")
if env['SYSTEM_MINIZIP']: if env['SYSTEM_MINIZIP']:
assert conf.CheckLibWithHeader('minizip', 'minizip/unzip.h', 'C', 'unzOpen;', 1), "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 conf.CheckLibWithHeader('z', 'zlib.h', 'c', 'inflate;', 1), "please install: zlib"
env.Append(CPPDEFINES=["_SYSTEM_MINIZIP"]) env.Append(CPPDEFINES=["_SYSTEM_MINIZIP"])
else: else:
@ -153,6 +153,9 @@ else:
elif conf.CheckLib('lua5.1'): elif conf.CheckLib('lua5.1'):
lua_link_flags = "-llua5.1" lua_link_flags = "-llua5.1"
lua_include_dir = "/usr/include/lua5.1" lua_include_dir = "/usr/include/lua5.1"
elif conf.CheckLib('lua-5.1'):
lua_link_flags = "-llua-5.1"
lua_include_dir = "/usr/include/lua-5.1"
elif conf.CheckLib('lua'): elif conf.CheckLib('lua'):
lua_link_flags = "-llua" lua_link_flags = "-llua"
lua_include_dir = "/usr/include/lua" lua_include_dir = "/usr/include/lua"