diff options
| -rw-r--r-- | progs/xdemos/descrip.mms | 97 | ||||
| -rw-r--r-- | progs/xdemos/glxgears.c | 4 |
2 files changed, 47 insertions, 54 deletions
diff --git a/progs/xdemos/descrip.mms b/progs/xdemos/descrip.mms index aa56c1cec34..3e014962871 100644 --- a/progs/xdemos/descrip.mms +++ b/progs/xdemos/descrip.mms @@ -1,4 +1,4 @@ -# Makefile for demo programs for VMS +# Makefile for GLUT-based demo programs for VMS # contributed by Jouk Jansen [email protected] @@ -9,25 +9,38 @@ ##### MACROS ##### -INCDIR = [-.include] -CFLAGS = /include=$(INCDIR)/define=(FBIND=1) - -GL_LIBS = [-.lib]libMesaaux/l,libMesatk/l,libMesaGLU/l,libMesaGL/l,$(XLIBS) - -LIB_DEP = [-.lib]$(GL_LIB) [-.lib]$(GLU_LIB) [-.lib]$(TK_LIB) [-.lib]$(AUX_LIB) - -PROGS = bounce.exe;,gamma.exe;,gears.exe;,glxdemo.exe;,glxpixmap.exe;,\ - isosurf.exe;,offset.exe;,osdemo.exe;,spin.exe;,test0.exe;,\ - texobj.exe;,xdemo.exe;,reflect.exe;,winpos.exe; - - +INCDIR = ([-.include],[-.util]) +CFLAGS = /include=$(INCDIR)/prefix=all/name=(as_is,short)/nowarn + +.ifdef SHARE +GL_LIBS = $(XLIBS) +.else +GL_LIBS = [-.lib]libGLUT/l,libMesaGLU/l,libMesaGL/l,$(XLIBS) +.endif + +LIB_DEP = [-.lib]$(GL_LIB) [-.lib]$(GLU_LIB) [-.lib]$(GLUT_LIB) + +PROGS =glthreads.exe,\ + glxdemo.exe,\ + glxgears.exe,\ + glxheads.exe,\ + glxinfo.exe,\ + glxpixmap.exe,\ + manywin.exe,\ + offset.exe,\ + pbinfo.exe,\ + pbdemo.exe,\ + wincopy.exe,\ + xdemo.exe,\ + xfont.exe ##### RULES ##### - +.obj.exe : + cxxlink $(MMS$TARGET_NAME),$(GL_LIBS) ##### TARGETS ##### default : - mms $(PROGS) + $(MMS)$(MMSQUALIFIERS) $(PROGS) clean : delete *.obj;* @@ -36,44 +49,20 @@ realclean : delete $(PROGS) delete *.obj;* -bounce.exe; : bounce.obj $(LIB_DEP) - link bounce,$(GL_LIBS) - -gamma.exe; : gamma.obj $(LIB_DEP) - link gamma,$(GL_LIBS) - -gears.exe; : gears.obj $(LIB_DEP) - link gears,$(GL_LIBS) - -glxdemo.exe; : glxdemo.obj $(LIB_DEP) - link glxdemo,$(GL_LIBS) - -glxpixmap.exe; : glxpixmap.obj $(LIB_DEP) - link glxpixmap,$(GL_LIBS) - -isosurf.exe; : isosurf.obj $(LIB_DEP) - link isosurf,$(GL_LIBS) - -offset.exe; : offset.obj $(LIB_DEP) - link offset,$(GL_LIBS) - -osdemo.exe; : osdemo.obj $(LIB_DEP) - link osdemo,$(GL_LIBS) - -spin.exe; : spin.obj $(LIB_DEP) - link spin,$(GL_LIBS) - -test0.exe; : test0.obj $(LIB_DEP) - link test0,$(GL_LIBS) - -texobj.exe; : texobj.obj $(LIB_DEP) - link texobj,$(GL_LIBS) - -xdemo.exe; : xdemo.obj $(LIB_DEP) - link xdemo,$(GL_LIBS) -reflect.exe; : reflect.obj $(LIB_DEP) - link reflect,$(GL_LIBS) +glthreads.exe : glthreads.obj $(LIB_DEP) +glxdemo.exe : glxdemo.obj $(LIB_DEP) +glxgears.exe : glxgears.obj $(LIB_DEP) +glxheads.exe : glxheads.obj $(LIB_DEP) +glxinfo.exe : glxinfo.obj $(LIB_DEP) +glxpixmap.exe : glxpixmap.obj $(LIB_DEP) +manywin.exe : manywin.obj $(LIB_DEP) +offset.exe : offset.obj $(LIB_DEP) +pbinfo.exe : pbinfo.obj pbutil.obj $(LIB_DEP) + cxxlink pbinfo.obj,pbutil.obj,$(GL_LIBS) +pbdemo.exe : pbdemo.obj pbutil.obj $(LIB_DEP) + cxxlink pbdemo.obj,pbutil.obj,$(GL_LIBS) +wincopy.exe : wincopy.obj $(LIB_DEP) +xdemo.exe : xdemo.obj $(LIB_DEP) +xfont.exe :xfont.obj $(LIB_DEP) -winpos.exe; : winpos.obj $(LIB_DEP) - link winpos,$(GL_LIBS) diff --git a/progs/xdemos/glxgears.c b/progs/xdemos/glxgears.c index 53c20980cdf..59691513e2c 100644 --- a/progs/xdemos/glxgears.c +++ b/progs/xdemos/glxgears.c @@ -53,8 +53,12 @@ static int current_time(void) { struct timeval tv; +#ifdef __VMS + (void) gettimeofday(&tv, NULL ); +#else struct timezone tz; (void) gettimeofday(&tv, &tz); +#endif return (int) tv.tv_sec; } |