Merge branch 'gallium-0.1' into gallium-0.2
A first attempt at moving gallium onto a branch directly off master... It will be interesting to see how much work this takes to get running. Have resolved the conflicts semi-arbitarily, not compiled or tested. Conflicts: .gitignore Makefile configs/config.mgw configs/darwin configs/darwin-x86ppc configs/default configs/freebsd-dri configs/linux-dri configs/linux-dri-xcb configs/linux-fbdev configs/linux-static configs/linux-x86-64-static configs/linux-x86-static doxygen/Makefile include/GL/gl.h progs/demos/Makefile progs/demos/descrip.mms progs/demos/texenv.c progs/egl/.gitignore progs/egl/Makefile progs/glsl/.gitignore progs/glsl/Makefile progs/glsl/convolutions.c progs/samples/Makefile.mgw progs/tests/.gitignore progs/trivial/.gitignore progs/trivial/point-param.c progs/trivial/tri.c progs/xdemos/.gitignore progs/xdemos/glthreads.c src/egl/drivers/demo/Makefile src/egl/drivers/dri/Makefile src/egl/main/Makefile src/glu/Makefile src/glu/sgi/Makefile src/glu/sgi/Makefile.mgw src/glut/glx/Makefile.mgw src/glut/os2/WarpWin.cpp src/glut/os2/glut_cindex.cpp src/glut/os2/glut_gamemode.cpp src/glut/os2/glut_win.cpp src/glut/os2/glut_winmisc.cpp src/glut/os2/os2_glx.cpp src/glut/os2/os2_menu.cpp src/glut/os2/os2_winproc.cpp src/glw/Makefile src/glx/x11/dri_glx.c src/glx/x11/glxext.c src/mesa/Makefile src/mesa/Makefile.mgw src/mesa/descrip.mms src/mesa/drivers/beos/Makefile src/mesa/drivers/common/descrip.mms src/mesa/drivers/common/driverfuncs.c src/mesa/drivers/directfb/Makefile src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/common/dri_bufmgr.h src/mesa/drivers/dri/common/dri_util.c src/mesa/drivers/dri/common/extension_helper.h src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/utils.c src/mesa/drivers/dri/common/utils.h src/mesa/drivers/dri/glcore/Makefile src/mesa/drivers/dri/i810/i810screen.c src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/drivers/dri/i915/intel_ioctl.h src/mesa/drivers/dri/i915/intel_screen.c src/mesa/drivers/dri/i915/server/i830_common.h src/mesa/drivers/dri/i915/server/i830_dri.h src/mesa/drivers/dri/i965/intel_screen.c src/mesa/drivers/dri/i965/server/i830_common.h src/mesa/drivers/dri/i965/server/i830_dri.h src/mesa/drivers/dri/mach64/mach64_screen.c src/mesa/drivers/dri/nouveau/nouveau_context.h src/mesa/drivers/dri/nouveau/nouveau_fifo.c src/mesa/drivers/dri/nouveau/nouveau_fifo.h src/mesa/drivers/dri/nouveau/nouveau_screen.c src/mesa/drivers/dri/nouveau/nouveau_screen.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/savage/savageioctl.h src/mesa/drivers/fbdev/Makefile src/mesa/drivers/osmesa/Makefile src/mesa/drivers/osmesa/descrip.mms src/mesa/drivers/x11/Makefile src/mesa/drivers/x11/descrip.mms src/mesa/drivers/x11/xm_dd.c src/mesa/glapi/glapi.c src/mesa/glapi/glthread.c src/mesa/main/api_validate.c src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/main/bufferobj.h src/mesa/main/buffers.c src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/descrip.mms src/mesa/main/drawpix.c src/mesa/main/enums.c src/mesa/main/fbobject.c src/mesa/main/glheader.h src/mesa/main/imports.c src/mesa/main/mipmap.c src/mesa/main/mm.c src/mesa/main/mm.h src/mesa/main/mtypes.h src/mesa/main/points.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texcompress_fxt1.c src/mesa/main/texenvprogram.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c src/mesa/math/descrip.mms src/mesa/shader/arbprogram.c src/mesa/shader/descrip.mms src/mesa/shader/prog_execute.c src/mesa/shader/prog_statevars.c src/mesa/shader/prog_statevars.h src/mesa/shader/prog_uniform.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/shader_api.c src/mesa/shader/slang/descrip.mms src/mesa/shader/slang/library/slang_vertex_builtin_gc.h src/mesa/sources src/mesa/swrast/descrip.mms src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_fragprog.c src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast_setup/descrip.mms src/mesa/tnl/descrip.mms src/mesa/tnl/t_context.h src/mesa/tnl/t_vp_build.c src/mesa/tnl/tnl.h src/mesa/vbo/descrip.mms src/mesa/vbo/vbo_context.c src/mesa/vbo/vbo_exec_array.c src/mesa/x86-64/xform4.S src/mesa/x86/rtasm/x86sse.c src/mesa/x86/rtasm/x86sse.h windows/VC6/progs/glut/glut.dsp windows/VC7/mesa/gdi/gdi.vcproj windows/VC7/mesa/glu/glu.vcproj windows/VC7/mesa/mesa.sln windows/VC7/mesa/mesa/mesa.vcproj windows/VC7/mesa/osmesa/osmesa.vcproj windows/VC7/progs/glut/glut.vcproj windows/VC8/mesa/gdi/gdi.vcproj windows/VC8/mesa/glu/glu.vcproj windows/VC8/mesa/mesa.sln windows/VC8/mesa/mesa/mesa.vcproj windows/VC8/progs/glut/glut.vcproj
This commit is contained in:
Keith Whitwell
@@ -92,6 +92,7 @@ clean:
|
||||
-rm -f *.o
|
||||
|
||||
depend: $(SOURCES)
|
||||
rm -f depend
|
||||
touch depend
|
||||
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null
|
||||
|
||||
|
||||
@@ -23,7 +23,6 @@ int DisplayHeight() {
|
||||
/* the following function was stolen from the X sources as indicated. */
|
||||
|
||||
/* Copyright Massachusetts Institute of Technology 1985, 1986, 1987 */
|
||||
/* $XConsortium: XParseGeom.c,v 11.18 91/02/21 17:23:05 rws Exp $ */
|
||||
|
||||
/*
|
||||
Permission to use, copy, modify, distribute, and sell this software and its
|
||||
|
||||
@@ -70,6 +70,7 @@ $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
|
||||
# Run 'make -f Makefile.solo dep' to update the dependencies if you change
|
||||
# what's included by any source file.
|
||||
depend: $(SOURCES)
|
||||
rm -f depend
|
||||
touch depend
|
||||
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null
|
||||
|
||||
|
||||
@@ -1,126 +0,0 @@
|
||||
# DOS/DJGPP Mesa Utility Toolkit
|
||||
# Version: 1.0
|
||||
#
|
||||
# Copyright (C) 2005 Daniel Borca All Rights Reserved.
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a
|
||||
# copy of this software and associated documentation files (the "Software"),
|
||||
# to deal in the Software without restriction, including without limitation
|
||||
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
# and/or sell copies of the Software, and to permit persons to whom the
|
||||
# Software is furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included
|
||||
# in all copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
# DANIEL BORCA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
|
||||
#
|
||||
# Available options:
|
||||
#
|
||||
# Environment variables:
|
||||
# CFLAGS
|
||||
#
|
||||
# GLIDE path to Glide3 SDK; used to resolve DXEs.
|
||||
# default = $(TOP)/glide3
|
||||
#
|
||||
# Targets:
|
||||
# all: build GLUT
|
||||
# clean: remove object files
|
||||
#
|
||||
|
||||
|
||||
|
||||
.PHONY: all clean
|
||||
|
||||
TOP = ../../..
|
||||
GLIDE ?= $(TOP)/glide3
|
||||
LIBDIR = $(TOP)/lib
|
||||
GLUT_LIB = libglut.a
|
||||
GLUT_DXE = glut.dxe
|
||||
GLUT_IMP = libiglut.a
|
||||
|
||||
export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH);$(LIBDIR);$(GLIDE)/lib
|
||||
|
||||
CC = gcc
|
||||
CFLAGS += -I$(TOP)/include -I. -IPC_HW
|
||||
CFLAGS += -DGLUT_IMPORT_LIB
|
||||
|
||||
AR = ar
|
||||
ARFLAGS = crus
|
||||
|
||||
HAVEDXE3 = $(wildcard $(DJDIR)/bin/dxe3gen.exe)
|
||||
|
||||
ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
|
||||
UNLINK = del $(subst /,\,$(1))
|
||||
else
|
||||
UNLINK = $(RM) $(1)
|
||||
endif
|
||||
|
||||
CORE_SOURCES = \
|
||||
loop.c \
|
||||
callback.c \
|
||||
color.c \
|
||||
extens.c \
|
||||
init.c \
|
||||
menu.c \
|
||||
mouse.c \
|
||||
overlay.c \
|
||||
state.c \
|
||||
util.c \
|
||||
window.c \
|
||||
f8x13.c \
|
||||
f9x15.c \
|
||||
hel10.c \
|
||||
hel12.c \
|
||||
hel18.c \
|
||||
tr10.c \
|
||||
tr24.c \
|
||||
mroman.c \
|
||||
roman.c \
|
||||
bitmap.c \
|
||||
stroke.c \
|
||||
teapot.c \
|
||||
shapes.c
|
||||
|
||||
PC_HW_SOURCES = \
|
||||
PC_HW/pc_hw.c \
|
||||
PC_HW/pc_keyb.c \
|
||||
PC_HW/pc_mouse.c \
|
||||
PC_HW/pc_timer.c \
|
||||
PC_HW/pc_irq.S
|
||||
|
||||
SOURCES = $(CORE_SOURCES) $(PC_HW_SOURCES)
|
||||
|
||||
OBJECTS = $(addsuffix .o,$(basename $(SOURCES)))
|
||||
|
||||
.c.o:
|
||||
$(CC) -o $@ $(CFLAGS) -c $<
|
||||
.S.o:
|
||||
$(CC) -o $@ $(CFLAGS) -c $<
|
||||
.s.o:
|
||||
$(CC) -o $@ $(CFLAGS) -x assembler-with-cpp -c $<
|
||||
|
||||
all: $(LIBDIR)/$(GLUT_LIB) $(LIBDIR)/$(GLUT_DXE) $(LIBDIR)/$(GLUT_IMP)
|
||||
|
||||
$(LIBDIR)/$(GLUT_LIB): $(OBJECTS)
|
||||
$(AR) $(ARFLAGS) $@ $^
|
||||
|
||||
$(LIBDIR)/$(GLUT_DXE) $(LIBDIR)/$(GLUT_IMP): $(OBJECTS)
|
||||
ifeq ($(HAVEDXE3),)
|
||||
$(warning Missing DXE3 package... Skipping $(GLUT_DXE))
|
||||
else
|
||||
-dxe3gen -o $(LIBDIR)/$(GLUT_DXE) -Y $(LIBDIR)/$(GLUT_IMP) -D "MesaGLUT DJGPP" -E _glut -P gl.dxe -U $^
|
||||
endif
|
||||
|
||||
clean:
|
||||
-$(call UNLINK,*.o)
|
||||
-$(call UNLINK,PC_HW/*.o)
|
||||
|
||||
-include depend
|
||||
@@ -77,6 +77,7 @@ install:
|
||||
# Run 'make -f Makefile.solo dep' to update the dependencies if you change
|
||||
# what's included by any source file.
|
||||
depend: $(SOURCES)
|
||||
rm -f depend
|
||||
touch depend
|
||||
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null
|
||||
|
||||
|
||||
@@ -46,6 +46,7 @@ clean:
|
||||
|
||||
|
||||
depend: $(SOURCES)
|
||||
rm -f depend
|
||||
touch depend
|
||||
$(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(SOURCES)
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* $Id: debug.h,v 1.1 2000/11/19 07:41:26 jtaylor Exp $
|
||||
/*
|
||||
******************************************************************************
|
||||
|
||||
GGIMesa debugging macros
|
||||
|
||||
@@ -127,6 +127,7 @@ clean:
|
||||
|
||||
depend: $(SOURCES)
|
||||
@ echo "running $(MKDEP)"
|
||||
@ rm -f depend
|
||||
@ touch depend
|
||||
@ $(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(SOURCES) \
|
||||
$(X11_INCLUDES) > /dev/null
|
||||
|
||||
@@ -1,208 +0,0 @@
|
||||
# Makefile for GLUT for VMS
|
||||
# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl
|
||||
|
||||
.first
|
||||
define gl [---.include.gl]
|
||||
|
||||
.include [---]mms-config.
|
||||
|
||||
##### MACROS #####
|
||||
GLUT_MAJOR = 3
|
||||
GLUT_MINOR = 7
|
||||
|
||||
VPATH = RCS
|
||||
|
||||
INCDIR = [---.include]
|
||||
LIBDIR = [---.lib]
|
||||
CFLAGS = /nowarn/include=$(INCDIR)/prefix=all/name=(as_is,short)/float=ieee/ieee=denorm
|
||||
|
||||
SOURCES = \
|
||||
glut_8x13.c \
|
||||
glut_9x15.c \
|
||||
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_fullscrn.c \
|
||||
glut_gamemode.c \
|
||||
glut_get.c \
|
||||
glut_glxext.c \
|
||||
glut_hel10.c \
|
||||
glut_hel12.c \
|
||||
glut_hel18.c \
|
||||
glut_init.c \
|
||||
glut_input.c \
|
||||
glut_joy.c \
|
||||
glut_key.c \
|
||||
glut_keyctrl.c \
|
||||
glut_keyup.c \
|
||||
glut_menu.c \
|
||||
glut_menu2.c \
|
||||
glut_mesa.c \
|
||||
glut_modifier.c \
|
||||
glut_mroman.c \
|
||||
glut_overlay.c \
|
||||
glut_roman.c \
|
||||
glut_shapes.c \
|
||||
glut_space.c \
|
||||
glut_stroke.c \
|
||||
glut_swap.c \
|
||||
glut_swidth.c \
|
||||
glut_tablet.c \
|
||||
glut_teapot.c \
|
||||
glut_tr10.c \
|
||||
glut_tr24.c \
|
||||
glut_util.c \
|
||||
glut_vidresize.c \
|
||||
glut_warp.c \
|
||||
glut_win.c \
|
||||
glut_winmisc.c \
|
||||
layerutil.c
|
||||
|
||||
OBJECTS0=glut_8x13.obj,\
|
||||
glut_9x15.obj,\
|
||||
glut_bitmap.obj,\
|
||||
glut_bwidth.obj,\
|
||||
glut_cindex.obj,\
|
||||
glut_cmap.obj,\
|
||||
glut_cursor.obj,\
|
||||
glut_dials.obj,\
|
||||
glut_dstr.obj,\
|
||||
glut_event.obj,\
|
||||
glut_ext.obj,\
|
||||
glut_fullscrn.obj,\
|
||||
glut_gamemode.obj
|
||||
|
||||
OBJECTS1=glut_get.obj,\
|
||||
glut_glxext.obj,\
|
||||
glut_hel10.obj,\
|
||||
glut_hel12.obj,\
|
||||
glut_hel18.obj,\
|
||||
glut_init.obj,\
|
||||
glut_input.obj,\
|
||||
glut_joy.obj,\
|
||||
glut_key.obj,\
|
||||
glut_keyctrl.obj,\
|
||||
glut_keyup.obj,\
|
||||
glut_menu.obj,\
|
||||
glut_menu2.obj,\
|
||||
glut_mesa.obj,\
|
||||
glut_modifier.obj
|
||||
|
||||
OBJECTS2=glut_mroman.obj,\
|
||||
glut_overlay.obj,\
|
||||
glut_roman.obj,\
|
||||
glut_shapes.obj,\
|
||||
glut_space.obj,\
|
||||
glut_stroke.obj,\
|
||||
glut_swap.obj,\
|
||||
glut_swidth.obj,\
|
||||
glut_tablet.obj,\
|
||||
glut_teapot.obj,\
|
||||
glut_tr10.obj,\
|
||||
glut_tr24.obj,\
|
||||
glut_util.obj,\
|
||||
glut_vidresize.obj
|
||||
|
||||
OBJECTS3=glut_warp.obj,\
|
||||
glut_win.obj,\
|
||||
glut_winmisc.obj,\
|
||||
layerutil.obj
|
||||
|
||||
##### RULES #####
|
||||
|
||||
VERSION=Glut V3.7
|
||||
|
||||
##### TARGETS #####
|
||||
|
||||
# Make the library
|
||||
$(LIBDIR)$(GLUT_LIB) : $(OBJECTS0) $(OBJECTS1) $(OBJECTS2) $(OBJECTS3)
|
||||
@ $(MAKELIB) $(GLUT_LIB) $(OBJECTS0)
|
||||
@ library $(GLUT_LIB) $(OBJECTS1)
|
||||
@ library $(GLUT_LIB) $(OBJECTS2)
|
||||
@ library $(GLUT_LIB) $(OBJECTS3)
|
||||
@ rename $(GLUT_LIB)* $(LIBDIR)
|
||||
.ifdef SHARE
|
||||
@ WRITE_ SYS$OUTPUT " generating mesagl1.opt"
|
||||
@ OPEN_/WRITE FILE mesagl1.opt
|
||||
@ WRITE_ FILE "!"
|
||||
@ WRITE_ FILE "! mesagl1.opt generated by DESCRIP.$(MMS_EXT)"
|
||||
@ WRITE_ FILE "!"
|
||||
@ WRITE_ FILE "IDENTIFICATION=""$(VERSION)"""
|
||||
@ WRITE_ FILE "GSMATCH=LEQUAL,3,7
|
||||
@ WRITE_ FILE "$(OBJECTS0)"
|
||||
@ WRITE_ FILE "$(OBJECTS1)"
|
||||
@ WRITE_ FILE "$(OBJECTS2)"
|
||||
@ WRITE_ FILE "$(OBJECTS3)"
|
||||
@ WRITE_ FILE "[---.lib]libmesaglu.exe/SHARE"
|
||||
@ WRITE_ FILE "[---.lib]libmesagl.exe/SHARE"
|
||||
@ write file "sys$library:decw$xmulibshr.exe/share"
|
||||
@ WRITE_ FILE "SYS$SHARE:DECW$XEXTLIBSHR/SHARE"
|
||||
@ WRITE_ FILE "SYS$SHARE:DECW$XLIBSHR/SHARE"
|
||||
@ CLOSE_ FILE
|
||||
@ WRITE_ SYS$OUTPUT " generating mesagl.map ..."
|
||||
@ CXXLINK_/NODEB/NOSHARE/NOEXE/MAP=mesagl.map/FULL mesagl1.opt/OPT
|
||||
@ WRITE_ SYS$OUTPUT " analyzing mesagl.map ..."
|
||||
@ @[---.vms]ANALYZE_MAP.COM mesagl.map mesagl.opt
|
||||
@ WRITE_ SYS$OUTPUT " linking $(GLUT_SHAR) ..."
|
||||
@ CXXLINK_/NODEB/SHARE=$(GLUT_SHAR)/MAP=mesagl.map/FULL mesagl1.opt/opt,mesagl.opt/opt
|
||||
@ rename $(GLUT_SHAR)* $(LIBDIR)
|
||||
.endif
|
||||
|
||||
clean :
|
||||
delete *.obj;*
|
||||
purge
|
||||
|
||||
include mms_depend.
|
||||
|
||||
glut_8x13.obj : glut_8x13.c
|
||||
glut_9x15.obj : glut_9x15.c
|
||||
glut_bitmap.obj : glut_bitmap.c
|
||||
glut_bwidth.obj : glut_bwidth.c
|
||||
glut_cindex.obj : glut_cindex.c
|
||||
glut_cmap.obj : glut_cmap.c
|
||||
glut_cursor.obj : glut_cursor.c
|
||||
glut_dials.obj : glut_dials.c
|
||||
glut_dstr.obj : glut_dstr.c
|
||||
glut_event.obj : glut_event.c
|
||||
glut_ext.obj : glut_ext.c
|
||||
glut_fullscrn.obj : glut_fullscrn.c
|
||||
glut_gamemode.obj : glut_gamemode.c
|
||||
glut_get.obj : glut_get.c
|
||||
glut_glxext.obj : glut_glxext.c
|
||||
glut_hel10.obj : glut_hel10.c
|
||||
glut_hel12.obj : glut_hel12.c
|
||||
glut_hel18.obj : glut_hel18.c
|
||||
glut_init.obj : glut_init.c
|
||||
glut_input.obj : glut_input.c
|
||||
glut_joy.obj : glut_joy.c
|
||||
glut_key.obj : glut_key.c
|
||||
glut_keyctrl.obj : glut_keyctrl.c
|
||||
glut_keyup.obj : glut_keyup.c
|
||||
glut_menu.obj : glut_menu.c
|
||||
glut_menu2.obj : glut_menu2.c
|
||||
glut_mesa.obj : glut_mesa.c
|
||||
glut_modifier.obj : glut_modifier.c
|
||||
glut_mroman.obj : glut_mroman.c
|
||||
glut_overlay.obj : glut_overlay.c
|
||||
glut_roman.obj : glut_roman.c
|
||||
glut_shapes.obj : glut_shapes.c
|
||||
glut_space.obj : glut_space.c
|
||||
glut_stroke.obj : glut_stroke.c
|
||||
glut_swap.obj : glut_swap.c
|
||||
glut_swidth.obj : glut_swidth.c
|
||||
glut_tablet.obj : glut_tablet.c
|
||||
glut_teapot.obj : glut_teapot.c
|
||||
glut_tr10.obj : glut_tr10.c
|
||||
glut_tr24.obj : glut_tr24.c
|
||||
glut_util.obj : glut_util.c
|
||||
glut_vidresize.obj : glut_vidresize.c
|
||||
glut_warp.obj : glut_warp.c
|
||||
glut_win.obj : glut_win.c
|
||||
glut_winmisc.obj : glut_winmisc.c
|
||||
layerutil.obj : layerutil.c
|
||||
@@ -1,72 +0,0 @@
|
||||
# DO NOT DELETE
|
||||
|
||||
glut_8x13.obj : glutbitmap.h [---.include.gl]gl.h
|
||||
glut_9x15.obj : glutbitmap.h [---.include.gl]gl.h
|
||||
glut_bitmap.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
|
||||
glut_bitmap.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
|
||||
glut_bitmap.obj : glutbitmap.h
|
||||
glut_bwidth.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
|
||||
glut_bwidth.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
|
||||
glut_bwidth.obj : glutbitmap.h
|
||||
glut_cindex.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
|
||||
glut_cindex.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
|
||||
glut_cindex.obj : layerutil.h
|
||||
glut_cursor.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
|
||||
glut_cursor.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
|
||||
glut_dials.obj : glutint.h [---.include.gl]glx.h [---.include.gl]gl.h
|
||||
glut_dials.obj : [---.include.gl]xmesa.h [---.include.gl]glut.h [---.include.gl]glu.h
|
||||
glut_dstr.obj : glutint.h [---.include.gl]glx.h [---.include.gl]gl.h
|
||||
glut_dstr.obj : [---.include.gl]xmesa.h [---.include.gl]glut.h [---.include.gl]glu.h
|
||||
glut_event.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
|
||||
glut_event.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
|
||||
glut_ext.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
|
||||
glut_ext.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
|
||||
glut_fullscrn.obj : glutint.h [---.include.gl]glx.h [---.include.gl]gl.h
|
||||
glut_fullscrn.obj : [---.include.gl]xmesa.h [---.include.gl]glut.h
|
||||
glut_fullscrn.obj : [---.include.gl]glu.h
|
||||
glut_get.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
|
||||
glut_get.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
|
||||
glut_hel10.obj : glutbitmap.h [---.include.gl]gl.h
|
||||
glut_hel12.obj : glutbitmap.h [---.include.gl]gl.h
|
||||
glut_hel18.obj : glutbitmap.h [---.include.gl]gl.h
|
||||
glut_init.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
|
||||
glut_init.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
|
||||
glut_menu.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
|
||||
glut_menu.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h layerutil.h
|
||||
glut_mesa.obj : glutint.h [---.include.gl]glx.h [---.include.gl]gl.h
|
||||
glut_mesa.obj : [---.include.gl]xmesa.h [---.include.gl]glut.h [---.include.gl]glu.h
|
||||
glut_modifier.obj : glutint.h [---.include.gl]glx.h [---.include.gl]gl.h
|
||||
glut_modifier.obj : [---.include.gl]xmesa.h [---.include.gl]glut.h
|
||||
glut_modifier.obj : [---.include.gl]glu.h
|
||||
glut_mroman.obj : glutstroke.h
|
||||
glut_overlay.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
|
||||
glut_overlay.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
|
||||
glut_overlay.obj : layerutil.h
|
||||
glut_roman.obj : glutstroke.h
|
||||
glut_shapes.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
|
||||
glut_shapes.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
|
||||
glut_space.obj : glutint.h [---.include.gl]glx.h [---.include.gl]gl.h
|
||||
glut_space.obj : [---.include.gl]xmesa.h [---.include.gl]glut.h [---.include.gl]glu.h
|
||||
glut_stroke.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
|
||||
glut_stroke.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
|
||||
glut_stroke.obj : glutstroke.h
|
||||
glut_swidth.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
|
||||
glut_swidth.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
|
||||
glut_swidth.obj : glutstroke.h
|
||||
glut_tablet.obj : glutint.h [---.include.gl]glx.h [---.include.gl]gl.h
|
||||
glut_tablet.obj : [---.include.gl]xmesa.h [---.include.gl]glut.h [---.include.gl]glu.h
|
||||
glut_teapot.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
|
||||
glut_tr10.obj : glutbitmap.h [---.include.gl]gl.h
|
||||
glut_tr24.obj : glutbitmap.h [---.include.gl]gl.h
|
||||
glut_util.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
|
||||
glut_util.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
|
||||
glut_vidresize.obj : [---.include.gl]glx.h [---.include.gl]gl.h
|
||||
glut_vidresize.obj : [---.include.gl]xmesa.h glutint.h [---.include.gl]glut.h
|
||||
glut_vidresize.obj : [---.include.gl]glu.h
|
||||
glut_warp.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
|
||||
glut_warp.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
|
||||
glut_win.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
|
||||
glut_win.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
|
||||
glut_winmisc.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
|
||||
glut_winmisc.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
|
||||
layerutil.obj : layerutil.h
|
||||
@@ -1,4 +1,3 @@
|
||||
/* $XConsortium: wfont.h,v 5.1 91/02/16 09:46:37 rws Exp $ */
|
||||
|
||||
/*****************************************************************
|
||||
Copyright (c) 1989,1990, 1991 by Sun Microsystems, Inc. and the X Consortium.
|
||||
|
||||
@@ -263,7 +263,6 @@ XPending(Display* display)
|
||||
/* the following function was stolen from the X sources as indicated. */
|
||||
|
||||
/* Copyright Massachusetts Institute of Technology 1985, 1986, 1987 */
|
||||
/* $XConsortium: XParseGeom.c,v 11.18 91/02/21 17:23:05 rws Exp $ */
|
||||
|
||||
/*
|
||||
Permission to use, copy, modify, distribute, and sell this software and its
|
||||
|
||||
@@ -64,6 +64,7 @@ $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
|
||||
# Run 'make -f Makefile.solo dep' to update the dependencies if you change
|
||||
# what's included by any source file.
|
||||
depend: $(SOURCES)
|
||||
rm -f depend
|
||||
touch depend
|
||||
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null
|
||||
|
||||
|
||||
@@ -417,4 +417,3 @@ void ScreenToClient( HWND hwnd, POINTL *point)
|
||||
point->y -= swp_src.y;
|
||||
}
|
||||
|
||||
|
||||
@@ -256,4 +256,3 @@ bla bla bla
|
||||
#endif
|
||||
}
|
||||
/* ENDCENTRY */
|
||||
|
||||
@@ -677,4 +677,3 @@ glutGameModeGet(GLenum mode)
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1218,4 +1218,3 @@ glutReshapeFunc(GLUTreshapeCB reshapeFunc)
|
||||
__glutCurrentWindow->reshape = __glutDefaultReshape;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -124,4 +124,3 @@ glutHideWindow(void)
|
||||
}
|
||||
|
||||
/* ENDCENTRY */
|
||||
|
||||
@@ -143,4 +143,3 @@ XVisualInfo * glXChooseVisual(int mode)
|
||||
#if POKA
|
||||
#endif /* POKA */
|
||||
|
||||
|
||||
@@ -530,4 +530,3 @@ glutDetachMenu(int button)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1294,4 +1294,3 @@ Bool __glutSetWindowText(Window window, char *text)
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user