Merge pull request #125 from dpogue/master

Linux fixes

Sources/Plasma/CoreLib/HeadSpin.h

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

Sources/Plasma/CoreLib/hsTypes.h

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

Sources/Plasma/CoreLib/hsUtils.h

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

Sources/Plasma/CoreLib/hsWindows.h

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

Sources/Plasma/NucleusLib/pnInputCore/plKeyDef.h

@@ -141,15 +141,15 @@ enum plKeyDef
     KEY_PRINTSCREEN     = VK_SNAPSHOT,
     KEY_INSERT          = VK_INSERT,
     KEY_DELETE          = VK_DELETE,
-    KEY_NUMPAD0         = VK_NUMPAD0,       
+    KEY_NUMPAD0         = VK_NUMPAD0,
-    KEY_NUMPAD1         = VK_NUMPAD1,       
+    KEY_NUMPAD1         = VK_NUMPAD1,
-    KEY_NUMPAD2         = VK_NUMPAD2,       
+    KEY_NUMPAD2         = VK_NUMPAD2,
-    KEY_NUMPAD3         = VK_NUMPAD3,       
+    KEY_NUMPAD3         = VK_NUMPAD3,
-    KEY_NUMPAD4         = VK_NUMPAD4,       
+    KEY_NUMPAD4         = VK_NUMPAD4,
-    KEY_NUMPAD5         = VK_NUMPAD5,       
+    KEY_NUMPAD5         = VK_NUMPAD5,
-    KEY_NUMPAD6         = VK_NUMPAD6,       
+    KEY_NUMPAD6         = VK_NUMPAD6,
-    KEY_NUMPAD7         = VK_NUMPAD7,       
+    KEY_NUMPAD7         = VK_NUMPAD7,
-    KEY_NUMPAD8         = VK_NUMPAD8,       
+    KEY_NUMPAD8         = VK_NUMPAD8,
     KEY_NUMPAD9         = VK_NUMPAD9,
     KEY_NUMPAD_MULTIPLY = VK_MULTIPLY,
     KEY_NUMPAD_ADD      = VK_ADD,
@@ -161,11 +161,11 @@ enum plKeyDef
     KEY_PERIOD          = VK_OEM_PERIOD,
     KEY_DASH            = VK_OEM_MINUS,
     KEY_EQUAL           = VK_OEM_PLUS,
-    
+
     // these are only good in the US of A...
     KEY_SEMICOLON       = VK_OEM_1,
     KEY_SLASH           = VK_OEM_2,
-    KEY_TILDE           = VK_OEM_3, 
+    KEY_TILDE           = VK_OEM_3,
     KEY_LBRACKET        = VK_OEM_4,
     KEY_BACKSLASH       = VK_OEM_5,
     KEY_RBRACKET        = VK_OEM_6,
@@ -176,8 +176,104 @@ enum plKeyDef
 
 #elif HS_BUILD_FOR_UNIX
 
+/* This is a total hack (for now) */
 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,
 };
 #endif