Przeglądaj źródła

BeefySysLib Release Static building

Brian Fiete 6 miesięcy temu
rodzic
commit
fddd3e0ba6

+ 5 - 0
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"]

+ 10 - 10
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"

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

+ 1 - 2
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");

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