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

Merge pull request #249 from mjbudd77/master 

Bug fix for cmake pkg-config search for lua 5.1 package. Ubuntu packa…
This commit is contained in:
mjbudd77 2020-11-29 00:08:07 -05:00 committed by GitHub
parent f53fbf3de2 ca005b498b
commit c7903e2129
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/CMakeLists.txt
View File

@ -85,10 +85,12 @@ else(WIN32)
endif() endif()
# Check for LUA # Check for LUA
pkg_check_modules( LUA lua-5.1) pkg_search_module( LUA lua5.1 lua-5.1 )
if ( ${LUA_FOUND} ) if ( ${LUA_FOUND} )
# Use System LUA # Use System LUA
message( STATUS "Using System Lua ${LUA_VERSION}" )
add_definitions( -D_S9XLUA_H ${LUA_CFLAGS} ) add_definitions( -D_S9XLUA_H ${LUA_CFLAGS} )
set( LUA_ENGINE_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/lua-engine.cpp ) set( LUA_ENGINE_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/lua-engine.cpp )
@ -96,6 +98,8 @@ else(WIN32)
else () else ()
# Use Internal LUA # Use Internal LUA
message( STATUS "Using Internal Lua" )
add_definitions( -D_S9XLUA_H -I${CMAKE_CURRENT_SOURCE_DIR}/lua/src ) add_definitions( -D_S9XLUA_H -I${CMAKE_CURRENT_SOURCE_DIR}/lua/src )
set( LUA_ENGINE_SOURCE set( LUA_ENGINE_SOURCE