From b4e07d970f1a41e14e0185ed2b1f8c793eaa4f72 Mon Sep 17 00:00:00 2001 From: Li Jin Date: Wed, 21 Apr 2021 09:56:54 +0800 Subject: fix windows build. --- .gitattributes | 2 + .gitignore | 8 +- Yuescript.vcxproj | 130 +++++++++++++++---------------- Yuescript.vcxproj.filters | 192 +++++++++++++++++++++++----------------------- 4 files changed, 164 insertions(+), 168 deletions(-) diff --git a/.gitattributes b/.gitattributes index 79eebd7..ee06607 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,3 @@ src/3rdParty/* linguist-vendored +spec/lib/* linguist-vendored + diff --git a/.gitignore b/.gitignore index c28ce33..224cfe3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,10 +10,4 @@ bin .tup tup/*.lua tup/t/*.lua -src/lua/*.o -src/lua/*.a -src/lua/*.wasm -src/lua/lua -src/lua/luac -doc/docs/.vuepress/public/js/yuescript.js -doc/docs/.vuepress/public/js/yuescript.wasm +Yuescript.vcxproj.user diff --git a/Yuescript.vcxproj b/Yuescript.vcxproj index e284a4b..c02fcc9 100644 --- a/Yuescript.vcxproj +++ b/Yuescript.vcxproj @@ -101,7 +101,7 @@ _DEBUG;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions) true stdcpplatest - .\src;.\src\lua;%(AdditionalIncludeDirectories) + .\src;.\src\3rdParty;.\src\3rdParty\lua;%(AdditionalIncludeDirectories) /Zc:__cplusplus %(AdditionalOptions) @@ -116,7 +116,7 @@ _DEBUG;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions) true stdcpplatest - .\src;.\src\lua;%(AdditionalIncludeDirectories) + .\src;.\src\3rdParty;.\src\3rdParty\lua;%(AdditionalIncludeDirectories) /Zc:__cplusplus %(AdditionalOptions) @@ -133,7 +133,7 @@ NDEBUG;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions) true stdcpplatest - .\src;.\src\lua;%(AdditionalIncludeDirectories) + .\src;.\src\3rdParty;.\src\3rdParty\lua;%(AdditionalIncludeDirectories) /Zc:__cplusplus %(AdditionalOptions) @@ -152,7 +152,7 @@ NDEBUG;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions) true stdcpplatest - .\src;.\src\lua;%(AdditionalIncludeDirectories) + .\src;.\src\3rdParty;.\src\3rdParty\lua;%(AdditionalIncludeDirectories) /Zc:__cplusplus %(AdditionalOptions) @@ -163,38 +163,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -203,34 +203,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -242,4 +242,4 @@ - + \ No newline at end of file diff --git a/Yuescript.vcxproj.filters b/Yuescript.vcxproj.filters index 97385f3..8a7bf21 100644 --- a/Yuescript.vcxproj.filters +++ b/Yuescript.vcxproj.filters @@ -13,226 +13,226 @@ - + + src\yuescript + + + src\yuescript + + + src\yuescript + + + src\yuescript + + + src\yuescript + + + src + + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + + + src\yuescript - - + + src\yuescript - - + + src\yuescript - - + + src\yuescript - - + + src\yuescript - - - src - - - - - src - - src\lua + + src\yuescript - - src\lua + + src\yuescript - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - + src\lua - - src\yuescript - - - src\yuescript - - - src\yuescript - - - src\yuescript - - - src\yuescript + + src\lua - - src\yuescript + + src\lua - - src\yuescript + + src\lua \ No newline at end of file -- cgit v1.2.3-55-g6feb