diff --git a/CMakeLists.txt b/CMakeLists.txt index daef731b..7d19d4de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ set(LIBS_DOWNLOAD_SRC_DIR ${PROJECT_BINARY_DIR}/downloads/src) # keep this check in sync with the external libs build commands if (UNIX AND (BUNDLED_OGG_VORBIS OR BUNDLED_OPENSSL OR BUNDLED_LUA)) - find_program(MAKE NAMES gmake make mingw32-make REQUIRED) + find_program(MAKE NAMES make gmake mingw32-make REQUIRED) endif() # note/FIXME/clarify: @@ -898,7 +898,7 @@ if(BUNDLED_LUA AND BUILD_MOD) URL "${CMAKE_CURRENT_LIST_DIR}/lua" BUILD_BYPRODUCTS ${LUA_BUNDLED_LIBRARIES} CONFIGURE_COMMAND ${MAKE} -C clean - BUILD_COMMAND ${CROSS_COMPILE32_FLAGS} ${MAKE} -C ${LUA_MAKE_TARGET} + BUILD_COMMAND ${LIBS_COMPILE_FLAGS} ${MAKE} -C ${LUA_MAKE_TARGET} INSTALL_COMMAND ${MAKE} -C "INSTALL_TOP=" install BUILD_IN_SOURCE 1 )