mirror of
https://github.com/beefytech/Beef.git
synced 2025-06-08 03:28:20 +02:00
Small fixes
This commit is contained in:
parent
243ffaf851
commit
49a19647d3
9 changed files with 126 additions and 235 deletions
|
@ -16,7 +16,7 @@ TargetName = "$(ProjectName)_d"
|
||||||
OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib Rpcrt4.lib Ole32.lib"
|
OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib Rpcrt4.lib Ole32.lib"
|
||||||
CLibType = "Dynamic"
|
CLibType = "Dynamic"
|
||||||
BeefLibType = "DynamicDebug"
|
BeefLibType = "DynamicDebug"
|
||||||
DebugCommandArguments = "-workspace=Elevated -config=Debug -platform=Win64 -verbosity=detailed -clean"
|
DebugCommandArguments = "-help"
|
||||||
DebugWorkingDirectory = "c:\\Beef_website\\BeefTools\\BeefInstall"
|
DebugWorkingDirectory = "c:\\Beef_website\\BeefTools\\BeefInstall"
|
||||||
EnvironmentVars = ["_NO_DEBUG_HEAP=1"]
|
EnvironmentVars = ["_NO_DEBUG_HEAP=1"]
|
||||||
PreprocessorMacros = ["DEBUG", "CLI"]
|
PreprocessorMacros = ["DEBUG", "CLI"]
|
||||||
|
|
|
@ -10,7 +10,7 @@ PreprocessorMacros = ["DEBUG", "BF32"]
|
||||||
OptimizationLevel = "O0"
|
OptimizationLevel = "O0"
|
||||||
|
|
||||||
[Configs.Debug.Win64]
|
[Configs.Debug.Win64]
|
||||||
OtherLinkFlags = "$(LinkFlags) $(ProjectDir)/dist/BeefySysLib64_d.lib"
|
OtherLinkFlags = "$(LinkFlags) \"$(ProjectDir)/dist/BeefySysLib64_d.lib\""
|
||||||
CLibType = "Static"
|
CLibType = "Static"
|
||||||
BeefLibType = "Static"
|
BeefLibType = "Static"
|
||||||
PostBuildCmds = ["CopyToDependents(\"$(ProjectDir)/dist/BeefySysLib64_d.dll\")", "CopyToDependents(\"$(ProjectDir)/dist/BeefySysLib64_d.pdb\")"]
|
PostBuildCmds = ["CopyToDependents(\"$(ProjectDir)/dist/BeefySysLib64_d.dll\")", "CopyToDependents(\"$(ProjectDir)/dist/BeefySysLib64_d.pdb\")"]
|
||||||
|
|
|
@ -1071,7 +1071,7 @@ namespace Beefy.utils
|
||||||
//mCurrent.mValues;
|
//mCurrent.mValues;
|
||||||
}
|
}
|
||||||
|
|
||||||
void StringEncode(String outString, StringView theString)
|
static void StringEncode(String outString, StringView theString)
|
||||||
{
|
{
|
||||||
outString.Append('"');
|
outString.Append('"');
|
||||||
|
|
||||||
|
|
|
@ -1934,6 +1934,26 @@ namespace System
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public StringSplitEnumerator Split(char8 c)
|
||||||
|
{
|
||||||
|
return StringSplitEnumerator(Ptr, Length, c, Int32.MaxValue, StringSplitOptions.None);
|
||||||
|
}
|
||||||
|
|
||||||
|
public StringSplitEnumerator Split(char8 separator, int count)
|
||||||
|
{
|
||||||
|
return StringSplitEnumerator(Ptr, Length, separator, count, StringSplitOptions.None);
|
||||||
|
}
|
||||||
|
|
||||||
|
public StringSplitEnumerator Split(char8 separator, StringSplitOptions options)
|
||||||
|
{
|
||||||
|
return StringSplitEnumerator(Ptr, Length, separator, Int32.MaxValue, options);
|
||||||
|
}
|
||||||
|
|
||||||
|
public StringSplitEnumerator Split(char8 separator, int count, StringSplitOptions options)
|
||||||
|
{
|
||||||
|
return StringSplitEnumerator(Ptr, Length, separator, count, options);
|
||||||
|
}
|
||||||
|
|
||||||
public StringSplitEnumerator Split(params char8[] separators)
|
public StringSplitEnumerator Split(params char8[] separators)
|
||||||
{
|
{
|
||||||
return StringSplitEnumerator(Ptr, Length, separators, Int32.MaxValue, StringSplitOptions.None);
|
return StringSplitEnumerator(Ptr, Length, separators, Int32.MaxValue, StringSplitOptions.None);
|
||||||
|
|
|
@ -9,28 +9,28 @@ TargetDirectory = "$(WorkspaceDir)/../IDE/dist"
|
||||||
TargetName = "BeefySysLib32_d.dll"
|
TargetName = "BeefySysLib32_d.dll"
|
||||||
BuildCommandsOnCompile = "IfFilesChanged"
|
BuildCommandsOnCompile = "IfFilesChanged"
|
||||||
BuildCommandsOnRun = "IfFilesChanged"
|
BuildCommandsOnRun = "IfFilesChanged"
|
||||||
PostBuildCmds = ["$(WorkspaceDir)\\..\\bin\\msbuild.bat $(WorkspaceDir)\\..\\BeefySysLib\\BeefySysLib.vcxproj /p:Configuration=Debug /p:Platform=X86 /p:SolutionDir=$(WorkspaceDir)\\..\\ /v:m"]
|
PostBuildCmds = ["\"$(WorkspaceDir)\\..\\bin\\msbuild.bat\" \"$(WorkspaceDir)\\..\\BeefySysLib\\BeefySysLib.vcxproj\" /p:Configuration=Debug /p:Platform=X86 /p:SolutionDir=$(Slash \"$(WorkspaceDir)\\\\..\\\\\") /v:m"]
|
||||||
|
|
||||||
[Configs.Debug.Win64]
|
[Configs.Debug.Win64]
|
||||||
TargetDirectory = "$(WorkspaceDir)/../IDE/dist"
|
TargetDirectory = "$(WorkspaceDir)/../IDE/dist"
|
||||||
TargetName = "BeefySysLib64_d.dll"
|
TargetName = "BeefySysLib64_d.dll"
|
||||||
BuildCommandsOnCompile = "IfFilesChanged"
|
BuildCommandsOnCompile = "IfFilesChanged"
|
||||||
BuildCommandsOnRun = "IfFilesChanged"
|
BuildCommandsOnRun = "IfFilesChanged"
|
||||||
PostBuildCmds = ["$(WorkspaceDir)\\..\\bin\\msbuild.bat $(WorkspaceDir)\\..\\BeefySysLib\\BeefySysLib.vcxproj /p:Configuration=Debug /p:Platform=X64 /p:SolutionDir=$(WorkspaceDir)\\..\\ /v:m"]
|
PostBuildCmds = ["\"$(WorkspaceDir)\\..\\bin\\msbuild.bat\" \"$(WorkspaceDir)\\..\\BeefySysLib\\BeefySysLib.vcxproj\" /p:Configuration=Debug /p:Platform=X64 /p:SolutionDir=$(Slash \"$(WorkspaceDir)\\\\..\\\\\") /v:m"]
|
||||||
|
|
||||||
[Configs.Release.Win32]
|
[Configs.Release.Win32]
|
||||||
TargetDirectory = "$(WorkspaceDir)/../IDE/dist"
|
TargetDirectory = "$(WorkspaceDir)/../IDE/dist"
|
||||||
TargetName = "BeefySysLib32.dll"
|
TargetName = "BeefySysLib32.dll"
|
||||||
BuildCommandsOnCompile = "IfFilesChanged"
|
BuildCommandsOnCompile = "IfFilesChanged"
|
||||||
BuildCommandsOnRun = "IfFilesChanged"
|
BuildCommandsOnRun = "IfFilesChanged"
|
||||||
PostBuildCmds = ["$(WorkspaceDir)\\..\\bin\\msbuild.bat $(WorkspaceDir)\\..\\BeefySysLib\\BeefySysLib.vcxproj /p:Configuration=Release /p:Platform=X86 /p:SolutionDir=$(WorkspaceDir)\\..\\ /v:m"]
|
PostBuildCmds = ["\"$(WorkspaceDir)\\..\\bin\\msbuild.bat\" \"$(WorkspaceDir)\\..\\BeefySysLib\\BeefySysLib.vcxproj\" /p:Configuration=Release /p:Platform=X86 /p:SolutionDir=$(Slash \"$(WorkspaceDir)\\\\..\\\\\") /v:m"]
|
||||||
|
|
||||||
[Configs.Release.Win64]
|
[Configs.Release.Win64]
|
||||||
TargetDirectory = "$(WorkspaceDir)/../IDE/dist"
|
TargetDirectory = "$(WorkspaceDir)/../IDE/dist"
|
||||||
TargetName = "BeefySysLib64.dll"
|
TargetName = "BeefySysLib64.dll"
|
||||||
BuildCommandsOnCompile = "IfFilesChanged"
|
BuildCommandsOnCompile = "IfFilesChanged"
|
||||||
BuildCommandsOnRun = "IfFilesChanged"
|
BuildCommandsOnRun = "IfFilesChanged"
|
||||||
PostBuildCmds = ["$(WorkspaceDir)\\..\\bin\\msbuild.bat $(WorkspaceDir)\\..\\BeefySysLib\\BeefySysLib.vcxproj /p:Configuration=Release /p:Platform=X64 /p:SolutionDir=$(WorkspaceDir)\\..\\ /v:m"]
|
PostBuildCmds = ["\"$(WorkspaceDir)\\..\\bin\\msbuild.bat\" \"$(WorkspaceDir)\\..\\BeefySysLib\\BeefySysLib.vcxproj\" /p:Configuration=Release /p:Platform=X64 /p:SolutionDir=$(Slash \"$(WorkspaceDir)\\\\..\\\\\") /v:m"]
|
||||||
|
|
||||||
[Configs.Paranoid.Win32]
|
[Configs.Paranoid.Win32]
|
||||||
BuildCommandsOnCompile = "IfFilesChanged"
|
BuildCommandsOnCompile = "IfFilesChanged"
|
||||||
|
@ -56,13 +56,11 @@ Name = "fbx"
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "FBXReader.cpp"
|
Path = "fbx/FBXReader.cpp"
|
||||||
ImportPath = "fbx/FBXReader.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "FBXReader.h"
|
Path = "fbx/FBXReader.h"
|
||||||
ImportPath = "fbx/FBXReader.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items]]
|
[[ProjectFolder.Items]]
|
||||||
Type = "Folder"
|
Type = "Folder"
|
||||||
|
@ -70,93 +68,75 @@ Name = "gfx"
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "DrawLayer.cpp"
|
Path = "gfx/DrawLayer.cpp"
|
||||||
ImportPath = "gfx/DrawLayer.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "DrawLayer.h"
|
Path = "gfx/DrawLayer.h"
|
||||||
ImportPath = "gfx/DrawLayer.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "FTFont.cpp"
|
Path = "gfx/FTFont.cpp"
|
||||||
ImportPath = "gfx/FTFont.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "FTFont.h"
|
Path = "gfx/FTFont.h"
|
||||||
ImportPath = "gfx/FTFont.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "ModelDef.cpp"
|
Path = "gfx/ModelDef.cpp"
|
||||||
ImportPath = "gfx/ModelDef.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "ModelDef.h"
|
Path = "gfx/ModelDef.h"
|
||||||
ImportPath = "gfx/ModelDef.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "ModelInstance.cpp"
|
Path = "gfx/ModelInstance.cpp"
|
||||||
ImportPath = "gfx/ModelInstance.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "ModelInstance.h"
|
Path = "gfx/ModelInstance.h"
|
||||||
ImportPath = "gfx/ModelInstance.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "RenderCmd.cpp"
|
Path = "gfx/RenderCmd.cpp"
|
||||||
ImportPath = "gfx/RenderCmd.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "RenderCmd.h"
|
Path = "gfx/RenderCmd.h"
|
||||||
ImportPath = "gfx/RenderCmd.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "RenderDevice.cpp"
|
Path = "gfx/RenderDevice.cpp"
|
||||||
ImportPath = "gfx/RenderDevice.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "RenderDevice.h"
|
Path = "gfx/RenderDevice.h"
|
||||||
ImportPath = "gfx/RenderDevice.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "RenderTarget.cpp"
|
Path = "gfx/RenderTarget.cpp"
|
||||||
ImportPath = "gfx/RenderTarget.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "RenderTarget.h"
|
Path = "gfx/RenderTarget.h"
|
||||||
ImportPath = "gfx/RenderTarget.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "Shader.cpp"
|
Path = "gfx/Shader.cpp"
|
||||||
ImportPath = "gfx/Shader.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "Shader.h"
|
Path = "gfx/Shader.h"
|
||||||
ImportPath = "gfx/Shader.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "Texture.cpp"
|
Path = "gfx/Texture.cpp"
|
||||||
ImportPath = "gfx/Texture.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "Texture.h"
|
Path = "gfx/Texture.h"
|
||||||
ImportPath = "gfx/Texture.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items]]
|
[[ProjectFolder.Items]]
|
||||||
Type = "Folder"
|
Type = "Folder"
|
||||||
|
@ -164,103 +144,83 @@ Name = "img"
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "BFIData.cpp"
|
Path = "img/BFIData.cpp"
|
||||||
ImportPath = "img/BFIData.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "BFIData.h"
|
Path = "img/BFIData.h"
|
||||||
ImportPath = "img/BFIData.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "ImageAdjustments.cpp"
|
Path = "img/ImageAdjustments.cpp"
|
||||||
ImportPath = "img/ImageAdjustments.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "ImageAdjustments.h"
|
Path = "img/ImageAdjustments.h"
|
||||||
ImportPath = "img/ImageAdjustments.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "ImageData.cpp"
|
Path = "img/ImageData.cpp"
|
||||||
ImportPath = "img/ImageData.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "ImageData.h"
|
Path = "img/ImageData.h"
|
||||||
ImportPath = "img/ImageData.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "ImageUtils.cpp"
|
Path = "img/ImageUtils.cpp"
|
||||||
ImportPath = "img/ImageUtils.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "ImageUtils.h"
|
Path = "img/ImageUtils.h"
|
||||||
ImportPath = "img/ImageUtils.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "ImgEffects.cpp"
|
Path = "img/ImgEffects.cpp"
|
||||||
ImportPath = "img/ImgEffects.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "ImgEffects.h"
|
Path = "img/ImgEffects.h"
|
||||||
ImportPath = "img/ImgEffects.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "JPEGData.cpp"
|
Path = "img/JPEGData.cpp"
|
||||||
ImportPath = "img/JPEGData.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "JPEGData.h"
|
Path = "img/JPEGData.h"
|
||||||
ImportPath = "img/JPEGData.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "PNGData.cpp"
|
Path = "img/PNGData.cpp"
|
||||||
ImportPath = "img/PNGData.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "PNGData.h"
|
Path = "img/PNGData.h"
|
||||||
ImportPath = "img/PNGData.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "PSDReader.cpp"
|
Path = "img/PSDReader.cpp"
|
||||||
ImportPath = "img/PSDReader.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "PSDReader.h"
|
Path = "img/PSDReader.h"
|
||||||
ImportPath = "img/PSDReader.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "PVRData.cpp"
|
Path = "img/PVRData.cpp"
|
||||||
ImportPath = "img/PVRData.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "PVRData.h"
|
Path = "img/PVRData.h"
|
||||||
ImportPath = "img/PVRData.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "TGAData.cpp"
|
Path = "img/TGAData.cpp"
|
||||||
ImportPath = "img/TGAData.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "TGAData.h"
|
Path = "img/TGAData.h"
|
||||||
ImportPath = "img/TGAData.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items]]
|
[[ProjectFolder.Items]]
|
||||||
Type = "Folder"
|
Type = "Folder"
|
||||||
|
@ -272,38 +232,31 @@ Name = "win"
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items.Items]]
|
[[ProjectFolder.Items.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "BFPlatform.h"
|
Path = "platform/win/BFPlatform.h"
|
||||||
ImportPath = "platform/win/BFPlatform.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items.Items]]
|
[[ProjectFolder.Items.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "DXRenderDevice.cpp"
|
Path = "platform/win/DXRenderDevice.cpp"
|
||||||
ImportPath = "platform/win/DXRenderDevice.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items.Items]]
|
[[ProjectFolder.Items.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "DXRenderDevice.h"
|
Path = "platform/win/DXRenderDevice.h"
|
||||||
ImportPath = "platform/win/DXRenderDevice.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items.Items]]
|
[[ProjectFolder.Items.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "Platform.cpp"
|
Path = "platform/win/Platform.cpp"
|
||||||
ImportPath = "platform/win/Platform.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items.Items]]
|
[[ProjectFolder.Items.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "PlatformApp.h"
|
Path = "platform/win/PlatformApp.h"
|
||||||
ImportPath = "platform/win/PlatformApp.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items.Items]]
|
[[ProjectFolder.Items.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "WinBFApp.cpp"
|
Path = "platform/win/WinBFApp.cpp"
|
||||||
ImportPath = "platform/win/WinBFApp.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items.Items]]
|
[[ProjectFolder.Items.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "WinBFApp.h"
|
Path = "platform/win/WinBFApp.h"
|
||||||
ImportPath = "platform/win/WinBFApp.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items]]
|
[[ProjectFolder.Items]]
|
||||||
Type = "Folder"
|
Type = "Folder"
|
||||||
|
@ -315,183 +268,147 @@ Name = "util"
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "AllocDebug.cpp"
|
Path = "Util/AllocDebug.cpp"
|
||||||
ImportPath = "Util/AllocDebug.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "AllocDebug.h"
|
Path = "Util/AllocDebug.h"
|
||||||
ImportPath = "Util/AllocDebug.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "BeefPerf.cpp"
|
Path = "util/BeefPerf.cpp"
|
||||||
ImportPath = "util/BeefPerf.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "BeefPerf.h"
|
Path = "util/BeefPerf.h"
|
||||||
ImportPath = "util/BeefPerf.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "BSpline.cpp"
|
Path = "Util/BSpline.cpp"
|
||||||
ImportPath = "Util/BSpline.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "BSpline.h"
|
Path = "Util/BSpline.h"
|
||||||
ImportPath = "Util/BSpline.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "BumpAllocator.h"
|
Path = "Util/BumpAllocator.h"
|
||||||
ImportPath = "Util/BumpAllocator.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "CatmullRom.cpp"
|
Path = "Util/CatmullRom.cpp"
|
||||||
ImportPath = "Util/CatmullRom.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "CatmullRom.h"
|
Path = "Util/CatmullRom.h"
|
||||||
ImportPath = "Util/CatmullRom.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "CritSect.h"
|
Path = "Util/CritSect.h"
|
||||||
ImportPath = "Util/CritSect.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "CubicFuncSpline.cpp"
|
Path = "Util/CubicFuncSpline.cpp"
|
||||||
ImportPath = "Util/CubicFuncSpline.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "CubicFuncSpline.h"
|
Path = "Util/CubicFuncSpline.h"
|
||||||
ImportPath = "Util/CubicFuncSpline.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "CubicSpline.cpp"
|
Path = "Util/CubicSpline.cpp"
|
||||||
ImportPath = "Util/CubicSpline.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "CubicSpline.h"
|
Path = "Util/CubicSpline.h"
|
||||||
ImportPath = "Util/CubicSpline.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "DLIList.h"
|
Path = "Util/DLIList.h"
|
||||||
ImportPath = "Util/DLIList.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "Hash.cpp"
|
Path = "Util/Hash.cpp"
|
||||||
ImportPath = "Util/Hash.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "Hash.h"
|
Path = "Util/Hash.h"
|
||||||
ImportPath = "Util/Hash.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "Json.cpp"
|
Path = "Util/Json.cpp"
|
||||||
ImportPath = "Util/Json.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "Json.h"
|
Path = "Util/Json.h"
|
||||||
ImportPath = "Util/Json.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "Matrix4.cpp"
|
Path = "Util/Matrix4.cpp"
|
||||||
ImportPath = "Util/Matrix4.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "Matrix4.h"
|
Path = "Util/Matrix4.h"
|
||||||
ImportPath = "Util/Matrix4.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "PerfTimer.cpp"
|
Path = "Util/PerfTimer.cpp"
|
||||||
ImportPath = "Util/PerfTimer.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "PerfTimer.h"
|
Path = "Util/PerfTimer.h"
|
||||||
ImportPath = "Util/PerfTimer.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "Point.cpp"
|
Path = "Util/Point.cpp"
|
||||||
ImportPath = "Util/Point.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "Point.h"
|
Path = "Util/Point.h"
|
||||||
ImportPath = "Util/Point.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "PolySpline.cpp"
|
Path = "Util/PolySpline.cpp"
|
||||||
ImportPath = "Util/PolySpline.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "PolySpline.h"
|
Path = "Util/PolySpline.h"
|
||||||
ImportPath = "Util/PolySpline.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "Quaternion.cpp"
|
Path = "Util/Quaternion.cpp"
|
||||||
ImportPath = "Util/Quaternion.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "Quaternion.h"
|
Path = "Util/Quaternion.h"
|
||||||
ImportPath = "Util/Quaternion.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "Rect.h"
|
Path = "Util/Rect.h"
|
||||||
ImportPath = "Util/Rect.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "SLIList.h"
|
Path = "Util/SLIList.h"
|
||||||
ImportPath = "Util/SLIList.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "TLSingleton.h"
|
Path = "util/TLSingleton.h"
|
||||||
ImportPath = "util/TLSingleton.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "UTF8.cpp"
|
Path = "Util/UTF8.cpp"
|
||||||
ImportPath = "Util/UTF8.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "UTF8.h"
|
Path = "Util/UTF8.h"
|
||||||
ImportPath = "Util/UTF8.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "Vector.cpp"
|
Path = "Util/Vector.cpp"
|
||||||
ImportPath = "Util/Vector.cpp"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items.Items]]
|
[[ProjectFolder.Items.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
Name = "Vector.h"
|
Path = "Util/Vector.h"
|
||||||
ImportPath = "Util/Vector.h"
|
|
||||||
|
|
||||||
[[ProjectFolder.Items]]
|
[[ProjectFolder.Items]]
|
||||||
Type = "Source"
|
Type = "Source"
|
||||||
|
|
|
@ -10,7 +10,7 @@ TargetDirectory = "$(WorkspaceDir)/../IDE/dist"
|
||||||
TargetName = "IDEHelper64_d.dll"
|
TargetName = "IDEHelper64_d.dll"
|
||||||
BuildCommandsOnCompile = "IfFilesChanged"
|
BuildCommandsOnCompile = "IfFilesChanged"
|
||||||
BuildCommandsOnRun = "IfFilesChanged"
|
BuildCommandsOnRun = "IfFilesChanged"
|
||||||
PostBuildCmds = ["$(WorkspaceDir)\\..\\bin\\msbuild.bat $(WorkspaceDir)\\..\\Debugger64\\Debugger64.vcxproj /p:Configuration=Debug /p:Platform=X64 /p:SolutionDir=$(WorkspaceDir)\\..\\ /v:m"]
|
PostBuildCmds = ["\"$(WorkspaceDir)\\..\\bin\\msbuild.bat\" \"$(WorkspaceDir)\\..\\Debugger64\\Debugger64.vcxproj\" /p:Configuration=Debug /p:Platform=X64 /p:SolutionDir=$(Slash \"$(WorkspaceDir)\\\\..\\\\\") /v:m"]
|
||||||
OptimizationLevel = "O0"
|
OptimizationLevel = "O0"
|
||||||
|
|
||||||
[Configs.Debug.Win32]
|
[Configs.Debug.Win32]
|
||||||
|
@ -22,7 +22,7 @@ TargetDirectory = "$(WorkspaceDir)/../IDE/dist"
|
||||||
TargetName = "IDEHelper64.dll"
|
TargetName = "IDEHelper64.dll"
|
||||||
BuildCommandsOnCompile = "IfFilesChanged"
|
BuildCommandsOnCompile = "IfFilesChanged"
|
||||||
BuildCommandsOnRun = "IfFilesChanged"
|
BuildCommandsOnRun = "IfFilesChanged"
|
||||||
PostBuildCmds = ["$(WorkspaceDir)\\..\\bin\\msbuild.bat $(WorkspaceDir)\\..\\Debugger64\\Debugger64.vcxproj /p:Configuration=Release /p:Platform=X64 /p:SolutionDir=$(WorkspaceDir)\\..\\ /v:m"]
|
PostBuildCmds = ["\"$(WorkspaceDir)\\..\\bin\\msbuild.bat\" \"$(WorkspaceDir)\\..\\Debugger64\\Debugger64.vcxproj\" /p:Configuration=Release /p:Platform=X64 /p:SolutionDir=$(Slash \"$(WorkspaceDir)\\\\..\\\\\") /v:m"]
|
||||||
|
|
||||||
[Configs.Release.Win32]
|
[Configs.Release.Win32]
|
||||||
BuildCommandsOnCompile = "IfFilesChanged"
|
BuildCommandsOnCompile = "IfFilesChanged"
|
||||||
|
|
|
@ -11,11 +11,11 @@ IconFile = "$(WorkspaceDir)/Resources/Beef.ico"
|
||||||
ManifestFile = "$(WorkspaceDir)/Resources/IDE.manifest"
|
ManifestFile = "$(WorkspaceDir)/Resources/IDE.manifest"
|
||||||
Description = "Beef IDE"
|
Description = "Beef IDE"
|
||||||
Comments = "a"
|
Comments = "a"
|
||||||
Company = "BeefyTechZ"
|
Company = "BeefyTech LLC"
|
||||||
Product = "Beef IDE"
|
Product = "Beef IDE"
|
||||||
Copyright = "Copyright 2018 BeefyTech"
|
Copyright = "Copyright 2019 BeefyTech"
|
||||||
FileVersion = "0.42"
|
FileVersion = "0.42"
|
||||||
ProductVersion = "0.42"
|
ProductVersion = "0000000000000000"
|
||||||
|
|
||||||
[Configs.Debug.Win32]
|
[Configs.Debug.Win32]
|
||||||
TargetName = ""
|
TargetName = ""
|
||||||
|
@ -26,8 +26,7 @@ OptimizationLevel = "O0"
|
||||||
TargetDirectory = "$(WorkspaceDir)/dist"
|
TargetDirectory = "$(WorkspaceDir)/dist"
|
||||||
TargetName = "BeefIDE_d"
|
TargetName = "BeefIDE_d"
|
||||||
OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib"
|
OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib"
|
||||||
CLibType = "Dynamic"
|
DebugCommandArguments = "-proddir=C:\\Beef\\IDE"
|
||||||
DebugCommandArguments = "-proddir=C:\\Beef_website\\BeefTools\\BeefInstall\\StubUI"
|
|
||||||
DebugWorkingDirectory = "c:\\Beef\\IDE\\Tests\\EmptyTest"
|
DebugWorkingDirectory = "c:\\Beef\\IDE\\Tests\\EmptyTest"
|
||||||
EnvironmentVars = ["_NO_DEBUG_HEAP=1"]
|
EnvironmentVars = ["_NO_DEBUG_HEAP=1"]
|
||||||
|
|
||||||
|
@ -40,8 +39,7 @@ OptimizationLevel = "O0"
|
||||||
TargetDirectory = "$(WorkspaceDir)/dist"
|
TargetDirectory = "$(WorkspaceDir)/dist"
|
||||||
TargetName = "BeefIDE"
|
TargetName = "BeefIDE"
|
||||||
OtherLinkFlags = "Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib Beef042RT64.lib IDEHelper64.lib BeefySysLib64.lib"
|
OtherLinkFlags = "Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib Beef042RT64.lib IDEHelper64.lib BeefySysLib64.lib"
|
||||||
CLibType = "Dynamic"
|
DebugCommandArguments = "-proddir=C:\\Beef\\IDE"
|
||||||
DebugCommandArguments = "-proddir=C:\\Beef\\IDE\\Tests\\Test1 -test=scripts\\HotSwap_BaseChange.txt -testNoExit"
|
|
||||||
DebugWorkingDirectory = "$(ProjectDir)\\dist"
|
DebugWorkingDirectory = "$(ProjectDir)\\dist"
|
||||||
EnvironmentVars = ["_NO_DEBUG_HEAP=1"]
|
EnvironmentVars = ["_NO_DEBUG_HEAP=1"]
|
||||||
|
|
||||||
|
@ -54,9 +52,8 @@ OptimizationLevel = "O0"
|
||||||
TargetDirectory = "$(WorkspaceDir)/dist"
|
TargetDirectory = "$(WorkspaceDir)/dist"
|
||||||
TargetName = "BeefIDE_d2"
|
TargetName = "BeefIDE_d2"
|
||||||
OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib BeefySysLib64_d.lib wsock32.lib"
|
OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib BeefySysLib64_d.lib wsock32.lib"
|
||||||
CLibType = "Dynamic"
|
|
||||||
BeefLibType = "DynamicDebug"
|
BeefLibType = "DynamicDebug"
|
||||||
DebugCommandArguments = "-workspace=c:\\beef\\ide\\mintest"
|
DebugCommandArguments = "-workspace=c:\\beef_website\\samples\\SpaceGame"
|
||||||
DebugWorkingDirectory = "$(ProjectDir)\\dist"
|
DebugWorkingDirectory = "$(ProjectDir)\\dist"
|
||||||
EnvironmentVars = ["_NO_DEBUG_HEAP=1"]
|
EnvironmentVars = ["_NO_DEBUG_HEAP=1"]
|
||||||
|
|
||||||
|
@ -66,15 +63,12 @@ TargetName = "BeefIDE_p"
|
||||||
OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib BeefySysLib64_d.lib wsock32.lib"
|
OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib BeefySysLib64_d.lib wsock32.lib"
|
||||||
|
|
||||||
[Configs.Paranoid.Win32]
|
[Configs.Paranoid.Win32]
|
||||||
CLibType = "Static"
|
|
||||||
BeefLibType = "Static"
|
BeefLibType = "Static"
|
||||||
|
|
||||||
[Configs.Test.Win32]
|
[Configs.Test.Win32]
|
||||||
CLibType = "Static"
|
|
||||||
BeefLibType = "Static"
|
BeefLibType = "Static"
|
||||||
|
|
||||||
[Configs.Test.Win64]
|
[Configs.Test.Win64]
|
||||||
CLibType = "Static"
|
|
||||||
BeefLibType = "Static"
|
BeefLibType = "Static"
|
||||||
|
|
||||||
[Configs.Debug3.Win64]
|
[Configs.Debug3.Win64]
|
||||||
|
|
|
@ -370,6 +370,8 @@ namespace IDE
|
||||||
public static void GetPdbPath(String targetPath, Workspace.Options workspaceOptions, Project.Options options, String outPdbPath)
|
public static void GetPdbPath(String targetPath, Workspace.Options workspaceOptions, Project.Options options, String outPdbPath)
|
||||||
{
|
{
|
||||||
int lastDotPos = targetPath.LastIndexOf('.');
|
int lastDotPos = targetPath.LastIndexOf('.');
|
||||||
|
if (lastDotPos == -1)
|
||||||
|
return;
|
||||||
outPdbPath.Append(targetPath, 0, lastDotPos);
|
outPdbPath.Append(targetPath, 0, lastDotPos);
|
||||||
if (workspaceOptions.mToolsetType == .LLVM)
|
if (workspaceOptions.mToolsetType == .LLVM)
|
||||||
outPdbPath.Append("_lld");
|
outPdbPath.Append("_lld");
|
||||||
|
@ -529,9 +531,6 @@ namespace IDE
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/*if (depProject.mNeedsTargetRebuild)
|
|
||||||
project.mNeedsTargetRebuild = true;*/
|
|
||||||
|
|
||||||
var depOptions = gApp.GetCurProjectOptions(depProject);
|
var depOptions = gApp.GetCurProjectOptions(depProject);
|
||||||
if (depOptions != null)
|
if (depOptions != null)
|
||||||
{
|
{
|
||||||
|
@ -541,7 +540,6 @@ namespace IDE
|
||||||
|
|
||||||
for (var fileName in depOptions.mClangObjectFiles)
|
for (var fileName in depOptions.mClangObjectFiles)
|
||||||
{
|
{
|
||||||
//AppendWithOptionalQuotes(linkLine, fileName);
|
|
||||||
argBuilder.AddFileName(fileName);
|
argBuilder.AddFileName(fileName);
|
||||||
argBuilder.AddSep();
|
argBuilder.AddSep();
|
||||||
}
|
}
|
||||||
|
@ -565,19 +563,6 @@ namespace IDE
|
||||||
if (!linkFlags.IsWhiteSpace)
|
if (!linkFlags.IsWhiteSpace)
|
||||||
linkLine.Append(linkFlags, " ");
|
linkLine.Append(linkFlags, " ");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*String depLibTargetPath = scope String();
|
|
||||||
ResolveConfigString(depProject, depOptions, "$(TargetPath)", error, depLibTargetPath);
|
|
||||||
IDEUtils.FixFilePath(depLibTargetPath);
|
|
||||||
|
|
||||||
String depDir = scope String();
|
|
||||||
Path.GetDirectoryName(depLibTargetPath, depDir);
|
|
||||||
String depFileName = scope String();
|
|
||||||
Path.GetFileNameWithoutExtension(depLibTargetPath, depFileName);
|
|
||||||
|
|
||||||
AppendWithOptionalQuotes(linkLine, depLibTargetPath);
|
|
||||||
linkLine.Append(" ");*/
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -652,7 +637,6 @@ namespace IDE
|
||||||
|
|
||||||
if (workspaceOptions.mMachineType == .x86)
|
if (workspaceOptions.mMachineType == .x86)
|
||||||
{
|
{
|
||||||
//linkLine.Append("-libpath:\"C:\\Program Files (x86)\\Windows Kits\\10\\Lib\\10.0.10586.0\\ucrt\\x86\" ");
|
|
||||||
for (var libPath in gApp.mSettings.mVSSettings.mLib32Paths)
|
for (var libPath in gApp.mSettings.mVSSettings.mLib32Paths)
|
||||||
{
|
{
|
||||||
linkLine.AppendF("-libpath:\"{0}\" ", libPath);
|
linkLine.AppendF("-libpath:\"{0}\" ", libPath);
|
||||||
|
@ -661,10 +645,6 @@ namespace IDE
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/*linkLine.Append("-libpath:\"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\lib\\amd64\" ");
|
|
||||||
linkLine.Append("-libpath:\"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\atlmfc\\lib\\amd64\" ");
|
|
||||||
linkLine.Append("-libpath:\"C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.14393.0\\ucrt\\x64\" ");
|
|
||||||
linkLine.Append("-libpath:\"C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.14393.0\\um\\x64\" ");*/
|
|
||||||
for (var libPath in gApp.mSettings.mVSSettings.mLib64Paths)
|
for (var libPath in gApp.mSettings.mVSSettings.mLib64Paths)
|
||||||
{
|
{
|
||||||
linkLine.AppendF("-libpath:\"{0}\" ", libPath);
|
linkLine.AppendF("-libpath:\"{0}\" ", libPath);
|
||||||
|
@ -686,20 +666,7 @@ namespace IDE
|
||||||
}
|
}
|
||||||
|
|
||||||
let winOptions = project.mWindowsOptions;
|
let winOptions = project.mWindowsOptions;
|
||||||
/*if (!String.IsNullOrWhiteSpace(project.mWindowsOptions.mManifestFile))
|
|
||||||
{
|
|
||||||
String manifestPath = scope String();
|
|
||||||
String error = scope String();
|
|
||||||
ResolveConfigString(project, options, winOptions.mManifestFile, error, manifestPath);
|
|
||||||
if (!manifestPath.IsWhiteSpace)
|
|
||||||
{
|
|
||||||
linkLine.Append("/MANIFEST:EMBED /MANIFESTINPUT:");
|
|
||||||
IDEUtils.AppendWithOptionalQuotes(linkLine, manifestPath);
|
|
||||||
linkLine.Append(" ");
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
|
|
||||||
// Put back
|
|
||||||
if ((!String.IsNullOrWhiteSpace(project.mWindowsOptions.mIconFile)) ||
|
if ((!String.IsNullOrWhiteSpace(project.mWindowsOptions.mIconFile)) ||
|
||||||
(!String.IsNullOrWhiteSpace(project.mWindowsOptions.mManifestFile)) ||
|
(!String.IsNullOrWhiteSpace(project.mWindowsOptions.mManifestFile)) ||
|
||||||
(winOptions.HasVersionInfo()))
|
(winOptions.HasVersionInfo()))
|
||||||
|
@ -767,9 +734,6 @@ namespace IDE
|
||||||
IDEUtils.AppendWithOptionalQuotes(linkLine, resOutPath);
|
IDEUtils.AppendWithOptionalQuotes(linkLine, resOutPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//String linkerPath = "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\amd64\\link.exe";
|
|
||||||
|
|
||||||
let binPath = (workspaceOptions.mMachineType == .x86) ? gApp.mSettings.mVSSettings.mBin32Path : gApp.mSettings.mVSSettings.mBin64Path;
|
let binPath = (workspaceOptions.mMachineType == .x86) ? gApp.mSettings.mVSSettings.mBin32Path : gApp.mSettings.mVSSettings.mBin64Path;
|
||||||
if (binPath.IsWhiteSpace)
|
if (binPath.IsWhiteSpace)
|
||||||
{
|
{
|
||||||
|
@ -801,11 +765,7 @@ namespace IDE
|
||||||
IDEUtils.AppendWithOptionalQuotes(linkLine, ltoPath);
|
IDEUtils.AppendWithOptionalQuotes(linkLine, ltoPath);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//String linkerPath = "C:\\Beef\\IDE\\dist\\BeefLink.exe";
|
|
||||||
|
|
||||||
//QueueRun(compilerExePath, linkLine, @"c:\mingw\bin", (options.mGeneralOptions.mLinkerType == Project.LinkerType.Clang) && (linkLine.Length > 1024));
|
|
||||||
//QueueRun(compilerExePath, linkLine, @"c:\mingw\bin", (linkLine.Length > 1024));
|
|
||||||
|
|
||||||
var runCmd = gApp.QueueRun(linkerPath, linkLine, gApp.mInstallDir, .UTF16WithBom);
|
var runCmd = gApp.QueueRun(linkerPath, linkLine, gApp.mInstallDir, .UTF16WithBom);
|
||||||
runCmd.mOnlyIfNotFailed = true;
|
runCmd.mOnlyIfNotFailed = true;
|
||||||
var tagetCompletedCmd = new IDEApp.TargetCompletedCmd(project);
|
var tagetCompletedCmd = new IDEApp.TargetCompletedCmd(project);
|
||||||
|
|
|
@ -10,28 +10,28 @@ TargetDirectory = "$(WorkspaceDir)/../IDE/dist"
|
||||||
TargetName = "IDEHelper32_d.dll"
|
TargetName = "IDEHelper32_d.dll"
|
||||||
BuildCommandsOnCompile = "IfFilesChanged"
|
BuildCommandsOnCompile = "IfFilesChanged"
|
||||||
BuildCommandsOnRun = "IfFilesChanged"
|
BuildCommandsOnRun = "IfFilesChanged"
|
||||||
PostBuildCmds = ["$(WorkspaceDir)\\..\\bin\\msbuild.bat $(WorkspaceDir)\\..\\IDEHelper\\IDEHelper.vcxproj /p:Configuration=Debug /p:Platform=X86 /p:SolutionDir=$(WorkspaceDir)\\..\\ /v:m"]
|
PostBuildCmds = ["\"$(WorkspaceDir)\\..\\bin\\msbuild.bat\" \"$(WorkspaceDir)\\..\\IDEHelper\\IDEHelper.vcxproj\" /p:Configuration=Debug /p:Platform=X86 /p:SolutionDir=$(Slash \"$(WorkspaceDir)\\\\..\\\\\") /v:m"]
|
||||||
|
|
||||||
[Configs.Debug.Win64]
|
[Configs.Debug.Win64]
|
||||||
TargetDirectory = "$(WorkspaceDir)/../IDE/dist"
|
TargetDirectory = "$(WorkspaceDir)/../IDE/dist"
|
||||||
TargetName = "IDEHelper64_d.dll"
|
TargetName = "IDEHelper64_d.dll"
|
||||||
BuildCommandsOnCompile = "IfFilesChanged"
|
BuildCommandsOnCompile = "IfFilesChanged"
|
||||||
BuildCommandsOnRun = "IfFilesChanged"
|
BuildCommandsOnRun = "IfFilesChanged"
|
||||||
PostBuildCmds = ["$(WorkspaceDir)\\..\\bin\\msbuild.bat $(WorkspaceDir)\\..\\IDEHelper\\IDEHelper.vcxproj /p:Configuration=Debug /p:Platform=X64 /p:SolutionDir=$(WorkspaceDir)\\..\\ /v:m"]
|
PostBuildCmds = ["\"$(WorkspaceDir)\\..\\bin\\msbuild.bat\" \"$(WorkspaceDir)\\..\\IDEHelper\\IDEHelper.vcxproj\" /p:Configuration=Debug /p:Platform=X64 /p:SolutionDir=$(Slash \"$(WorkspaceDir)\\\\..\\\\\") /v:m"]
|
||||||
|
|
||||||
[Configs.Release.Win32]
|
[Configs.Release.Win32]
|
||||||
TargetDirectory = "$(WorkspaceDir)/../IDE/dist"
|
TargetDirectory = "$(WorkspaceDir)/../IDE/dist"
|
||||||
TargetName = "IDEHelper32.dll"
|
TargetName = "IDEHelper32.dll"
|
||||||
BuildCommandsOnCompile = "IfFilesChanged"
|
BuildCommandsOnCompile = "IfFilesChanged"
|
||||||
BuildCommandsOnRun = "IfFilesChanged"
|
BuildCommandsOnRun = "IfFilesChanged"
|
||||||
PostBuildCmds = ["$(WorkspaceDir)\\..\\bin\\msbuild.bat $(WorkspaceDir)\\..\\IDEHelper\\IDEHelper.vcxproj /p:Configuration=Release /p:Platform=X86 /p:SolutionDir=$(WorkspaceDir)\\..\\ /v:m"]
|
PostBuildCmds = ["\"$(WorkspaceDir)\\..\\bin\\msbuild.bat\" \"$(WorkspaceDir)\\..\\IDEHelper\\IDEHelper.vcxproj\" /p:Configuration=Release /p:Platform=X86 /p:SolutionDir=$(Slash \"$(WorkspaceDir)\\\\..\\\\\") /v:m"]
|
||||||
|
|
||||||
[Configs.Release.Win64]
|
[Configs.Release.Win64]
|
||||||
TargetDirectory = "$(WorkspaceDir)/../IDE/dist"
|
TargetDirectory = "$(WorkspaceDir)/../IDE/dist"
|
||||||
TargetName = "IDEHelper64.dll"
|
TargetName = "IDEHelper64.dll"
|
||||||
BuildCommandsOnCompile = "IfFilesChanged"
|
BuildCommandsOnCompile = "IfFilesChanged"
|
||||||
BuildCommandsOnRun = "IfFilesChanged"
|
BuildCommandsOnRun = "IfFilesChanged"
|
||||||
PostBuildCmds = ["$(WorkspaceDir)\\..\\bin\\msbuild.bat $(WorkspaceDir)\\..\\IDEHelper\\IDEHelper.vcxproj /p:Configuration=Release /p:Platform=X64 /p:SolutionDir=$(WorkspaceDir)\\..\\ /v:m"]
|
PostBuildCmds = ["\"$(WorkspaceDir)\\..\\bin\\msbuild.bat\" \"$(WorkspaceDir)\\..\\IDEHelper\\IDEHelper.vcxproj\" /p:Configuration=Release /p:Platform=X64 /p:SolutionDir=$(Slash \"$(WorkspaceDir)\\\\..\\\\\") /v:m"]
|
||||||
|
|
||||||
[Configs.Paranoid.Win32]
|
[Configs.Paranoid.Win32]
|
||||||
BuildCommandsOnCompile = "IfFilesChanged"
|
BuildCommandsOnCompile = "IfFilesChanged"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue