summaryrefslogtreecommitdiffstats
path: root/src/skel/win
diff options
context:
space:
mode:
Diffstat (limited to 'src/skel/win')
-rw-r--r--src/skel/win/win.cpp5
-rw-r--r--src/skel/win/win.h38
2 files changed, 8 insertions, 35 deletions
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index a2fda5b7..288788c0 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -1,3 +1,5 @@
+#if defined RW_D3D9 || defined RWLIBS
+
#define _WIN32_WINDOWS 0x0500
#define WINVER 0x0500
#define DIRECTINPUT_VERSION 0x0800
@@ -40,7 +42,7 @@
#include "resource.h"
#include "skeleton.h"
#include "platform.h"
-#include "win.h"
+#include "crossplatform.h"
#define MAX_SUBSYSTEMS (16)
@@ -3038,3 +3040,4 @@ int strcasecmp(const char *str1, const char *str2)
return _strcmpi(str1, str2);
}
#endif
+#endif \ No newline at end of file
diff --git a/src/skel/win/win.h b/src/skel/win/win.h
index d6326294..d05e3951 100644
--- a/src/skel/win/win.h
+++ b/src/skel/win/win.h
@@ -1,3 +1,6 @@
+
+// DON'T include directly. crossplatform.h includes this if you're on Windows.
+
#if (!defined(_PLATFORM_WIN_H))
#define _PLATFORM_WIN_H
@@ -10,23 +13,6 @@
#include <windef.h>
#endif
-enum eGameState
-{
- GS_START_UP = 0,
- GS_INIT_LOGO_MPEG,
- GS_LOGO_MPEG,
- GS_INIT_INTRO_MPEG,
- GS_INTRO_MPEG,
- GS_INIT_ONCE,
- GS_INIT_FRONTEND,
- GS_FRONTEND,
- GS_INIT_PLAYING_GAME,
- GS_PLAYING_GAME,
-#ifndef MASTER
- GS_ANIMVIEWER,
-#endif
-};
-
enum eWinVersion
{
OS_WIN95 = 0,
@@ -38,8 +24,6 @@ enum eWinVersion
extern DWORD _dwOperatingSystemVersion;
-extern RwUInt32 gGameState;
-
#ifdef __DINPUT_INCLUDED__
/* platform specfic global data */
typedef struct
@@ -79,7 +63,6 @@ struct tJoy
bool m_bInitialised;
bool m_bHasAxisZ;
bool m_bHasAxisR;
- char _pad0;
int m_nVendorID;
int m_nProductID;
};
@@ -101,12 +84,10 @@ extern "C"
{
#endif /* __cplusplus */
+#ifdef __DINPUT_INCLUDED__
extern LRESULT CALLBACK
MainWndProc(HWND window, UINT message, WPARAM wParam, LPARAM lParam);
-RwBool IsForegroundApp();
-
-#ifdef __DINPUT_INCLUDED__
HRESULT _InputInitialise();
HRESULT _InputInitialiseMouse();
HRESULT CapturePad(RwInt32 padID);
@@ -117,26 +98,15 @@ HRESULT _InputGetMouseState(DIMOUSESTATE2 *state);
void _InputShutdown();
BOOL CALLBACK _InputEnumDevicesCallback( const DIDEVICEINSTANCE* pdidInstance, VOID* pContext );
BOOL _InputTranslateKey(RsKeyCodes *rs, UINT flag, UINT key);
-void _InputTranslateShiftKeyUpDown(RsKeyCodes *rs);;
BOOL _InputTranslateShiftKey(RsKeyCodes *rs, UINT key, BOOLEAN bDown);
BOOL _InputIsExtended(INT flag);
#endif
-void InitialiseLanguage();
-RwBool _psSetVideoMode(RwInt32 subSystem, RwInt32 videoMode);
void CenterVideo(void);
void CloseClip(void);
-RwChar **_psGetVideoModeList();
-RwInt32 _psGetNumVideModes();
-
-void _psSelectScreenVM(RwInt32 videoMode);
-void HandleExit();
-
#ifdef __cplusplus
}
#endif /* __cplusplus */
-
-extern DWORD _dwOperatingSystemVersion;
#endif /* (!defined(_PLATFORM_WIN_H)) */