diff --git a/GpApp/Main.cpp b/GpApp/Main.cpp index 740b7a6..9d3caf2 100644 --- a/GpApp/Main.cpp +++ b/GpApp/Main.cpp @@ -529,6 +529,11 @@ int AppStartup() PL_Init(); + IGpLogDriver *logger = PLDrivers::GetLogDriver(); + + if (logger) + logger->Printf(IGpLogDriver::Category_Information, "Init phase 1..."); + ToolBoxInit(); CheckOurEnvirons(); @@ -546,9 +551,15 @@ int AppStartup() LoadCursors(); ReadInPrefs(); + if (logger) + logger->Printf(IGpLogDriver::Category_Information, "Init phase 2..."); + SpinCursor(2); // Tick once to let the display driver flush any resolution changes from prefs FlushResolutionChange(); + if (logger) + logger->Printf(IGpLogDriver::Category_Information, "Init phase 3..."); + #if defined COMPILEDEMO copyGood = true; #elif defined COMPILENOCP @@ -573,6 +584,9 @@ int AppStartup() InitSrcRects(); CreateOffscreens(); + if (logger) + logger->Printf(IGpLogDriver::Category_Information, "Init phase 3..."); + bool resolutionChanged = false; if (!isPrefsLoaded) @@ -585,7 +599,7 @@ int AppStartup() FlushResolutionChange(); } - ShowInitialLaunchDisclaimer(); + ShowInitialLaunchDisclaimer(); } if (thisMac.isResolutionDirty) @@ -599,10 +613,14 @@ int AppStartup() if (isDoColorFade) PortabilityLayer::WindowManager::GetInstance()->SetWindowDesaturation(mainWindow, 1.0); + if (logger) + logger->Printf(IGpLogDriver::Category_Information, "Init phase 4..."); InitSound(); SpinCursor(2); InitMusic(); SpinCursor(2); + if (logger) + logger->Printf(IGpLogDriver::Category_Information, "Init phase 5..."); BuildHouseList(); OpenHouse(true); @@ -618,6 +636,9 @@ int AppStartup() // HideMenuBarOld(); #endif + if (logger) + logger->Printf(IGpLogDriver::Category_Information, "Initialization completed"); + if (isDoColorFade) WashColorIn(); @@ -665,4 +686,4 @@ int gpAppMain() HandleEvent(); return AppShutdown(); -} +} \ No newline at end of file diff --git a/GpFontHandler_FreeType2/GpFontHandler_FreeType2.cpp b/GpFontHandler_FreeType2/GpFontHandler_FreeType2.cpp index e8e8ddd..270861a 100644 --- a/GpFontHandler_FreeType2/GpFontHandler_FreeType2.cpp +++ b/GpFontHandler_FreeType2/GpFontHandler_FreeType2.cpp @@ -453,9 +453,8 @@ bool GpFontHandler_FreeType2::Init() return true; } - -#ifdef _MSC_VER extern "C" +#ifdef _MSC_VER __declspec(dllexport) #endif IGpFontHandler *GpDriver_CreateFontHandler_FreeType2(const GpFontHandlerProperties &properties)