From ad2aa15e42eb8419fa2250b347908014a7447cc7 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Mon, 21 Oct 2024 09:39:11 -0400 Subject: [PATCH] Remove libgit from projects --- BeefBuild/BeefProj.toml | 4 ++-- IDE/BeefProj.toml | 6 ++++-- IDE/BeefSpace.toml | 10 +++------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/BeefBuild/BeefProj.toml b/BeefBuild/BeefProj.toml index 9c01cf5b..38960488 100644 --- a/BeefBuild/BeefProj.toml +++ b/BeefBuild/BeefProj.toml @@ -1,5 +1,5 @@ FileVersion = 1 -Dependencies = {Beefy2D = "*", corlib = "*", libgit2 = "*"} +Dependencies = {Beefy2D = "*", corlib = "*"} [Project] Name = "BeefBuild" @@ -19,7 +19,7 @@ TargetName = "$(ProjectName)_d" OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib Rpcrt4.lib Ole32.lib" CLibType = "Dynamic" BeefLibType = "DynamicDebug" -DebugCommandArguments = "-proddir=c:\\Beef\\IDE -config=Debug2" +DebugCommandArguments = "-proddir=c:\\proj\\BeefTest update BeefProj1" DebugWorkingDirectory = "c:\\beef\\ide" EnvironmentVars = ["_NO_DEBUG_HEAP=1"] PreprocessorMacros = ["DEBUG", "CLI"] diff --git a/IDE/BeefProj.toml b/IDE/BeefProj.toml index ddd04a3e..31a748ca 100644 --- a/IDE/BeefProj.toml +++ b/IDE/BeefProj.toml @@ -1,5 +1,5 @@ FileVersion = 1 -Dependencies = {Beefy2D = "*", corlib = "*", curl = "*", libgit2 = "*"} +Dependencies = {Beefy2D = "*", corlib = "*", curl = "*"} [Project] Name = "IDE" @@ -27,6 +27,7 @@ OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib DebugCommandArguments = "-proddir=\"$(WorkspaceDir)\\..\\BeefBuild\"" DebugWorkingDirectory = "$(WorkspaceDir)\\.." EnvironmentVars = ["_NO_DEBUG_HEAP=1"] +PreprocessorMacros = ["DEBUG,HASGIT"] [Configs.Release.Win32] TargetName = "" @@ -36,9 +37,10 @@ OtherLinkFlags = "" TargetDirectory = "$(WorkspaceDir)/dist" TargetName = "BeefIDE" OtherLinkFlags = "Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib Beef042RT64.lib IDEHelper64.lib BeefySysLib64.lib" -DebugCommandArguments = "-workspace=C:\\proj\\BeefTest" +DebugCommandArguments = "-proddir=C:\\Beef\\IDE\\Tests\\Test1 -test=scripts\\Enums.txt -testNoExit" DebugWorkingDirectory = "$(ProjectDir)\\dist" EnvironmentVars = ["_NO_DEBUG_HEAP=1"] +PreprocessorMacros = ["RELEASE,HASGIT"] [Configs.Debug2.Win32] TargetName = "" diff --git a/IDE/BeefSpace.toml b/IDE/BeefSpace.toml index edc7e178..9831a0f8 100644 --- a/IDE/BeefSpace.toml +++ b/IDE/BeefSpace.toml @@ -1,6 +1,6 @@ FileVersion = 1 -Projects = {IDE = {Path = "."}, Beefy2D = {Path = "../BeefLibs/Beefy2D"}, IDEHelper = {Path = "../IDEHelper"}, Debugger64 = {Path = "../Debugger64"}, BeefySysLib = {Path = "../BeefySysLib"}, curl = {Path = "../BeefLibs/curl"}, libgit2 = "*"} -Unlocked = ["corlib", "libgit2"] +Projects = {IDE = {Path = "."}, Beefy2D = {Path = "../BeefLibs/Beefy2D"}, IDEHelper = {Path = "../IDEHelper"}, Debugger64 = {Path = "../Debugger64"}, BeefySysLib = {Path = "../BeefySysLib"}, curl = {Path = "../BeefLibs/curl"}} +Unlocked = ["corlib"] [Workspace] StartupProject = "IDE" @@ -22,10 +22,8 @@ AllocStackTraceDepth = 0 ConfigSelections = {IDEHelper = {Enabled = false}} [Configs.Release.Win64] -Toolset = "LLVM" BfOptimizationLevel = "O3" AllocStackTraceDepth = 0 -IntermediateType = "ObjectAndIRCode" [Configs.Debug-IDE.Win32] EmitDebugInfo = "No" @@ -56,8 +54,7 @@ ConfigSelections = {Beefy2D = {Config = "Debug"}, IDEHelper = {Config = "Debug"} [Configs.Debug2.Win64] PreprocessorMacros = ["NEWFONT"] -IntermediateType = "ObjectAndIRCode" -ConfigSelections = {Beefy2D = {Config = "Debug"}, IDEHelper = {Config = "Debug"}, Debugger64 = {Config = "Debug"}, BeefySysLib = {Config = "Debug"}} +ConfigSelections = {Beefy2D = {Config = "Debug"}, IDEHelper = {Enabled = false, Config = "Debug"}, Debugger64 = {Enabled = false, Config = "Debug"}, BeefySysLib = {Enabled = false, Config = "Debug"}} [Configs.Paranoid.Win32] EmitDynamicCastCheck = false @@ -101,7 +98,6 @@ AllocStackTraceDepth = 0 [Configs.Debug3.Win64] BfOptimizationLevel = "O0" -IntermediateType = "ObjectAndIRCode" ConfigSelections = {Beefy2D = {Config = "Debug"}, IDEHelper = {Config = "Debug"}, Debugger64 = {Config = "Debug"}, BeefySysLib = {Config = "Debug"}} [Configs.Debug_NoDeps.Win32]