Browse Source

Merge pull request #125 from dpogue/master

Linux fixes
Adam Johnson 13 years ago
parent
commit
805dd6c2cd
  1. 2
      Sources/Plasma/CoreLib/HeadSpin.h
  2. 1
      Sources/Plasma/CoreLib/hsTypes.h
  3. 3
      Sources/Plasma/CoreLib/hsUtils.h
  4. 17
      Sources/Plasma/CoreLib/hsWindows.h
  5. 96
      Sources/Plasma/NucleusLib/pnInputCore/plKeyDef.h

2
Sources/Plasma/CoreLib/HeadSpin.h

@ -48,8 +48,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// Internal Headers // Internal Headers
// These are only ever included here :) // These are only ever included here :)
#include "hsWindows.h"
#include "hsTypes.h" #include "hsTypes.h"
#include "hsWindows.h"
#include "hsUtils.h" #include "hsUtils.h"
#endif #endif

1
Sources/Plasma/CoreLib/hsTypes.h

@ -50,6 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <cstdlib> #include <cstdlib>
#include <cstdio> #include <cstdio>
#include <cstddef> #include <cstddef>
#include <math.h>
/************************** Basic Macros *****************************/ /************************** Basic Macros *****************************/

3
Sources/Plasma/CoreLib/hsUtils.h

@ -46,7 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define _HSUTILS_H #define _HSUTILS_H
#include "HeadSpin.h" #include "HeadSpin.h"
#include <ctype.h> #include <cctype>
#include <cstring>
#include <stdarg.h> #include <stdarg.h>
int hsStrlen(const char src[]); int hsStrlen(const char src[]);

17
Sources/Plasma/CoreLib/hsWindows.h

@ -65,9 +65,26 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
# include <ws2tcpip.h> # include <ws2tcpip.h>
# endif // MAXPLUGINCODE # endif // MAXPLUGINCODE
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
# define NOMINMAX // Needed to prevent NxMath conflicts
# include <Windows.h> # include <Windows.h>
typedef HWND hsWindowHndl; typedef HWND hsWindowHndl;
typedef HINSTANCE hsWindowInst;
#else #else
typedef int32_t* hsWindowHndl; typedef int32_t* hsWindowHndl;
typedef int32_t* hsWindowInst;
#endif // HS_BUILD_FOR_WIN32 #endif // HS_BUILD_FOR_WIN32
/****************************************************************************
*
* max/min inline functions
*
***/
#ifdef max
#undef max
#endif
#ifdef min
#undef min
#endif

96
Sources/Plasma/NucleusLib/pnInputCore/plKeyDef.h

@ -176,8 +176,104 @@ enum plKeyDef
#elif HS_BUILD_FOR_UNIX #elif HS_BUILD_FOR_UNIX
/* This is a total hack (for now) */
enum plKeyDef enum plKeyDef
{ {
KEY_A = 0xffffffff,
KEY_B = 0xffffffff,
KEY_C = 0xffffffff,
KEY_D = 0xffffffff,
KEY_E = 0xffffffff,
KEY_F = 0xffffffff,
KEY_G = 0xffffffff,
KEY_H = 0xffffffff,
KEY_I = 0xffffffff,
KEY_J = 0xffffffff,
KEY_K = 0xffffffff,
KEY_L = 0xffffffff,
KEY_M = 0xffffffff,
KEY_N = 0xffffffff,
KEY_O = 0xffffffff,
KEY_P = 0xffffffff,
KEY_Q = 0xffffffff,
KEY_R = 0xffffffff,
KEY_S = 0xffffffff,
KEY_T = 0xffffffff,
KEY_U = 0xffffffff,
KEY_V = 0xffffffff,
KEY_W = 0xffffffff,
KEY_X = 0xffffffff,
KEY_Y = 0xffffffff,
KEY_Z = 0xffffffff,
KEY_0 = 0xffffffff,
KEY_1 = 0xffffffff,
KEY_2 = 0xffffffff,
KEY_3 = 0xffffffff,
KEY_4 = 0xffffffff,
KEY_5 = 0xffffffff,
KEY_6 = 0xffffffff,
KEY_7 = 0xffffffff,
KEY_8 = 0xffffffff,
KEY_9 = 0xffffffff,
KEY_F1 = 0xffffffff,
KEY_F2 = 0xffffffff,
KEY_F3 = 0xffffffff,
KEY_F4 = 0xffffffff,
KEY_F5 = 0xffffffff,
KEY_F6 = 0xffffffff,
KEY_F7 = 0xffffffff,
KEY_F8 = 0xffffffff,
KEY_F9 = 0xffffffff,
KEY_F10 = 0xffffffff,
KEY_F11 = 0xffffffff,
KEY_F12 = 0xffffffff,
KEY_ESCAPE = 0xffffffff,
KEY_TAB = 0xffffffff,
KEY_SHIFT = 0xffffffff,
KEY_CTRL = 0xffffffff,
KEY_ALT = 0xffffffff,
KEY_UP = 0xffffffff,
KEY_DOWN = 0xffffffff,
KEY_LEFT = 0xffffffff,
KEY_RIGHT = 0xffffffff,
KEY_BACKSPACE = 0xffffffff,
KEY_ENTER = 0xffffffff,
KEY_PAUSE = 0xffffffff,
KEY_CAPSLOCK = 0xffffffff,
KEY_PAGEUP = 0xffffffff,
KEY_PAGEDOWN = 0xffffffff,
KEY_END = 0xffffffff,
KEY_HOME = 0xffffffff,
KEY_PRINTSCREEN = 0xffffffff,
KEY_INSERT = 0xffffffff,
KEY_DELETE = 0xffffffff,
KEY_NUMPAD0 = 0xffffffff,
KEY_NUMPAD1 = 0xffffffff,
KEY_NUMPAD2 = 0xffffffff,
KEY_NUMPAD3 = 0xffffffff,
KEY_NUMPAD4 = 0xffffffff,
KEY_NUMPAD5 = 0xffffffff,
KEY_NUMPAD6 = 0xffffffff,
KEY_NUMPAD7 = 0xffffffff,
KEY_NUMPAD8 = 0xffffffff,
KEY_NUMPAD9 = 0xffffffff,
KEY_NUMPAD_MULTIPLY = 0xffffffff,
KEY_NUMPAD_ADD = 0xffffffff,
KEY_NUMPAD_SUBTRACT = 0xffffffff,
KEY_NUMPAD_PERIOD = 0xffffffff,
KEY_NUMPAD_DIVIDE = 0xffffffff,
KEY_SPACE = 0xffffffff,
KEY_COMMA = 0xffffffff,
KEY_PERIOD = 0xffffffff,
KEY_DASH = 0xffffffff,
KEY_EQUAL = 0xffffffff,
KEY_SEMICOLON = 0xffffffff,
KEY_SLASH = 0xffffffff,
KEY_TILDE = 0xffffffff,
KEY_LBRACKET = 0xffffffff,
KEY_BACKSLASH = 0xffffffff,
KEY_RBRACKET = 0xffffffff,
KEY_QUOTE = 0xffffffff,
KEY_UNMAPPED = 0xffffffff, KEY_UNMAPPED = 0xffffffff,
}; };
#endif #endif

Loading…
Cancel
Save