mirror of
https://github.com/beefytech/Beef.git
synced 2025-06-09 03:52:19 +02:00
Small changes, IDE fixes
This commit is contained in:
parent
093eaa64c0
commit
a8df8c0e47
10 changed files with 141 additions and 18 deletions
|
@ -16,8 +16,8 @@ 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=."
|
DebugCommandArguments = "-workspace=Elevated -config=Debug -platform=Win64 -verbosity=detailed -clean"
|
||||||
DebugWorkingDirectory = "$(WorkspaceDir)/../IDE/dist"
|
DebugWorkingDirectory = "c:\\Beef_website\\BeefTools\\BeefInstall"
|
||||||
EnvironmentVars = ["_NO_DEBUG_HEAP=1"]
|
EnvironmentVars = ["_NO_DEBUG_HEAP=1"]
|
||||||
PreprocessorMacros = ["DEBUG", "CLI"]
|
PreprocessorMacros = ["DEBUG", "CLI"]
|
||||||
|
|
||||||
|
@ -89,4 +89,3 @@ BeefLibType = "Static"
|
||||||
Type = "Folder"
|
Type = "Folder"
|
||||||
Path = "../IDE/src"
|
Path = "../IDE/src"
|
||||||
Name = "ide"
|
Name = "ide"
|
||||||
AutoInclude = true
|
|
||||||
|
|
|
@ -588,6 +588,7 @@
|
||||||
</DisableSpecificWarnings>
|
</DisableSpecificWarnings>
|
||||||
<SupportJustMyCode>false</SupportJustMyCode>
|
<SupportJustMyCode>false</SupportJustMyCode>
|
||||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||||
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
|
@ -612,6 +613,7 @@
|
||||||
</DisableSpecificWarnings>
|
</DisableSpecificWarnings>
|
||||||
<SupportJustMyCode>false</SupportJustMyCode>
|
<SupportJustMyCode>false</SupportJustMyCode>
|
||||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||||
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
|
@ -636,6 +638,7 @@
|
||||||
</DisableSpecificWarnings>
|
</DisableSpecificWarnings>
|
||||||
<SupportJustMyCode>false</SupportJustMyCode>
|
<SupportJustMyCode>false</SupportJustMyCode>
|
||||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||||
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
|
|
|
@ -540,6 +540,7 @@
|
||||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||||
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
|
@ -563,6 +564,7 @@
|
||||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||||
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
|
@ -586,6 +588,7 @@
|
||||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||||
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
|
|
|
@ -27,7 +27,7 @@ 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"
|
CLibType = "Dynamic"
|
||||||
DebugCommandArguments = "-workspace=c:\\beef\\BeefTools\\LogViewer"
|
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"]
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ 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"
|
CLibType = "Dynamic"
|
||||||
BeefLibType = "DynamicDebug"
|
BeefLibType = "DynamicDebug"
|
||||||
DebugCommandArguments = "-workspace=c:\\_beef\\testapp"
|
DebugCommandArguments = "-workspace=c:\\beef\\ide\\mintest"
|
||||||
DebugWorkingDirectory = "$(ProjectDir)\\dist"
|
DebugWorkingDirectory = "$(ProjectDir)\\dist"
|
||||||
EnvironmentVars = ["_NO_DEBUG_HEAP=1"]
|
EnvironmentVars = ["_NO_DEBUG_HEAP=1"]
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,7 @@ Projects = {mintest = {Path = "."}, minlib = {Path = "minlib"}, LibA = {Path = "
|
||||||
StartupProject = "mintest"
|
StartupProject = "mintest"
|
||||||
|
|
||||||
[Configs.Debug.Win32]
|
[Configs.Debug.Win32]
|
||||||
|
BfOptimizationLevel = "OgPlus"
|
||||||
InitLocalVariables = true
|
InitLocalVariables = true
|
||||||
IntermediateType = "ObjectAndIRCode"
|
IntermediateType = "ObjectAndIRCode"
|
||||||
ConfigSelections = {mintest2 = {Enabled = false}}
|
ConfigSelections = {mintest2 = {Enabled = false}}
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
|
|
||||||
|
|
||||||
//♀Farts
|
//♀Farts
|
||||||
//Ãjaxa̐ḁ
|
//Ãjaxa̐ḁ
|
||||||
|
|
||||||
|
@ -177,6 +176,9 @@ namespace Hey.Dude.Bro
|
||||||
|
|
||||||
public static int Main(String[] args)
|
public static int Main(String[] args)
|
||||||
{
|
{
|
||||||
|
int* iPtr = null;
|
||||||
|
*iPtr = 123;
|
||||||
|
|
||||||
Blurg.Hey();
|
Blurg.Hey();
|
||||||
|
|
||||||
/*while (true)
|
/*while (true)
|
||||||
|
|
|
@ -92,8 +92,50 @@ class Bloozer
|
||||||
int mA;
|
int mA;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
enum Zorf : IDisposable
|
||||||
|
{
|
||||||
|
case A;
|
||||||
|
case B;
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class IFaceA
|
||||||
|
{
|
||||||
|
public static void Fart()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class Zlips : IFaceA, IDisposable
|
||||||
|
{
|
||||||
|
static void Fart()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
PrintF("Disposed");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class Testo
|
||||||
|
{
|
||||||
|
public this()
|
||||||
|
{
|
||||||
|
PrintF("Testo this %p\n", this);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ~this()
|
||||||
|
{
|
||||||
|
PrintF("Testo ~this %p\n", this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
class Blurg
|
class Blurg
|
||||||
{
|
{
|
||||||
|
@ -107,16 +149,81 @@ class Blurg
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void TestIt(int a, int b, int c)
|
void TestIt(String a, String b)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void Hey()
|
TestStruct GetTS()
|
||||||
|
{
|
||||||
|
return .();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void Test(int a, int b)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void Test(int a, int b, int c)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void Use<T>(T val) where T : IFaceA
|
||||||
|
{
|
||||||
|
IFaceA.Fart();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void Hey()
|
||||||
|
{
|
||||||
|
Loop:
|
||||||
|
for (int i < 10)
|
||||||
|
{
|
||||||
|
defer
|
||||||
|
{
|
||||||
|
//for ()
|
||||||
|
JLoop: for (int j < 5)
|
||||||
|
{
|
||||||
|
//continue Loop;
|
||||||
|
}
|
||||||
|
|
||||||
|
//break JLoop;
|
||||||
|
|
||||||
|
int z = 3;
|
||||||
|
|
||||||
|
/*void Zorg()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
Zorg();*/
|
||||||
|
//return;
|
||||||
|
|
||||||
|
//break Loop;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
defer
|
||||||
|
{
|
||||||
|
scope:: Testo();
|
||||||
|
|
||||||
|
int i = 0;
|
||||||
|
if (i == 0)
|
||||||
|
scope:: Testo();
|
||||||
|
if (i == 1)
|
||||||
|
scope:: Testo();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
int aaaaaa = 123;
|
||||||
|
if (aaaaaa == 123)
|
||||||
|
return;//A
|
||||||
|
|
||||||
|
int bbbbbbb = 222;
|
||||||
|
return;//B
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class CustomAlloc
|
class CustomAlloc
|
||||||
|
|
|
@ -9430,6 +9430,14 @@ namespace IDE
|
||||||
|
|
||||||
void ShowStartupFile()
|
void ShowStartupFile()
|
||||||
{
|
{
|
||||||
|
bool hasSourceShown = false;
|
||||||
|
WithSourceViewPanels(scope [&] (panel) =>
|
||||||
|
{
|
||||||
|
hasSourceShown = true;
|
||||||
|
});
|
||||||
|
if (hasSourceShown)
|
||||||
|
return;
|
||||||
|
|
||||||
if (mWorkspace.mStartupProject != null)
|
if (mWorkspace.mStartupProject != null)
|
||||||
{
|
{
|
||||||
bool didShow = false;
|
bool didShow = false;
|
||||||
|
|
|
@ -71,6 +71,6 @@ IDE\dist\BeefBuild_d -proddir=BeefTools\BeefPerf -config=Release
|
||||||
@EXIT /b 0
|
@EXIT /b 0
|
||||||
|
|
||||||
:HADERROR
|
:HADERROR
|
||||||
@ECHO !!!!!FAILED!!!!!
|
@ECHO =================FAILED=================
|
||||||
@POPD
|
@POPD
|
||||||
@EXIT /b %ERRORLEVEL%
|
@EXIT /b %ERRORLEVEL%
|
||||||
|
|
18
extern/llvm_build.bat
vendored
18
extern/llvm_build.bat
vendored
|
@ -1,24 +1,24 @@
|
||||||
@IF EXIST llvm-project GOTO LLVM_HAS
|
@IF EXIST llvm-project GOTO LLVM_HAS
|
||||||
git clone --config core.autocrlf=false https://github.com/llvm/llvm-project.git llvm-project_8_0_0
|
git clone --config core.autocrlf=false https://github.com/llvm/llvm-project.git llvm-project_8_0_1
|
||||||
pushd llvm-project_8_0_0
|
pushd llvm-project_8_0_1
|
||||||
GOTO :LLVM_SET
|
GOTO :LLVM_SET
|
||||||
|
|
||||||
:LLVM_HAS
|
:LLVM_HAS
|
||||||
pushd llvm-project_8_0_0
|
pushd llvm-project_8_0_1
|
||||||
git pull origin master
|
git pull origin master
|
||||||
|
|
||||||
:LLVM_SET
|
:LLVM_SET
|
||||||
git checkout llvmorg-8.0.0
|
git checkout llvmorg-8.0.1
|
||||||
popd
|
popd
|
||||||
@IF EXIST llvm_win64_8_0_0 GOTO HAS_CONFIG
|
@IF EXIST llvm_win64_8_0_1 GOTO HAS_CONFIG
|
||||||
|
|
||||||
mkdir llvm_win64_8_0_0
|
mkdir llvm_win64_8_0_1
|
||||||
cd llvm_win64_8_0_0
|
cd llvm_win64_8_0_1
|
||||||
cmake ../llvm-project_8_0_0/llvm -Thost=x64 -G"Visual Studio 15 2017 Win64"
|
cmake ../llvm-project_8_0_1/llvm -Thost=x64 -G"Visual Studio 15 2017 Win64" -DLLVM_USE_CRT_DEBUG:STRING="MTd" -DLLVM_USE_CRT_RELEASE:STRING="MT"
|
||||||
@GOTO DOBUILD
|
@GOTO DOBUILD
|
||||||
|
|
||||||
:HAS_CONFIG
|
:HAS_CONFIG
|
||||||
cd llvm_win64_8_0_0
|
cd llvm_win64_8_0_1
|
||||||
@GOTO DOBUILD
|
@GOTO DOBUILD
|
||||||
|
|
||||||
:DOBUILD
|
:DOBUILD
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue