Browse Source

Remove libgit from projects

Brian Fiete 9 months ago
parent
commit
ad2aa15e42
3 changed files with 9 additions and 11 deletions
  1. 2 2
      BeefBuild/BeefProj.toml
  2. 4 2
      IDE/BeefProj.toml
  3. 3 7
      IDE/BeefSpace.toml

+ 2 - 2
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"]

+ 4 - 2
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 = ""

+ 3 - 7
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]