diff options
author | José Fonseca <[email protected]> | 2011-07-14 17:28:52 +0100 |
---|---|---|
committer | José Fonseca <[email protected]> | 2011-07-14 17:35:05 +0100 |
commit | 9a7f84d6b28e180ef79349b36de9a5d58a1e2dc9 (patch) | |
tree | 31d2acf247f5a0738ed7656f86125fa065ce0a36 /src/glut/glx/glutwin32.h | |
parent | ff2efdf5997d20b41f7a82b77118366e6fbd23bc (diff) |
Squashed commit of the following:
commit 1856230d9fa61710cce3e152b8d88b1269611a73
Author: José Fonseca <[email protected]>
Date: Tue Jul 12 23:41:27 2011 +0100
make: Use better var names on packaging.
commit d1ae72d0bd14e820ecfe9f8f27b316f9566ceb0c
Author: José Fonseca <[email protected]>
Date: Tue Jul 12 23:38:21 2011 +0100
make: Apply several of Dan Nicholson's suggestions.
commit f27cf8743ac9cbf4c0ad66aff0cd3f97efde97e4
Author: José Fonseca <[email protected]>
Date: Sat Jul 9 14:18:20 2011 +0100
make: Put back the tar.bz2 creation rule.
Removed by accident.
commit 34983337f9d7db984e9f0117808274106d262110
Author: José Fonseca <[email protected]>
Date: Sat Jul 9 11:59:29 2011 +0100
make: Determine tarballs contents via git ls-files.
The wildcards were a mess:
- lots of files for non Linux platforms missing
- several files listed and archived twice
Using git-ls-files ensures things are not loss when making the tarballs.
commit 34a28ccbf459ed5710aafba5e7149e8291cb808c
Author: José Fonseca <[email protected]>
Date: Sat Jul 9 11:07:14 2011 +0100
glut: Remove GLUT source.
Most distros ship freeglut, and most people don't care one vs the other,
and it hasn't been really maintained.
So it is better to have Mesa GLUT be revisioned and built separately
from Mesa.
commit 5c26a2c3c0c7e95ef853e19d12d75c4f80137e7d
Author: José Fonseca <[email protected]>
Date: Sat Jul 9 10:31:02 2011 +0100
Ignore the tarballs.
commit 26edecac589819f0d0efe2165ab748dbc4e53394
Author: José Fonseca <[email protected]>
Date: Sat Jul 9 10:30:24 2011 +0100
make: Create the Mesa-xxx-devel symlink automatically.
Also actually remote the intermediate uncompressed tarballs.
Diffstat (limited to 'src/glut/glx/glutwin32.h')
-rw-r--r-- | src/glut/glx/glutwin32.h | 97 |
1 files changed, 0 insertions, 97 deletions
diff --git a/src/glut/glx/glutwin32.h b/src/glut/glx/glutwin32.h deleted file mode 100644 index 01db99fad6d..00000000000 --- a/src/glut/glx/glutwin32.h +++ /dev/null @@ -1,97 +0,0 @@ -#ifndef __glutwin32_h__ -#define __glutwin32_h__ - -/* Copyright (c) Nate Robins, 1997. */ - -/* This program is freely distributable without licensing fees - and is provided without guarantee or warrantee expressed or - implied. This program is -not- in the public domain. */ - -#include "win32_x11.h" -#include "win32_glx.h" - -/* We have to undef some things because Microsoft likes to pollute the - global namespace. */ -#undef TRANSPARENT - -/* Win32 "equivalent" cursors - eventually, the X glyphs should be - converted to Win32 cursors -- then they will look the same */ -#define XC_arrow IDC_ARROW -#define XC_top_left_arrow IDC_ARROW -#define XC_hand1 IDC_SIZEALL -#define XC_pirate IDC_NO -#define XC_question_arrow IDC_HELP -#define XC_exchange IDC_NO -#define XC_spraycan IDC_SIZEALL -#define XC_watch IDC_WAIT -#define XC_xterm IDC_IBEAM -#define XC_crosshair IDC_CROSS -#define XC_sb_v_double_arrow IDC_SIZENS -#define XC_sb_h_double_arrow IDC_SIZEWE -#define XC_top_side IDC_UPARROW -#define XC_bottom_side IDC_SIZENS -#define XC_left_side IDC_SIZEWE -#define XC_right_side IDC_SIZEWE -#define XC_top_left_corner IDC_SIZENWSE -#define XC_top_right_corner IDC_SIZENESW -#define XC_bottom_right_corner IDC_SIZENWSE -#define XC_bottom_left_corner IDC_SIZENESW - -#define XA_STRING 0 - -/* Private routines from win32_util.c */ -#ifndef __CYGWIN32__ -struct timeval; -extern int gettimeofday(struct timeval* tp, void* tzp); -#endif -extern void *__glutFont(void *font); -extern int __glutGetTransparentPixel(Display *dpy, XVisualInfo *vinfo); -extern void __glutAdjustCoords(Window parent, int *x, int *y, int *width, int *height); - - -/* Cygwin B20.1 misses the following definitions */ -#ifdef __CYGWIN32__ - -/* from winuser.h */ -#define CDS_FULLSCREEN 4 - -/* from mmsystem.h */ -#define WINMMAPI __declspec(dllimport) -typedef UINT MMRESULT; - -#define MM_JOY1MOVE 0x3A0 -#define MM_JOY1ZMOVE 0x3A2 -#define MM_JOY1BUTTONDOWN 0x3B5 -#define MM_JOY1BUTTONUP 0x3B7 - -#define JOYERR_NOERROR 0 -#define JOYERR_PARMS 165 - -#define JOY_RETURNALL 0x000000ffl - -#define JOYSTICKID1 0 - -typedef struct joyinfoex_tag { - DWORD dwSize; /* size of structure */ - DWORD dwFlags; /* flags to indicate what to return */ - DWORD dwXpos; /* x position */ - DWORD dwYpos; /* y position */ - DWORD dwZpos; /* z position */ - DWORD dwRpos; /* rudder/4th axis position */ - DWORD dwUpos; /* 5th axis position */ - DWORD dwVpos; /* 6th axis position */ - DWORD dwButtons; /* button states */ - DWORD dwButtonNumber; /* current button number pressed */ - DWORD dwPOV; /* point of view state */ - DWORD dwReserved1; /* reserved for communication between winmm & driver */ - DWORD dwReserved2; /* reserved for future expansion */ -} JOYINFOEX, *PJOYINFOEX, /* NEAR */ *NPJOYINFOEX, /* FAR */ *LPJOYINFOEX; - -WINMMAPI MMRESULT WINAPI joyGetPosEx( UINT uJoyID, LPJOYINFOEX pji); -WINMMAPI MMRESULT WINAPI joyReleaseCapture( UINT uJoyID); -WINMMAPI MMRESULT WINAPI joySetCapture( HWND hwnd, UINT uJoyID, UINT uPeriod, BOOL fChanged); -WINMMAPI MMRESULT WINAPI joySetThreshold( UINT uJoyID, UINT uThreshold); - -#endif - -#endif /* __glutwin32_h__ */ |