Windows fixes

This commit is contained in:
Jack Andersen 2018-05-28 10:27:41 -10:00
parent 2c151a0f3b
commit 65fd883a99
3 changed files with 6 additions and 4 deletions

View File

@ -236,7 +236,9 @@ int WINAPIV main(Platform::Array<Platform::String^>^ params)
int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE, LPWSTR lpCmdLine, int) int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE, LPWSTR lpCmdLine, int)
{ {
int argc = 0; int argc = 0;
const boo::SystemChar** argv = (const wchar_t**)(CommandLineToArgvW(lpCmdLine, &argc)); const boo::SystemChar** argv;
if (lpCmdLine[0])
argv = (const wchar_t**)(CommandLineToArgvW(lpCmdLine, &argc));
static boo::SystemChar selfPath[1024]; static boo::SystemChar selfPath[1024];
GetModuleFileNameW(nullptr, selfPath, 1024); GetModuleFileNameW(nullptr, selfPath, 1024);
static const boo::SystemChar* booArgv[32] = {}; static const boo::SystemChar* booArgv[32] = {};
@ -246,7 +248,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE, LPWSTR lpCmdLine, int)
if (IsClientLoggingEnabled(argc+1, booArgv)) if (IsClientLoggingEnabled(argc+1, booArgv))
logvisor::CreateWin32Console(); logvisor::CreateWin32Console();
return wmain(argc+1, booArgv); return wmain(argc + 1, booArgv);
} }
#endif #endif

2
amuse

@ -1 +1 @@
Subproject commit 77c7daa67c2077dcfd14b34aea3fa613c146d1ca Subproject commit d7011f0e77c2cce57d0195f07e325e7415794676

2
hecl

@ -1 +1 @@
Subproject commit 48996c1548344834a7c3c0713c8b8c7f337fa73b Subproject commit 3cca5be30bb403d5a9c7f4c1a20be1b388d67669