Skip to content

Commit

Permalink
Windows|Cleanup: Platform-specific changes
Browse files Browse the repository at this point in the history
  • Loading branch information
skyjake committed Sep 1, 2019
1 parent 0bcbefe commit 89e039e
Show file tree
Hide file tree
Showing 16 changed files with 12 additions and 356 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -41,4 +41,4 @@ compile_commands.json
/products
/debian
/distrib/deps

/build
4 changes: 2 additions & 2 deletions doomsday/apps/client/include/de_platform.h
Expand Up @@ -88,10 +88,10 @@ typedef unsigned int DWORD;

// Initialization code.
#ifdef WIN32
# include "dd_winit.h"
# include "init_windows.h"
#else
# ifdef UNIX
# include "dd_uinit.h"
# include "init_unix.h"
# endif
#endif

Expand Down
File renamed without changes.
File renamed without changes.
42 changes: 0 additions & 42 deletions doomsday/apps/client/include/macx/MusicPlayer.h

This file was deleted.

33 changes: 0 additions & 33 deletions doomsday/apps/client/include/macx/cursor_macx.h

This file was deleted.

6 changes: 0 additions & 6 deletions doomsday/apps/client/src/clientapp.cpp
Expand Up @@ -67,12 +67,6 @@
#include "world/map.h"
#include "world/p_players.h"

#if WIN32
# include "dd_winit.h"
#elif UNIX
# include "dd_uinit.h"
#endif

#include <doomsday/console/exec.h>
#include <doomsday/AbstractSession>
#include <doomsday/GameStateFolder>
Expand Down
6 changes: 3 additions & 3 deletions doomsday/apps/client/src/dd_main.cpp
Expand Up @@ -1274,10 +1274,10 @@ void DD_FinishInitializationAfterWindowReady()
LOGDEV_MSG("Window is ready, finishing initialization");

#ifdef __CLIENT__
# ifdef WIN32
//# ifdef WIN32
// Now we can get the color transfer table as the window is available.
DisplayMode_SaveOriginalColorTransfer();
# endif
//DisplayMode_SaveOriginalColorTransfer();
//# endif
if (!Sys_GLInitialize())
{
App_Error("Error initializing OpenGL.\n");
Expand Down
File renamed without changes.
Expand Up @@ -24,7 +24,7 @@
#include <windowsx.h>

#include "de_base.h"
#include "dd_winit.h"
#include "init_windows.h"

#include <objbase.h>
#include <cstring>
Expand All @@ -34,7 +34,6 @@

#include <de/App>
#ifdef __CLIENT__
# include <de/DisplayMode>
# include "gl/sys_opengl.h"
#endif
#include "sys_system.h"
Expand Down Expand Up @@ -126,13 +125,7 @@ dd_bool DD_Win32_Init()
void DD_Shutdown()
{
DD_ShutdownAll(); // Stop all engine subsystems.
//DoomsdayApp::plugins().unloadAll();
//Library_Shutdown();

// No more use of COM beyond, this point.
CoUninitialize();

#ifdef __CLIENT__
DisplayMode_Shutdown();
#endif
}
214 changes: 0 additions & 214 deletions doomsday/apps/client/src/macx/MusicPlayer.mm

This file was deleted.

0 comments on commit 89e039e

Please sign in to comment.