From b6678d72aec7fa7d5d39d3c21083c6b05b2673ee Mon Sep 17 00:00:00 2001 From: lethosor Date: Sat, 20 Jul 2019 14:26:30 -0400 Subject: [PATCH] Move custom lualimit.h to lua dir and rename to dfhack_llimits.h --- depends/lua/CMakeLists.txt | 5 ++--- depends/{lualimit.h => lua/include/dfhack_llimits.h} | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) rename depends/{lualimit.h => lua/include/dfhack_llimits.h} (98%) diff --git a/depends/lua/CMakeLists.txt b/depends/lua/CMakeLists.txt index 97b62dca6..fd3a59c08 100644 --- a/depends/lua/CMakeLists.txt +++ b/depends/lua/CMakeLists.txt @@ -95,11 +95,10 @@ LIST(APPEND SRC_LIBLUA ${HDR_LIBLUA}) ADD_LIBRARY ( lua SHARED ${SRC_LIBLUA} ) TARGET_LINK_LIBRARIES ( lua ${LIBS}) -target_include_directories(lua PRIVATE ../) if (MSVC) - target_compile_options(lua PRIVATE /FI lualimit.h) + target_compile_options(lua PRIVATE /FI dfhack_llimits.h) else () - target_compile_options(lua PRIVATE -include lualimit.h) + target_compile_options(lua PRIVATE -include dfhack_llimits.h) endif () install(TARGETS lua diff --git a/depends/lualimit.h b/depends/lua/include/dfhack_llimits.h similarity index 98% rename from depends/lualimit.h rename to depends/lua/include/dfhack_llimits.h index 009501cce..f8ca51819 100644 --- a/depends/lualimit.h +++ b/depends/lua/include/dfhack_llimits.h @@ -31,7 +31,7 @@ redistribute it freely, subject to the following restrictions: #include -/*! \file lualimit.h +/*! \file dfhack_llimits.h * dfhack specific lua porting header that overrides lua defaults for thread * safety. */