diff --git a/plugins/luamacro/luafar3.vcxproj b/plugins/luamacro/luafar3.vcxproj
index 775c9cc2b1..04479534a2 100644
--- a/plugins/luamacro/luafar3.vcxproj
+++ b/plugins/luamacro/luafar3.vcxproj
@@ -46,6 +46,12 @@
true
Unicode
+
+ v100
+ v110
+ v120
+ v140
+
@@ -67,29 +73,29 @@
false
- ..\..\unicode_far\Debug.32.vc\
- debug.32W.vc\obj\
+ ..\..\unicode_far\Debug.32.v$(VisualStudioVersion)\
+ debug.32W.v$(VisualStudioVersion)\obj_luafar3\
false
false
false
- ..\..\unicode_far\Debug.64.vc\
- debug.64W.vc\obj\
+ ..\..\unicode_far\Debug.64.v$(VisualStudioVersion)\
+ debug.64W.v$(VisualStudioVersion)\obj_luafar3\
false
false
false
- final.32W.vc\obj\
- ..\..\unicode_far\Release.32.vc\
+ final.32W.v$(VisualStudioVersion)\obj_luafar3\
+ ..\..\unicode_far\Release.32.v$(VisualStudioVersion)\
false
false
false
- ..\..\unicode_far\Release.64.vc\
- final.64W.vc\obj\
+ ..\..\unicode_far\Release.64.v$(VisualStudioVersion)\
+ final.64W.v$(VisualStudioVersion)\obj_luafar3\
false
false
@@ -106,6 +112,8 @@
MultiThreadedDebug
Cdecl
Default
+ NoExtensions
+ /Zc:threadSafeInit- %(AdditionalOptions)
Windows
@@ -142,6 +150,7 @@
MultiThreadedDebug
Cdecl
Default
+ /Zc:threadSafeInit- %(AdditionalOptions)
Windows
@@ -179,6 +188,9 @@
MultiThreaded
Cdecl
Default
+ None
+ NoExtensions
+ /Zc:threadSafeInit- %(AdditionalOptions)
Windows
@@ -218,6 +230,8 @@
MultiThreaded
Cdecl
Default
+ None
+ /Zc:threadSafeInit- %(AdditionalOptions)
Windows
diff --git a/plugins/luamacro/luamacro.vcxproj b/plugins/luamacro/luamacro.vcxproj
index 7ec1e64c2e..56e3e93cfb 100644
--- a/plugins/luamacro/luamacro.vcxproj
+++ b/plugins/luamacro/luamacro.vcxproj
@@ -46,6 +46,12 @@
true
Unicode
+
+ v100
+ v110
+ v120
+ v140
+
@@ -67,29 +73,29 @@
false
- debug.32W.vc\
- debug.32W.vc\obj\
+ debug.32W.v$(VisualStudioVersion)\
+ debug.32W.v$(VisualStudioVersion)\obj_luamacro\
false
false
false
- debug.64W.vc\
- debug.64W.vc\obj\
+ debug.64W.v$(VisualStudioVersion)\
+ debug.64W.v$(VisualStudioVersion)\obj_luamacro\
false
false
false
- final.32W.vc\obj\
- final.32W.vc\
+ final.32W.v$(VisualStudioVersion)\obj_luamacro\
+ final.32W.v$(VisualStudioVersion)\
false
false
false
- final.64W.vc\
- final.64W.vc\obj\
+ final.64W.v$(VisualStudioVersion)\
+ final.64W.v$(VisualStudioVersion)\obj_luamacro\
false
false
@@ -99,19 +105,21 @@
Level3
Disabled
EXPORT_OPEN;EXPORT_EXITFAR;EXPORT_PROCESSEDITOREVENT;EXPORT_PROCESSEDITORINPUT;EXPORT_PROCESSCONSOLEINPUT;EXPORT_PROCESSVIEWEREVENT;EXPORT_PROCESSDIALOGEVENT;EXPORT_CONFIGURE;RUN_LUAFAR_INIT;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- ../common;../common/unicode;luasdk/include;%(AdditionalIncludeDirectories)
+ ../common/unicode;luasdk/include;%(AdditionalIncludeDirectories)
4996
ProgramDatabase
false
MultiThreadedDebug
Cdecl
Default
+ NoExtensions
+ /Zc:threadSafeInit- %(AdditionalOptions)
Windows
true
lua51.lib;luafar3.lib;kernel32.lib;user32.lib;advapi32.lib;rpcrt4.lib;%(AdditionalDependencies)
- ..\..\unicode_far\Debug.32.vc;luasdk/32
+ ..\..\unicode_far\Debug.32.v$(VisualStudioVersion);luasdk/32
true
luamacroW.vc.def
@@ -141,12 +149,13 @@
MultiThreadedDebug
Cdecl
Default
+ /Zc:threadSafeInit- %(AdditionalOptions)
Windows
true
lua51.lib;luafar3.lib;kernel32.lib;user32.lib;advapi32.lib;rpcrt4.lib;%(AdditionalDependencies)
- ../../unicode_far/Debug.64.vc;luasdk/64
+ ../../unicode_far/Debug.64.v$(VisualStudioVersion);luasdk/64
true
luamacroW.vc.def
@@ -171,12 +180,15 @@
true
true
EXPORT_OPEN;EXPORT_EXITFAR;EXPORT_PROCESSEDITOREVENT;EXPORT_PROCESSEDITORINPUT;EXPORT_PROCESSCONSOLEINPUT;EXPORT_PROCESSVIEWEREVENT;EXPORT_PROCESSDIALOGEVENT;EXPORT_CONFIGURE;RUN_LUAFAR_INIT;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- ../common;../common/unicode;luasdk/include;%(AdditionalIncludeDirectories)
+ ../common/unicode;luasdk/include;%(AdditionalIncludeDirectories)
4996
false
MultiThreaded
Cdecl
Default
+ None
+ NoExtensions
+ /Zc:threadSafeInit- %(AdditionalOptions)
Windows
@@ -184,7 +196,7 @@
true
true
lua51.lib;luafar3.lib;kernel32.lib;user32.lib;advapi32.lib;rpcrt4.lib;%(AdditionalDependencies)
- ..\..\unicode_far\Release.32.vc;luasdk/32
+ ..\..\unicode_far\Release.32.v$(VisualStudioVersion);luasdk/32
true
luamacroW.vc.def
@@ -215,6 +227,8 @@
MultiThreaded
Cdecl
Default
+ None
+ /Zc:threadSafeInit- %(AdditionalOptions)
Windows
@@ -222,7 +236,7 @@
true
true
lua51.lib;luafar3.lib;kernel32.lib;user32.lib;advapi32.lib;rpcrt4.lib;%(AdditionalDependencies)
- ..\..\unicode_far\Release.64.vc;luasdk/64
+ ..\..\unicode_far\Release.64.v$(VisualStudioVersion);luasdk/64
true
luamacroW.vc.def