Merge pull request #15999 from famiu/fix/build/export-windows-symbols

fix(build): export symbols on Windows
This commit is contained in:
Björn Linse
2021-10-17 23:58:14 +02:00
committed by GitHub
3 changed files with 76 additions and 1 deletions

View File

@@ -16,6 +16,7 @@ local ws = S(' \t') + nl
local fill = ws ^ 0
local c_comment = P('//') * (not_nl ^ 0)
local c_preproc = P('#') * (not_nl ^ 0)
local dllexport = P('DLLEXPORT') * (ws ^ 1)
local typed_container =
(P('ArrayOf(') + P('DictionaryOf(') + P('Dict(')) * ((any - P(')')) ^ 1) * P(')')
local c_id = (
@@ -33,6 +34,7 @@ local c_param = Ct(c_param_type * C(c_id))
local c_param_list = c_param * (fill * (P(',') * fill * c_param) ^ 0)
local c_params = Ct(c_void + c_param_list)
local c_proto = Ct(
(dllexport ^ -1) *
Cg(c_type, 'return_type') * Cg(c_id, 'name') *
fill * P('(') * fill * Cg(c_params, 'parameters') * fill * P(')') *
Cg(Cc(false), 'fast') *

View File

@@ -216,7 +216,16 @@ local footer = [[
#include "nvim/func_attr.h"
]]
local non_static = header
local non_static = header .. [[
#ifndef DLLEXPORT
# ifdef WIN32
# define DLLEXPORT __declspec(dllexport)
# else
# define DLLEXPORT
# endif
#endif
]]
local static = header
local filepattern = '^#%a* (%d+) "([^"]-)/?([^"/]+)"'
@@ -269,6 +278,7 @@ while init ~= nil do
declaration = declaration:gsub(' $', '')
declaration = declaration:gsub('^ ', '')
declaration = declaration .. ';'
if os.getenv('NVIM_GEN_DECLARATIONS_LINE_NUMBERS') == '1' then
declaration = declaration .. (' // %s/%s:%u'):format(
curdir, curfile, declline)
@@ -277,6 +287,7 @@ while init ~= nil do
if declaration:sub(1, 6) == 'static' then
static = static .. declaration
else
declaration = 'DLLEXPORT ' .. declaration
non_static = non_static .. declaration
end
declendpos = e