diff --git a/.vsconfig b/.vsconfig new file mode 100644 index 0000000..852516b --- /dev/null +++ b/.vsconfig @@ -0,0 +1,77 @@ +{ + "version": "1.0", + "components": [ + "Microsoft.VisualStudio.Component.CoreEditor", + "Microsoft.VisualStudio.Workload.CoreEditor", + "Microsoft.NetCore.Component.Runtime.5.0", + "Microsoft.NetCore.Component.Runtime.3.1", + "Microsoft.NetCore.Component.SDK", + "Microsoft.VisualStudio.Component.NuGet", + "Microsoft.Net.Component.4.6.1.TargetingPack", + "Microsoft.VisualStudio.Component.Roslyn.Compiler", + "Microsoft.VisualStudio.Component.Roslyn.LanguageServices", + "Microsoft.VisualStudio.Component.FSharp", + "Microsoft.ComponentGroup.ClickOnce.Publish", + "Microsoft.NetCore.Component.DevelopmentTools", + "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions", + "Microsoft.Net.Component.4.8.SDK", + "Microsoft.Net.Component.4.7.2.TargetingPack", + "Microsoft.Net.ComponentGroup.DevelopmentPrerequisites", + "Microsoft.VisualStudio.Component.TypeScript.4.1", + "Microsoft.VisualStudio.Component.JavaScript.TypeScript", + "Microsoft.VisualStudio.Component.JavaScript.Diagnostics", + "Microsoft.Component.MSBuild", + "Microsoft.VisualStudio.Component.TextTemplating", + "Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime", + "Microsoft.VisualStudio.Component.SQL.CLR", + "Microsoft.VisualStudio.Component.MSODBC.SQL", + "Microsoft.VisualStudio.Component.ManagedDesktop.Core", + "Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd", + "Microsoft.VisualStudio.Component.DiagnosticTools", + "Microsoft.VisualStudio.Component.LiveUnitTesting", + "Microsoft.VisualStudio.Component.WebDeploy", + "Microsoft.VisualStudio.Component.Debugger.JustInTime", + "Component.Microsoft.VisualStudio.LiveShare", + "Microsoft.VisualStudio.Component.WslDebugging", + "Microsoft.VisualStudio.Component.IntelliCode", + "Microsoft.Net.Component.4.8.TargetingPack", + "Microsoft.VisualStudio.Component.ClassDesigner", + "Microsoft.VisualStudio.Component.GraphDocument", + "Microsoft.VisualStudio.Component.CodeMap", + "Microsoft.VisualStudio.Component.VC.CoreIde", + "Microsoft.VisualStudio.Component.Windows10SDK", + "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.Graphics.Tools", + "Microsoft.VisualStudio.Component.VC.DiagnosticTools", + "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites", + "Microsoft.VisualStudio.Workload.ManagedDesktop", + "Microsoft.VisualStudio.Component.VC.Redist.14.Latest", + "Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native", + "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", + "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake", + "Microsoft.VisualStudio.Component.VC.CMake.Project", + "Microsoft.VisualStudio.Component.VC.ATL", + "Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest", + "Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest", + "Microsoft.VisualStudio.Component.VC.ATLMFC", + "Microsoft.VisualStudio.Component.VC.ASAN", + "Microsoft.VisualStudio.Workload.NativeDesktop", + "Component.OpenJDK", + "Microsoft.VisualStudio.Component.MonoDebugger", + "Microsoft.VisualStudio.Component.Merq", + "Component.Xamarin.RemotedSimulator", + "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine", + "Component.Xamarin", + "Microsoft.VisualStudio.Workload.NetCrossPlat", + "Component.Android.SDK25.Private", + "Component.Android.NDK.R16B", + "Component.Ant", + "Component.MDD.Android", + "Component.MDD.IOS", + "Microsoft.VisualStudio.Workload.NativeMobile", + "Microsoft.Component.HelpViewer", + "Microsoft.VisualStudio.Component.Git", + "Microsoft.VisualStudio.Component.VisualStudioData" + ] +} \ No newline at end of file diff --git a/GGELUA/Debug32/创建联接目录.bat b/GGELUA/Debug32/创建联接目录.bat index 08a76b0..2847318 100644 --- a/GGELUA/Debug32/创建联接目录.bat +++ b/GGELUA/Debug32/创建联接目录.bat @@ -1,9 +1,11 @@ @echo off -mkdir + rd lua /q mklink /j .\lua ..\Release64\lua rd ʵ /q mklink /j .\ʵ ..\Release64\ʵ +rd /q +mklink /j .\ ..\Release64\ copy /y ..\Release64\build.lua .\build.lua copy /y ..\Release64\ggelua.lua .\ggelua.lua diff --git a/GGELUA/Debug64/创建联接目录.bat b/GGELUA/Debug64/创建联接目录.bat index e6eb5f3..2847318 100644 --- a/GGELUA/Debug64/创建联接目录.bat +++ b/GGELUA/Debug64/创建联接目录.bat @@ -4,6 +4,8 @@ rd lua /q mklink /j .\lua ..\Release64\lua rd ʵ /q mklink /j .\ʵ ..\Release64\ʵ +rd /q +mklink /j .\ ..\Release64\ copy /y ..\Release64\build.lua .\build.lua copy /y ..\Release64\ggelua.lua .\ggelua.lua diff --git a/GGELUA/Release32/创建联接目录.bat b/GGELUA/Release32/创建联接目录.bat index e6eb5f3..2847318 100644 --- a/GGELUA/Release32/创建联接目录.bat +++ b/GGELUA/Release32/创建联接目录.bat @@ -4,6 +4,8 @@ rd lua /q mklink /j .\lua ..\Release64\lua rd ʵ /q mklink /j .\ʵ ..\Release64\ʵ +rd /q +mklink /j .\ ..\Release64\ copy /y ..\Release64\build.lua .\build.lua copy /y ..\Release64\ggelua.lua .\ggelua.lua diff --git a/project/windows/dep/sqlite3/sqlite3.vcxproj b/project/windows/dep/sqlite3/sqlite3.vcxproj index a224290..a62e944 100644 --- a/project/windows/dep/sqlite3/sqlite3.vcxproj +++ b/project/windows/dep/sqlite3/sqlite3.vcxproj @@ -98,9 +98,7 @@ Windows true - - copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"dependent\library\$(PlatformTarget)\$(TargetName)_$(Configuration).lib - + @@ -119,9 +117,7 @@ true true - - copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"dependent\library\$(PlatformTarget)\$(TargetName)_$(Configuration).lib - + @@ -129,18 +125,14 @@ _CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;CODEC_TYPE=$(CODEC_TYPE);SQLITE_ENABLE_DEBUG=$(SQLITE_ENABLE_DEBUG);SQLITE_THREADSAFE=1;SQLITE_DQS=0;SQLITE_MAX_ATTACHED=10;SQLITE_ENABLE_EXPLAIN_COMMENTS=1;SQLITE_SOUNDEX=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_SECURE_DELETE=1;SQLITE_ENABLE_DESERIALIZE=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_FTS3_PARENTHESIS=1;SQLITE_ENABLE_FTS4=1;SQLITE_ENABLE_FTS5=1;SQLITE_ENABLE_JSON1=1;SQLITE_ENABLE_RTREE=1;SQLITE_ENABLE_GEOPOLY=1;SQLITE_CORE=1;SQLITE_ENABLE_EXTFUNC=1;SQLITE_ENABLE_MATH_FUNCTIONS=1;SQLITE_ENABLE_CSV=1;SQLITE_ENABLE_VSV=1;SQLITE_ENABLE_CARRAY=1;SQLITE_ENABLE_UUID=1;SQLITE_ENABLE_REGEXP=1;SQLITE_TEMP_STORE=2;SQLITE_USE_URI=1;SQLITE_USER_AUTHENTICATION=1;SQLITE_ENABLE_DBPAGE_VTAB=1;SQLITE_ENABLE_DBSTAT_VTAB=1;SQLITE_ENABLE_STMTVTAB=1;SQLITE_ENABLE_UNKNOWN_SQL_FUNCTION=1;_MBCS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) Disabled - - copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"dependent\library\$(PlatformTarget)\$(TargetName)_$(Configuration).lib - + MultiThreaded _CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;CODEC_TYPE=$(CODEC_TYPE);SQLITE_ENABLE_DEBUG=$(SQLITE_ENABLE_DEBUG);SQLITE_THREADSAFE=1;SQLITE_DQS=0;SQLITE_MAX_ATTACHED=10;SQLITE_ENABLE_EXPLAIN_COMMENTS=1;SQLITE_SOUNDEX=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_SECURE_DELETE=1;SQLITE_ENABLE_DESERIALIZE=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_FTS3_PARENTHESIS=1;SQLITE_ENABLE_FTS4=1;SQLITE_ENABLE_FTS5=1;SQLITE_ENABLE_JSON1=1;SQLITE_ENABLE_RTREE=1;SQLITE_ENABLE_GEOPOLY=1;SQLITE_CORE=1;SQLITE_ENABLE_EXTFUNC=1;SQLITE_ENABLE_MATH_FUNCTIONS=1;SQLITE_ENABLE_CSV=1;SQLITE_ENABLE_VSV=1;SQLITE_ENABLE_CARRAY=1;SQLITE_ENABLE_UUID=1;SQLITE_ENABLE_REGEXP=1;SQLITE_TEMP_STORE=2;SQLITE_USE_URI=1;SQLITE_USER_AUTHENTICATION=1;SQLITE_ENABLE_DBPAGE_VTAB=1;SQLITE_ENABLE_DBSTAT_VTAB=1;SQLITE_ENABLE_STMTVTAB=1;SQLITE_ENABLE_UNKNOWN_SQL_FUNCTION=1;_MBCS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) - - copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"dependent\library\$(PlatformTarget)\$(TargetName)_$(Configuration).lib - + diff --git a/project/windows/dep/zlib/zlib.vcxproj b/project/windows/dep/zlib/zlib.vcxproj index 8bd0003..a1052df 100644 --- a/project/windows/dep/zlib/zlib.vcxproj +++ b/project/windows/dep/zlib/zlib.vcxproj @@ -103,9 +103,7 @@ /MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions) true - - copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"dependent\library\$(PlatformTarget)\$(TargetName)_$(Configuration).lib - + @@ -128,9 +126,7 @@ /MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions) true - - copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"dependent\library\$(PlatformTarget)\$(TargetName)_$(Configuration).lib - + @@ -155,9 +151,7 @@ /MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions) true - - copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"dependent\library\$(PlatformTarget)\$(TargetName)_$(Configuration).lib - + @@ -183,9 +177,7 @@ /MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions) true - - copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"dependent\library\$(PlatformTarget)\$(TargetName)_$(Configuration).lib - + diff --git a/project/windows/lua/lua.vcxproj b/project/windows/lua/lua.vcxproj index 36cb90f..19d3267 100644 --- a/project/windows/lua/lua.vcxproj +++ b/project/windows/lua/lua.vcxproj @@ -91,8 +91,7 @@ copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"GGELUA\$(Configuration)$(PlatformArchitecture)\$(TargetFileName) -copy /y "$(OutDir)"$(TargetName).lib "$(SolutionDir)"dependent\library\$(PlatformTarget)\$(TargetName)_$(Configuration).lib -copy /y "$(OutDir)"$(TargetName).lib "$(SolutionDir)"GGELUA\Release$(PlatformArchitecture)\\插件开发\library\$(TargetName)_$(Configuration).lib +copy /y "$(OutDir)"$(TargetName).lib "$(SolutionDir)"GGELUA\Release64\插件开发\library\$(TargetName)_$(Configuration).lib @@ -109,8 +108,7 @@ copy /y "$(OutDir)"$(TargetName).lib "$(SolutionDir)"GGELUA\Release$(PlatformArc copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"GGELUA\$(Configuration)$(PlatformArchitecture)\$(TargetFileName) -copy /y "$(OutDir)"$(TargetName).lib "$(SolutionDir)"dependent\library\$(PlatformTarget)\$(TargetName)_$(Configuration).lib -copy /y "$(OutDir)"$(TargetName).lib "$(SolutionDir)"GGELUA\Release$(PlatformArchitecture)\\插件开发\library\$(TargetName)_$(Configuration).lib +copy /y "$(OutDir)"$(TargetName).lib "$(SolutionDir)"GGELUA\Release64\插件开发\library\$(TargetName)_$(Configuration).lib @@ -125,8 +123,7 @@ copy /y "$(OutDir)"$(TargetName).lib "$(SolutionDir)"GGELUA\Release$(PlatformArc copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"GGELUA\$(Configuration)$(PlatformArchitecture)\$(TargetFileName) -copy /y "$(OutDir)"$(TargetName).lib "$(SolutionDir)"dependent\library\$(PlatformTarget)\$(TargetName)_$(Configuration).lib -copy /y "$(OutDir)"$(TargetName).lib "$(SolutionDir)"GGELUA\Release$(PlatformArchitecture)\\插件开发\library\$(TargetName)_$(Configuration).lib +copy /y "$(OutDir)"$(TargetName).lib "$(SolutionDir)"GGELUA\Release64\插件开发\library\$(TargetName)_$(Configuration).lib @@ -143,8 +140,7 @@ copy /y "$(OutDir)"$(TargetName).lib "$(SolutionDir)"GGELUA\Release$(PlatformArc copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"GGELUA\$(Configuration)$(PlatformArchitecture)\$(TargetFileName) -copy /y "$(OutDir)"$(TargetName).lib "$(SolutionDir)"dependent\library\$(PlatformTarget)\$(TargetName)_$(Configuration).lib -copy /y "$(OutDir)"$(TargetName).lib "$(SolutionDir)"GGELUA\Release$(PlatformArchitecture)\\插件开发\library\$(TargetName)_$(Configuration).lib +copy /y "$(OutDir)"$(TargetName).lib "$(SolutionDir)"GGELUA\Release64\插件开发\library\$(TargetName)_$(Configuration).lib