浏览代码

[Nokia N-Gage] Re-enable FPS counter, fix link in README.
- Re-enable FPS counter, which is hidden by default anyway - but essential while working on an actual project.
- Fix link in the platform's README.
- Re-order list of supported platforms (alphabetical order to maintain consistency).

Michael Fitzmayer 2 月之前
父节点
当前提交
03489e249a
共有 3 个文件被更改,包括 2 次插入8 次删除
  1. 1 1
      docs/README-ngage.md
  2. 1 1
      docs/README-platforms.md
  3. 0 6
      src/render/ngage/SDL_render_ngage.cpp

+ 1 - 1
docs/README-ngage.md

@@ -44,7 +44,7 @@ a state-of-the-art C23 compiler.  The irony writes itself.
 ## Existing Issues and Limitations
 ## Existing Issues and Limitations
 
 
 - For now, the new
 - For now, the new
- [SDL3 main callbacks](https://wiki.libsdl.org/SDL3/README/main-functions#how-to-use-main-callbacks-in-sdl3)
+ [SDL3 main callbacks](https://wiki.libsdl.org/SDL3/README-main-functions#main-callbacks-in-sdl3)
  are not optional and must be used. This is important as the callbacks
  are not optional and must be used. This is important as the callbacks
  are optional on other platforms.
  are optional on other platforms.
 
 

+ 1 - 1
docs/README-platforms.md

@@ -12,6 +12,7 @@
 - [NetBSD](README-bsd.md)
 - [NetBSD](README-bsd.md)
 - [Nintendo Switch](README-switch.md)
 - [Nintendo Switch](README-switch.md)
 - [Nintendo 3DS](README-n3ds.md)
 - [Nintendo 3DS](README-n3ds.md)
+- [Nokia N-Gage](README-ngage.md)]
 - [OpenBSD](README-bsd.md)
 - [OpenBSD](README-bsd.md)
 - [PlayStation 2](README-ps2.md)
 - [PlayStation 2](README-ps2.md)
 - [PlayStation 4](README-ps4.md)
 - [PlayStation 4](README-ps4.md)
@@ -24,7 +25,6 @@
 - [Windows](README-windows.md)
 - [Windows](README-windows.md)
 - [Windows GDK](README-gdk.md)
 - [Windows GDK](README-gdk.md)
 - [Xbox](README-gdk.md)
 - [Xbox](README-gdk.md)
-- [Nokia N-Gage](README-ngage.md)
 
 
 ## Unsupported Platforms
 ## Unsupported Platforms
 
 

+ 0 - 6
src/render/ngage/SDL_render_ngage.cpp

@@ -512,7 +512,6 @@ void CRenderer::Flip()
         return;
         return;
     }
     }
 
 
-#ifdef SDL_VIDEO_RENDER_NGAGE_FPS
     iRenderer->Gc()->UseFont(iFont);
     iRenderer->Gc()->UseFont(iFont);
 
 
     if (iShowFPS && iRenderer->Gc()) {
     if (iShowFPS && iRenderer->Gc()) {
@@ -537,7 +536,6 @@ void CRenderer::Flip()
         iRenderer->Gc()->DrawText(_L(""), TPoint(0, 0));
         iRenderer->Gc()->DrawText(_L(""), TPoint(0, 0));
     }
     }
     iRenderer->Gc()->DiscardFont();
     iRenderer->Gc()->DiscardFont();
-#endif // SDL_VIDEO_RENDER_NGAGE_FPS
     iRenderer->Flip(iDirectScreen);
     iRenderer->Flip(iDirectScreen);
 
 
     // Keep the backlight on.
     // Keep the backlight on.
@@ -571,7 +569,6 @@ void CRenderer::SetClipRect(TInt aX, TInt aY, TInt aWidth, TInt aHeight)
     }
     }
 }
 }
 
 
-#ifdef SDL_VIDEO_RENDER_NGAGE_FPS
 void CRenderer::UpdateFPS()
 void CRenderer::UpdateFPS()
 {
 {
     static TTime lastTime;
     static TTime lastTime;
@@ -593,7 +590,6 @@ void CRenderer::UpdateFPS()
         lastTime = currentTime;
         lastTime = currentTime;
     }
     }
 }
 }
-#endif
 
 
 void CRenderer::SuspendScreenSaver(TBool aSuspend)
 void CRenderer::SuspendScreenSaver(TBool aSuspend)
 {
 {
@@ -688,7 +684,6 @@ void CRenderer::HandleEvent(const TWsEvent &aWsEvent)
         timestamp = SDL_GetPerformanceCounter();
         timestamp = SDL_GetPerformanceCounter();
         SDL_SendKeyboardKey(timestamp, 1, aWsEvent.Key()->iCode, ConvertScancode(aWsEvent.Key()->iScanCode), true);
         SDL_SendKeyboardKey(timestamp, 1, aWsEvent.Key()->iCode, ConvertScancode(aWsEvent.Key()->iScanCode), true);
 
 
-#ifdef SDL_VIDEO_RENDER_NGAGE_FPS
         if (aWsEvent.Key()->iScanCode == EStdKeyHash) {
         if (aWsEvent.Key()->iScanCode == EStdKeyHash) {
             if (iShowFPS) {
             if (iShowFPS) {
                 iShowFPS = EFalse;
                 iShowFPS = EFalse;
@@ -696,7 +691,6 @@ void CRenderer::HandleEvent(const TWsEvent &aWsEvent)
                 iShowFPS = ETrue;
                 iShowFPS = ETrue;
             }
             }
         }
         }
-#endif
 
 
         break;
         break;
     case EEventKeyUp: /* Key events */
     case EEventKeyUp: /* Key events */