diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-03-09 07:31:43 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-03-09 07:32:10 +0300 |
| commit | b624b0a4d6410134072c894d5686335c588a6c99 (patch) | |
| tree | 655dda6e0f4ed4ac772a6150f8d3cd2a6ebaec9b /src/gui | |
| parent | b406b1a7717af8fd479d39133df35fb331880b61 (diff) | |
| download | manaplus-b624b0a4d6410134072c894d5686335c588a6c99.tar.gz manaplus-b624b0a4d6410134072c894d5686335c588a6c99.tar.bz2 manaplus-b624b0a4d6410134072c894d5686335c588a6c99.tar.xz manaplus-b624b0a4d6410134072c894d5686335c588a6c99.zip | |
Fix compilation without OpenGL.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/tabs/debugwindowtabs.cpp | 14 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/debugwindowtabs.h | 2 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/gui/widgets/tabs/debugwindowtabs.cpp b/src/gui/widgets/tabs/debugwindowtabs.cpp index e3d7d7498..d9a1e4c0e 100644 --- a/src/gui/widgets/tabs/debugwindowtabs.cpp +++ b/src/gui/widgets/tabs/debugwindowtabs.cpp @@ -67,9 +67,11 @@ MapDebugTab::MapDebugTab(const Widget2 *const widget) : mMapActorCountLabel(new Label(this, strprintf("%s %d", // TRANSLATORS: debug window label _("Map actors count:"), 88888))), +#ifdef USE_OPENGL mMapAtlasCountLabel(new Label(this, strprintf("%s %d", // TRANSLATORS: debug window label _("Map atlas count:"), 88888))), +#endif // USE_OPENGL // TRANSLATORS: debug window label mXYLabel(new Label(this, strprintf("%s (?,?)", _("Player Position:")))), mTexturesLabel(nullptr), @@ -144,11 +146,11 @@ MapDebugTab::MapDebugTab(const Widget2 *const widget) : place(0, 7, mTileMouseLabel, 2, 1); place(0, 8, mParticleCountLabel, 2, 1); place(0, 9, mMapActorCountLabel, 2, 1); - place(0, 10, mMapAtlasCountLabel, 2, 1); #ifdef USE_OPENGL + place(0, 10, mMapAtlasCountLabel, 2, 1); #if defined (DEBUG_OPENGL_LEAKS) || defined(DEBUG_DRAW_CALLS) \ || defined(DEBUG_BIND_TEXTURE) - int n = 10; + int n = 11; #endif // defined (DEBUG_OPENGL_LEAKS) || defined(DEBUG_DRAW_CALLS) // || defined(DEBUG_BIND_TEXTURE) #ifdef DEBUG_OPENGL_LEAKS @@ -225,11 +227,11 @@ void MapDebugTab::logic() // TRANSLATORS: debug window label strprintf("%s %d", _("Map actors count:"), map->getActorsCount())); +#ifdef USE_OPENGL mMapAtlasCountLabel->setCaption( // TRANSLATORS: debug window label strprintf("%s %d", _("Map atlas count:"), map->getAtlasCount())); -#ifdef USE_OPENGL #ifdef DEBUG_OPENGL_LEAKS mTexturesLabel->setCaption(strprintf("%s %d", // TRANSLATORS: debug window label @@ -269,14 +271,18 @@ void MapDebugTab::logic() mMapActorCountLabel->setCaption( // TRANSLATORS: debug window label strprintf("%s ?", _("Map actors count:"))); +#ifdef USE_OPENGL mMapAtlasCountLabel->setCaption( // TRANSLATORS: debug window label strprintf("%s ?", _("Map atlas count:"))); +#endif // USE_OPENGL } mMapActorCountLabel->adjustSize(); - mMapAtlasCountLabel->adjustSize(); mParticleCountLabel->adjustSize(); +#ifdef USE_OPENGL + mMapAtlasCountLabel->adjustSize(); +#endif // USE_OPENGL mFPSLabel->setCaption(strprintf(mFPSText.c_str(), fps)); // TRANSLATORS: debug window label, logic per second diff --git a/src/gui/widgets/tabs/debugwindowtabs.h b/src/gui/widgets/tabs/debugwindowtabs.h index e4c41dda8..17722f658 100644 --- a/src/gui/widgets/tabs/debugwindowtabs.h +++ b/src/gui/widgets/tabs/debugwindowtabs.h @@ -66,7 +66,9 @@ class MapDebugTab final : public DebugTab Label *mTileMouseLabel A_NONNULLPOINTER; Label *mParticleCountLabel A_NONNULLPOINTER; Label *mMapActorCountLabel A_NONNULLPOINTER; +#ifdef USE_OPENGL Label *mMapAtlasCountLabel A_NONNULLPOINTER; +#endif // USE_OPENGL Label *mXYLabel A_NONNULLPOINTER; Label *mTexturesLabel A_NONNULLPOINTER; time_t mUpdateTime; |