otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into preset1

Browse source
This commit is contained in:
cam900 2022-06-17 09:19:17 +09:00
commit 0c1a8bc001
33 changed files with 1595 additions and 322 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/main.cpp
View file

@ -30,6 +30,7 @@
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <combaseapi.h>
#include <shellapi.h>
#else
#include <unistd.h>
@ -244,6 +245,12 @@ void initParams() {
// TODO: add crash log
int main(int argc, char** argv) {
initLog();
#ifdef _WIN32
HRESULT coResult=CoInitializeEx(NULL,COINIT_MULTITHREADED);
if (coResult!=S_OK) {
logE("CoInitializeEx failed!");
}
#endif
#if !(defined(__APPLE__) || defined(_WIN32) || defined(ANDROID))
// workaround for Wayland HiDPI issue
if (getenv("SDL_VIDEODRIVER")==NULL) {
@ -447,6 +454,12 @@ int main(int argc, char** argv) {
logI("stopping engine.");
e.quit();
#ifdef _WIN32
if (coResult==S_OK || coResult==S_FALSE) {
CoUninitialize();
}
#endif
return 0;
}