glut: MinGW portability fixes.
Still, it doesn't run as well as the glut binaries...
This commit is contained in:
parent
7662409661
commit
81aa678ce8
|
@ -53,7 +53,7 @@ extern "C" {
|
|||
/* To disable supression of annoying warnings about floats being promoted
|
||||
to doubles, define GLUT_NO_WARNING_DISABLE in your compile preprocessor
|
||||
options. */
|
||||
# ifndef GLUT_NO_WARNING_DISABLE
|
||||
# if defined(_MSC_VER) && !defined(GLUT_NO_WARNING_DISABLE)
|
||||
# pragma warning (disable:4244) /* Disable bogus VC++ 4.2 conversion warnings. */
|
||||
# pragma warning (disable:4305) /* VC++ 5.0 version of above warning. */
|
||||
# endif
|
||||
|
|
|
@ -5,4 +5,6 @@ SConscript('gallium/SConscript')
|
|||
if 'mesa' in env['statetrackers']:
|
||||
SConscript('mesa/SConscript')
|
||||
|
||||
SConscript('glut/glx/SConscript')
|
||||
|
||||
SConscript('gallium/winsys/SConscript')
|
||||
|
|
|
@ -0,0 +1,89 @@
|
|||
Import('*')
|
||||
|
||||
env = env.Clone()
|
||||
|
||||
if env['platform'] != 'windows':
|
||||
Return()
|
||||
|
||||
target = 'glut32'
|
||||
|
||||
env.Replace(CPPDEFINES = [
|
||||
'BUILD_GLUT32',
|
||||
'GLUT_BUILDING_LIB',
|
||||
'MESA',
|
||||
'_DLL',
|
||||
'NDEBUG',
|
||||
'GLUT_NO_WARNING_DISABLE',
|
||||
])
|
||||
|
||||
env.AppendUnique(CPPPATH = [
|
||||
'#/include',
|
||||
])
|
||||
|
||||
env.PrependUnique(LIBS = [
|
||||
'winmm',
|
||||
'gdi32',
|
||||
'user32',
|
||||
'opengl32',
|
||||
'glu32',
|
||||
])
|
||||
|
||||
sources = [
|
||||
'glut_bitmap.c',
|
||||
'glut_bwidth.c',
|
||||
'glut_cindex.c',
|
||||
'glut_cmap.c',
|
||||
'glut_cursor.c',
|
||||
'glut_dials.c',
|
||||
'glut_dstr.c',
|
||||
'glut_event.c',
|
||||
'glut_ext.c',
|
||||
'glut_fcb.c',
|
||||
'glut_fullscrn.c',
|
||||
'glut_gamemode.c',
|
||||
'glut_get.c',
|
||||
'glut_init.c',
|
||||
'glut_input.c',
|
||||
'glut_joy.c',
|
||||
'glut_key.c',
|
||||
'glut_keyctrl.c',
|
||||
'glut_keyup.c',
|
||||
'glut_mesa.c',
|
||||
'glut_modifier.c',
|
||||
'glut_overlay.c',
|
||||
'glut_shapes.c',
|
||||
'glut_space.c',
|
||||
'glut_stroke.c',
|
||||
'glut_swap.c',
|
||||
'glut_swidth.c',
|
||||
'glut_tablet.c',
|
||||
'glut_teapot.c',
|
||||
'glut_util.c',
|
||||
'glut_vidresize.c',
|
||||
'glut_warp.c',
|
||||
'glut_win.c',
|
||||
'glut_winmisc.c',
|
||||
|
||||
'win32_glx.c',
|
||||
'win32_menu.c',
|
||||
'win32_util.c',
|
||||
'win32_winproc.c',
|
||||
'win32_x11.c',
|
||||
|
||||
'glut_8x13.c',
|
||||
'glut_9x15.c',
|
||||
'glut_hel10.c',
|
||||
'glut_hel12.c',
|
||||
'glut_hel18.c',
|
||||
'glut_mroman.c',
|
||||
'glut_roman.c',
|
||||
'glut_tr10.c',
|
||||
'glut_tr24.c',
|
||||
|
||||
'glut.def',
|
||||
]
|
||||
|
||||
env.SharedLibrary(
|
||||
target = target,
|
||||
source = sources,
|
||||
)
|
|
@ -33,7 +33,7 @@
|
|||
#include <GL/glut.h>
|
||||
|
||||
#if defined(MESA) && defined(_WIN32) && !defined(__CYGWIN32__)
|
||||
#include <gl/mesa_wgl.h>
|
||||
#include <GL/mesa_wgl.h>
|
||||
#endif
|
||||
|
||||
#ifndef _WIN32
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
and is provided without guarantee or warrantee expressed or
|
||||
implied. This program is -not- in the public domain. */
|
||||
|
||||
#if defined(_WIN32)
|
||||
#if defined(_MSC_VER)
|
||||
#pragma warning (disable:4244) /* disable bogus conversion warnings */
|
||||
#pragma warning (disable:4305) /* VC++ 5.0 version of above warning. */
|
||||
#endif
|
||||
|
|
|
@ -41,6 +41,7 @@
|
|||
|
||||
/* Private routines from win32_util.c */
|
||||
#ifndef __CYGWIN32__
|
||||
struct timeval;
|
||||
extern int gettimeofday(struct timeval* tp, void* tzp);
|
||||
#endif
|
||||
extern void *__glutFont(void *font);
|
||||
|
|
|
@ -228,7 +228,7 @@ typedef struct {
|
|||
SetWindowPos(window, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE)
|
||||
|
||||
#define XSetWMName(display, window, tp) \
|
||||
SetWindowText(window, (tp)->value)
|
||||
SetWindowText(window, (const char *)(tp)->value)
|
||||
|
||||
/* There really isn't a way to set the icon name separate from the
|
||||
windows name in Win32, so, just set the windows name. */
|
||||
|
|
Loading…
Reference in New Issue