Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 19:48:20 +02:00
Code Activity

Fixed GUI Application setting on non-Windows platforms

Browse source
This commit is contained in:
Brian Fiete 2020-05-04 15:05:42 -07:00
parent b601d86bb2
commit 1f2632786c
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
IDEHelper/Compiler/BfCompiler.cpp
View file

@ -1614,12 +1614,16 @@ void BfCompiler::CreateVData(BfVDataModule* bfModule)
bfModule->mBfIRBuilder->CreateRetVoid(); bfModule->mBfIRBuilder->CreateRetVoid();
} }
auto targetType = project->mTargetType;
if ((targetType == BfTargetType_BeefWindowsApplication) && (mOptions.mPlatformType != BfPlatformType_Windows))
targetType = BfTargetType_BeefConsoleApplication;
// Generate "main" // Generate "main"
if (!IsHotCompile()) if (!IsHotCompile())
{ {
BfIRFunctionType mainFuncType; BfIRFunctionType mainFuncType;
BfIRFunction mainFunc; BfIRFunction mainFunc;
if ((project->mTargetType == BfTargetType_BeefConsoleApplication) || (project->mTargetType == BfTargetType_BeefTest)) if ((targetType == BfTargetType_BeefConsoleApplication) || (targetType == BfTargetType_BeefTest))
{ {
SmallVector<BfIRType, 2> paramTypes; SmallVector<BfIRType, 2> paramTypes;
paramTypes.push_back(int32Type); paramTypes.push_back(int32Type);
@ -1628,7 +1632,7 @@ void BfCompiler::CreateVData(BfVDataModule* bfModule)
mainFunc = bfModule->mBfIRBuilder->CreateFunction(mainFuncType, BfIRLinkageType_External, "main"); mainFunc = bfModule->mBfIRBuilder->CreateFunction(mainFuncType, BfIRLinkageType_External, "main");
bfModule->SetupIRMethod(NULL, mainFunc, false); bfModule->SetupIRMethod(NULL, mainFunc, false);
} }
else if (project->mTargetType == BfTargetType_BeefDynLib) else if (targetType == BfTargetType_BeefDynLib)
{ {
SmallVector<BfIRType, 4> paramTypes; SmallVector<BfIRType, 4> paramTypes;
paramTypes.push_back(nullPtrType); // hinstDLL paramTypes.push_back(nullPtrType); // hinstDLL
@ -1640,7 +1644,7 @@ void BfCompiler::CreateVData(BfVDataModule* bfModule)
bfModule->mBfIRBuilder->SetFuncCallingConv(mainFunc, BfIRCallingConv_StdCall); bfModule->mBfIRBuilder->SetFuncCallingConv(mainFunc, BfIRCallingConv_StdCall);
bfModule->SetupIRMethod(NULL, mainFunc, false); bfModule->SetupIRMethod(NULL, mainFunc, false);
} }
else if (project->mTargetType == BfTargetType_BeefWindowsApplication) else if (targetType == BfTargetType_BeefWindowsApplication)
{ {
SmallVector<BfIRType, 4> paramTypes; SmallVector<BfIRType, 4> paramTypes;
paramTypes.push_back(nullPtrType); // hInstance paramTypes.push_back(nullPtrType); // hInstance
@ -1685,7 +1689,7 @@ void BfCompiler::CreateVData(BfVDataModule* bfModule)
#endif #endif
BfIRBlock initSkipBlock; BfIRBlock initSkipBlock;
if (project->mTargetType == BfTargetType_BeefDynLib) if (targetType == BfTargetType_BeefDynLib)
{ {
auto initBlock = bfModule->mBfIRBuilder->CreateBlock("doInit", false); auto initBlock = bfModule->mBfIRBuilder->CreateBlock("doInit", false);
initSkipBlock = bfModule->mBfIRBuilder->CreateBlock("skipInit", false); initSkipBlock = bfModule->mBfIRBuilder->CreateBlock("skipInit", false);
@ -1749,8 +1753,8 @@ void BfCompiler::CreateVData(BfVDataModule* bfModule)
} }
BfIRValue retValue; BfIRValue retValue;
if ((project->mTargetType == BfTargetType_BeefConsoleApplication) || (project->mTargetType == BfTargetType_BeefWindowsApplication) || if ((targetType == BfTargetType_BeefConsoleApplication) || (targetType == BfTargetType_BeefWindowsApplication) ||
(project->mTargetType == BfTargetType_BeefApplication_StaticLib) || (project->mTargetType == BfTargetType_BeefApplication_DynamicLib)) (targetType == BfTargetType_BeefApplication_StaticLib) || (targetType == BfTargetType_BeefApplication_DynamicLib))
{ {
bool hadRet = false; bool hadRet = false;
@ -1890,16 +1894,16 @@ void BfCompiler::CreateVData(BfVDataModule* bfModule)
if (!hadRet) if (!hadRet)
retValue = bfModule->GetConstValue32(0); retValue = bfModule->GetConstValue32(0);
} }
else if (project->mTargetType == BfTargetType_BeefDynLib) else if (targetType == BfTargetType_BeefDynLib)
{ {
retValue = bfModule->GetConstValue32(1); retValue = bfModule->GetConstValue32(1);
} }
if (project->mTargetType == BfTargetType_BeefTest) if (targetType == BfTargetType_BeefTest)
EmitTestMethod(bfModule, testMethods, retValue); EmitTestMethod(bfModule, testMethods, retValue);
BfIRBlock deinitSkipBlock; BfIRBlock deinitSkipBlock;
if (project->mTargetType == BfTargetType_BeefDynLib) if (targetType == BfTargetType_BeefDynLib)
{ {
auto deinitBlock = bfModule->mBfIRBuilder->CreateBlock("doDeinit", false); auto deinitBlock = bfModule->mBfIRBuilder->CreateBlock("doDeinit", false);
deinitSkipBlock = bfModule->mBfIRBuilder->CreateBlock("skipDeinit", false); deinitSkipBlock = bfModule->mBfIRBuilder->CreateBlock("skipDeinit", false);