From fddd3e0ba6e66d5f68d7d2c12f20f5bde3e88441 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Fri, 17 Jan 2025 10:20:20 -0800 Subject: [PATCH] BeefySysLib Release Static building --- BeefLibs/Beefy2D/BeefProj.toml | 5 +++++ IDE/BeefProj.toml | 20 ++++++++++---------- IDE/dist/IDE_CreateStable.bat | 3 +++ IDE/src/BuildContext.bf | 3 +-- bin/build.bat | 3 +++ 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/BeefLibs/Beefy2D/BeefProj.toml b/BeefLibs/Beefy2D/BeefProj.toml index 6a90b2be..f7bbe704 100644 --- a/BeefLibs/Beefy2D/BeefProj.toml +++ b/BeefLibs/Beefy2D/BeefProj.toml @@ -1,4 +1,5 @@ FileVersion = 1 +Dependencies = {corlib = "*", MiniZ = "*"} [Project] Name = "Beefy2D" @@ -50,3 +51,7 @@ OtherLinkFlags = "$(LinkFlags) \"$(ProjectDir)/dist/BeefySysLib64.lib\"" CLibType = "Static" BeefLibType = "Static" PostBuildCmds = ["CopyToDependents(\"$(ProjectDir)/dist/BeefySysLib64.dll\")", "CopyToDependents(\"$(ProjectDir)/dist/BeefySysLib64.pdb\")"] + +[Configs.Release_NoLink.Win32] +OtherLinkFlags = "" +PreprocessorMacros = ["RELEASE", "BF32"] diff --git a/IDE/BeefProj.toml b/IDE/BeefProj.toml index 31a748ca..7f58baa7 100644 --- a/IDE/BeefProj.toml +++ b/IDE/BeefProj.toml @@ -7,8 +7,8 @@ TargetType = "BeefGUIApplication" StartupObject = "IDE.Program" [Platform.Windows] -IconFile = "$(WorkspaceDir)/Resources/Beef.ico" -ManifestFile = "$(WorkspaceDir)/Resources/IDE.manifest" +IconFile = "$(ProjectDir)/Resources/Beef.ico" +ManifestFile = "$(ProjectDir)/Resources/IDE.manifest" Description = "Beef IDE" Company = "BeefyTech LLC" Product = "Beef IDE" @@ -21,11 +21,11 @@ TargetName = "" OtherLinkFlags = "" [Configs.Debug.Win64] -TargetDirectory = "$(WorkspaceDir)/dist" +TargetDirectory = "$(ProjectDir)/dist" TargetName = "BeefIDE_d" OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib" -DebugCommandArguments = "-proddir=\"$(WorkspaceDir)\\..\\BeefBuild\"" -DebugWorkingDirectory = "$(WorkspaceDir)\\.." +DebugCommandArguments = "-proddir=\"$(ProjectDir)\\..\\IDE_Ext\"" +DebugWorkingDirectory = "$(ProjectDir)\\.." EnvironmentVars = ["_NO_DEBUG_HEAP=1"] PreprocessorMacros = ["DEBUG,HASGIT"] @@ -34,7 +34,7 @@ TargetName = "" OtherLinkFlags = "" [Configs.Release.Win64] -TargetDirectory = "$(WorkspaceDir)/dist" +TargetDirectory = "$(ProjectDir)/dist" TargetName = "BeefIDE" OtherLinkFlags = "Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib Beef042RT64.lib IDEHelper64.lib BeefySysLib64.lib" DebugCommandArguments = "-proddir=C:\\Beef\\IDE\\Tests\\Test1 -test=scripts\\Enums.txt -testNoExit" @@ -47,16 +47,16 @@ TargetName = "" OtherLinkFlags = "" [Configs.Debug2.Win64] -TargetDirectory = "$(WorkspaceDir)/dist" +TargetDirectory = "$(ProjectDir)/dist" TargetName = "BeefIDE_d2" OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib BeefySysLib64_d.lib wsock32.lib" BeefLibType = "DynamicDebug" -DebugCommandArguments = "-proddir=C:\\proj\\BeefTest" +DebugCommandArguments = "-workspace=c:\\proj\\ShootGame" DebugWorkingDirectory = "c:\\Beef\\IDE\\Tests\\EmptyTest" EnvironmentVars = ["_NO_DEBUG_HEAP=1"] [Configs.Paranoid.Win64] -TargetDirectory = "$(WorkspaceDir)/dist" +TargetDirectory = "$(ProjectDir)/dist" TargetName = "BeefIDE_p" OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib BeefySysLib64_d.lib wsock32.lib" @@ -70,7 +70,7 @@ BeefLibType = "Static" BeefLibType = "Static" [Configs.Debug3.Win64] -TargetDirectory = "$(WorkspaceDir)/dist" +TargetDirectory = "$(ProjectDir)/dist" TargetName = "BeefIDE_d3" OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib BeefySysLib64_d.lib wsock32.lib" BeefLibType = "DynamicDebug" diff --git a/IDE/dist/IDE_CreateStable.bat b/IDE/dist/IDE_CreateStable.bat index 2754811f..03bc43db 100644 --- a/IDE/dist/IDE_CreateStable.bat +++ b/IDE/dist/IDE_CreateStable.bat @@ -8,6 +8,9 @@ IF %ERRORLEVEL% NEQ 0 GOTO FAILED @ECHO ---- Building BeefySysLib (Release) ---- CALL ../../bin/msbuild.bat ..\..\BeefySysLib\BeefySysLib.vcxproj /p:Configuration=Release /p:Platform=x64 /p:SolutionDir=%cd%\..\..\ /v:m IF %ERRORLEVEL% NEQ 0 GOTO FAILED +@ECHO ---- Building BeefySysLib (Release Static) ---- +CALL ../../bin/msbuild.bat ..\..\BeefySysLib\BeefySysLib.vcxproj /p:Configuration="Release Static" /p:Platform=x64 /p:SolutionDir=%cd%\..\..\ /v:m +IF %ERRORLEVEL% NEQ 0 GOTO FAILED REM @ECHO ---- Building libhunspell (Debug) ---- REM CALL ../../bin/msbuild.bat ..\..\libhunspell\libhunspell.vcxproj /p:Configuration=Debug /p:Platform=x64 /p:SolutionDir=%cd%\..\ /v:m diff --git a/IDE/src/BuildContext.bf b/IDE/src/BuildContext.bf index ee7788cd..7796a9e1 100644 --- a/IDE/src/BuildContext.bf +++ b/IDE/src/BuildContext.bf @@ -858,8 +858,7 @@ namespace IDE if ((workspaceOptions.mEnableObjectDebugFlags) || (workspaceOptions.mAllocType == .Debug) - || (workspaceOptions.mAllocType == .Stomp) - || (workspaceOptions.mAllocStackTraceDepth > 0)) + || (workspaceOptions.mAllocType == .Stomp)) { outDbg.Append("Beef", IDEApp.sRTVersionStr, "Dbg"); outDbg.Append((Workspace.PlatformType.GetPtrSizeByName(gApp.mPlatformName) == 4) ? "32" : "64"); diff --git a/bin/build.bat b/bin/build.bat index 6b19b894..d2598b29 100644 --- a/bin/build.bat +++ b/bin/build.bat @@ -33,6 +33,9 @@ CALL bin/msbuild.bat BeefySysLib\BeefySysLib.vcxproj /p:Configuration=Debug /p:P CALL bin/msbuild.bat BeefySysLib\BeefySysLib.vcxproj /p:Configuration=Release /p:Platform=x64 /p:SolutionDir=%cd%\ /v:m %MSBUILD_FLAGS% @IF %ERRORLEVEL% NEQ 0 GOTO HADERROR +CALL bin/msbuild.bat BeefySysLib\BeefySysLib.vcxproj /p:Configuration="Release Static" /p:Platform=x64 /p:SolutionDir=%cd%\ /v:m %MSBUILD_FLAGS% +@IF %ERRORLEVEL% NEQ 0 GOTO HADERROR + CALL bin/msbuild.bat IDEHelper\IDEHelper.vcxproj /p:Configuration=Debug /p:Platform=x64 /p:SolutionDir=%cd%\ /v:m %MSBUILD_FLAGS% @IF %ERRORLEVEL% NEQ 0 GOTO HADERROR