Added a 64 bit build target to the gyp file.

build/common.gypi

@@ -43,14 +43,13 @@
       }],
     ],
     'configurations': {
-      'Common': {
+      'Common_Base': {
         'abstract': 1,
         'msvs_configuration_attributes': {
-          'OutputDirectory': '$(SolutionDir)$(ConfigurationName)',
+          'OutputDirectory': '$(SolutionDir)$(ConfigurationName)_$(Platform)',
           'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
           'CharacterSet': '1',  # UNICODE
         },
-        'msvs_configuration_platform': 'Win32',
         'msvs_settings': {
           'VCCLCompilerTool': {
             'AdditionalOptions': ['/MP'],
@@ -83,9 +82,6 @@
             # Most of the executables we'll ever create are tests
             # and utilities with console output.
             'SubSystem': '1',  # /SUBSYSTEM:CONSOLE
-            'AdditionalLibraryDirectories': [
-              '$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x86',
-            ],
             'AdditionalDependencies': [
               'kernel32.lib',
               'gdi32.lib',
@@ -102,11 +98,6 @@
               'delayimp.lib',
             ],
           },
-          'VCLibrarianTool': {
-            'AdditionalLibraryDirectories': [
-              '$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x86',
-            ],
-          },
           'VCResourceCompilerTool': {
             'Culture': '1033',
           },
@@ -115,9 +106,10 @@
           '$(ProgramFiles)/Windows Kits/8.0/Include/shared',
           '$(ProgramFiles)/Windows Kits/8.0/Include/um',
         ],
-      },  # Common
-      'Debug': {
-        'inherit_from': ['Common'],
+      },  # Common_Base
+
+      'Debug_Base': {
+        'abstract': 1,
         'msvs_settings': {
           'VCCLCompilerTool': {
             'Optimization': '0',  # /Od
@@ -133,9 +125,10 @@
           'COPY_PHASE_STRIP': 'NO',
           'GCC_OPTIMIZATION_LEVEL': '0',
         },
-      },  # Debug
-      'Release': {
-        'inherit_from': ['Common'],
+      },  # Debug_Base
+
+      'Release_Base': {
+        'abstract': 1,
         'msvs_settings': {
           'VCCLCompilerTool': {
             'Optimization': '2',  # /Os
@@ -146,7 +139,61 @@
             'LinkIncremental': '1',
           },
         },
-      },  # Release
+      },  # Release_Base
+
+      'x86_Base': {
+        'abstract': 1,
+        'msvs_configuration_platform': 'Win32',
+        'msvs_settings': {
+          'VCLinkerTool': {
+            'TargetMachine': '1',
+            'AdditionalLibraryDirectories': [
+              '$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x86',
+            ],
+          },
+          'VCLibrarianTool': {
+            'AdditionalLibraryDirectories': [
+              '$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x86',
+            ],
+          },
+        },
+      }, # x86_Base
+
+      'x64_Base': {
+        'abstract': 1,
+        'msvs_configuration_platform': 'x64',
+        'msvs_settings': {
+          'VCLinkerTool': {
+            'TargetMachine': '17', # x86 - 64
+            'AdditionalLibraryDirectories': [
+              '$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x64',
+            ],
+          },
+          'VCLibrarianTool': {
+            'AdditionalLibraryDirectories': [
+              '$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x64',
+            ],
+          },
+        },
+      },  # x64_Base
+
+      # Concrete configurations
+      'Debug': {
+        'inherit_from': ['Common_Base', 'x86_Base', 'Debug_Base'],
+      },
+      'Release': {
+        'inherit_from': ['Common_Base', 'x86_Base', 'Release_Base'],
+      },
+      'conditions': [
+        [ 'OS=="win" and MSVS_VERSION != "2010e" and MSVS_VERSION != "2012e"', {
+          'Debug_x64': {
+            'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'],
+          },
+          'Release_x64': {
+            'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'],
+          },
+        }],
+      ],
     },  # configurations
     'conditions': [
       ['component=="shared_library"', {

samples/gles2_book/Common/Win32/esUtil_win32.c

@@ -42,7 +42,7 @@ LRESULT WINAPI ESWindowProc ( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
 
       case WM_SIZE:
          {
-            ESContext *esContext = (ESContext*)(LONG_PTR) GetWindowLongPtr ( hWnd, GWL_USERDATA );
+            ESContext *esContext = (ESContext*)(LONG_PTR) GetWindowLongPtr ( hWnd, GWLP_USERDATA );
             if ( esContext ) {
                esContext->width = LOWORD( lParam );
                esContext->height = HIWORD( lParam );
@@ -52,7 +52,7 @@ LRESULT WINAPI ESWindowProc ( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
 
       case WM_PAINT:
          {
-            ESContext *esContext = (ESContext*)(LONG_PTR) GetWindowLongPtr ( hWnd, GWL_USERDATA );
+            ESContext *esContext = (ESContext*)(LONG_PTR) GetWindowLongPtr ( hWnd, GWLP_USERDATA );
             
             if ( esContext && esContext->drawFunc )
                esContext->drawFunc ( esContext );
@@ -69,7 +69,7 @@ LRESULT WINAPI ESWindowProc ( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
       case WM_CHAR:
          {
             POINT      point;
-            ESContext *esContext = (ESContext*)(LONG_PTR) GetWindowLongPtr ( hWnd, GWL_USERDATA );
+            ESContext *esContext = (ESContext*)(LONG_PTR) GetWindowLongPtr ( hWnd, GWLP_USERDATA );
             
             GetCursorPos( &point );
 
@@ -140,7 +140,7 @@ GLboolean WinCreate ( ESContext *esContext, LPCTSTR title )
 
    // Set the ESContext* to the GWL_USERDATA so that it is available to the 
    // ESWindowProc
-   SetWindowLongPtr (  esContext->hWnd, GWL_USERDATA, (LONG) (LONG_PTR) esContext );
+   SetWindowLongPtr (  esContext->hWnd, GWLP_USERDATA, (LONG) (LONG_PTR) esContext );
 
    if ( esContext->hWnd == NULL )
       return GL_FALSE;