summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2018-07-18libGLw: Use newly introduced GLAPIVAR for variablesHEADmasterStefan Dirsch2-4/+10
GLAPI doesn't have an 'extern' in some circumstances. This way, variable declarations become definitions (fdo #100916). Signed-off-by: Stefan Dirsch <sndirsch@suse.de> Reviewed-by: Brian Paul <brianp@vmware.com>
2013-01-23Fix an obvious copypasta bugAdam Jackson1-1/+1
Signed-off-by: Adam Jackson <ajax@redhat.com>
2012-05-22Bump version to 8.0.0Emil Velikov1-1/+1
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Brian Paul <brianp@vmware.com>
2012-01-16glw: s/lighgrey/lightgrey/Brian Paul1-1/+1
https://bugs.freedesktop.org/show_bug.cgi?id=44844
2011-08-07Use -no-undefined libtool flag, fix underlinking with --enable-motifJon TURNEY2-2/+2
Use -no-undefined to assure libtool that the library has no unresolved symbols at link time, so that libtool will build a shared library on platforms require that all symbols are resolved when the library is linked. This exposes the fact that we are underlinked when ./configured with --enable-motif, so also link with motif libs in that case. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-08-05Convert build system to GNU autotools.Kenneth Graunke6-81/+190
Now that glw doesn't live inside Mesa, it needs its own build system. We may as well use GNU autotools. Also add a .gitignore file. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
2011-06-20glw: Mark all extern symbols GLAPI to regain default visibility (#31294)Dan Nicholson2-6/+6
Since switching to hidden visibility on gcc, GLw apps were failing to link. Use the GLAPI definition to use default visibility where necessary. $ nm lib/libGLw.so | grep DrawingArea 0000000000004020 T GLwCreateMDrawingArea 0000000000003430 T GLwDrawingAreaMakeCurrent 0000000000003410 T GLwDrawingAreaSwapBuffers 0000000000204c60 D glwDrawingAreaClassRec 0000000000204d48 D glwDrawingAreaWidgetClass 00000000002053c0 D glwMDrawingAreaClassRec 00000000002054e0 D glwMDrawingAreaWidgetClass Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Tested-by: justin <jlec@gentoo.org>
2010-07-26Merge remote branch 'origin/master' into glsl2Eric Anholt1-2/+2
This pulls in multiple i965 driver fixes which will help ensure better testing coverage during development, and also gets past the conflicts of the src/mesa/shader -> src/mesa/program move. Conflicts: src/mesa/Makefile src/mesa/main/shaderapi.c src/mesa/main/shaderobj.h
2010-07-21Makefiles: Don't complain if depend file to be included doesn't exist.Carl Worth1-1/+1
While bootstrapping the dependencies, make will see the "include depend" directive before the depend file has been created. To avoid a spurious warning in this case we use "-include" instead, (which differs precisely in the fact that it will not emit a diagnostic if the named file does not exist).
2010-07-01Use GLW_CFLAGS when building libGLwDan Nicholson1-1/+1
We check for libX11 and libXt, so we might as well use the CFLAGS pkg-config tells us about.
2010-06-24Merge branch 'glsl2-head' into glsl2Eric Anholt0-0/+0
This brings in the standalone GLSL compiler that we are planning on replacing the existing Mesa GLSL compiler. It currently targets GLSL 1.20 and the Mesa IR.
2010-06-21Merge Carl's preprocessor into the glcpp subdirectory.Kenneth Graunke0-0/+0
2009-06-01Use separate $(MINSTALL) for installing librariesDan Nicholson1-1/+1
The special feature of bin/minstall to copy symlinks is only ever needed when installing libraries which may have .so symlinks. All the headers and directories can use a normal install program. These two modes are separated as $(INSTALL) and $(MINSTALL) to allow the user (or autoconf) to override installing normal files as they please. An autoconf check for the install program has been added and will be used in preference to minstall when available. Fixes bug 16053.
2009-04-29Use variable library name in pkg-config output.Tom Fogal2-2/+3
Previously the pkg-config output files would contain e.g. `-lGL' and `-lGLU', even if the user modified their configuration to build libraries with different names. This modifies the pkg-config inputs, and corresponding makery, so that modifying the output library name will cause the appropriate updated name to appear in the pkg-config `-l' option. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2008-12-15Merge commit 'origin/master' into gallium-0.2Alan Hourihane2-2/+7
2008-12-14Add more package metadata to the pkg-config filesDan Nicholson2-2/+7
The pkg-config files have been filled in more thoroughly to allow users to use mesa more effectively. By adding metadata to Requires.private, Libs.private and Cflags, we can ensure that all the libraries and headers will be found in all situations. However, the full substitutions are only done when using the configure script. This also fixes the glu pkg-config file to account for using GL or OSMesa. Fixes bug 18161.
2008-09-11Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell1-0/+1
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
2008-08-15fix DESTDIR omissionsHanno Böck1-4/+4
2008-08-12Fixed 'make install' for darwinJeremy Huddleston1-1/+1
2008-08-11Apple: Cleaned up some linking and dylib ids issuesJeremy Huddleston1-0/+1
2008-07-18autoconf: Support Motif widgets in GLw with --enable-motifDan Nicholson1-1/+1
Add an --enable-motif option, which will enable the Motif widgets in libGLw and link it with libXm. The Motif installation information will be gathered from the motif-config script (this comes with LessTif) or fallback to the standard autoconf checks. To allow the location of the Motif headers to be set from configure, the default setting of -I/usr/include/Motif1.2 has been moved into configs/default and then passed to the Makefile through the MOTIF_CFLAGS variable.
2008-07-12Call mklib with $(SHELL) so the user controls the interpreterDan Nicholson1-1/+1
Respect the user's choice of shell when running mklib rather than always using /bin/sh.
2008-07-11Remove generated pkg-config files on `make clean'Dan Nicholson1-1/+1
2008-07-06Set library and header installation directories from configurationDan Nicholson2-9/+10
Currently the installation directories for libraries and headers are resolved within the install commands. For instance, the libraries will be installed to $(INSTALL_DIR)/$(LIB_DIR). This limits the flexibility of the installation, such as when the libraries should be installed to a subdirectory like /usr/lib/tls. This adds the make variables $(INSTALL_LIB_DIR) and $(INSTALL_INC_DIR) to define the locations that the libraries and headers are installed. For the static configs, this resolves exactly as before to $(INSTALL_DIR)/include and $(INSTALL_DIR)/$(LIB_DIR). For autoconf, they are derived directly from the --libdir and --includedir settings.
2008-05-06Always cleanup the makedepend backup filesDan Nicholson1-1/+1
Consistently cleanup the depend.bak files created by makedepend. Also, realclean has been changed to use a single find command, which speeds it up considerably.
2008-04-09Add $(X11_INCLUDES) to shut makedepend up.Hasso Tepper1-1/+1
2007-12-03Fix the library name in glw.pcDan Nicholson1-1/+1
Fix a copy and paste error s/GLU/GLw/ in glw.pc.
2007-09-28add support for LDFLAGS env varDan Nicholson1-1/+1
2007-09-12pkg-config supportDan Nicholson2-1/+22
2007-09-12DESTDIR support.Dan Nicholson1-4/+4
2007-08-07Gutsy oopses on touch of existing file. Workaround.Keith Whitwell1-0/+1
2006-12-20Merge branch 'nouveau-import'Dave Airlie0-0/+0
2006-10-19New bin/minstall script - a minimal replacement for 'install'.Brian Paul1-1/+1
Correctly handles symlinks so we can get rid of the COPY_LIBS stuff.
2006-07-13LIB_DIR is now just 'lib' or 'lib64'Brian Paul1-5/+5
Replaced $(LIB_DIR) with $(TOP)/$(LIB_DIR), use LIB_DIR in install targets. Patch by Hanno Böck.
2006-06-26Use $(LIB_DIR) instead of $(TOP)/lib since libraries sometimes go into lib64/.Brian Paul1-1/+1
Probably need to fix the install destinations too...
2006-06-22New 'install' targets in makefile. See bug 2372.Brian Paul1-0/+5
2006-01-02Use X11_INCLUDES config macro instead ofJerome Glisse1-1/+1
hardcoded path in makefile.
2005-10-12fix GLAPI/extern problem (bug 4757)Brian Paul2-3/+3
2005-08-23GLw demo doesn't belong hereBrian Paul1-451/+0
2005-07-26Quote $(CC) and $(CXX) so that 'CC=ccache gcc' and 'CXX=ccache g++' willIan Romanick1-1/+1
work again.
2005-07-25Added -linker option to mklib, used to specify a particular program forBrian Paul1-2/+3
linking, if relevant. Updated Makefiles to use -linker option instead of setting CC, CXX env vars.
2005-05-07assorted warning clean-ups for x86_64, etc (Mikko T.)Brian Paul1-1/+1
2005-02-08Bug #2477: Make GLU/GLw/glut build properly even with -fvisibility=hidden.Adam Jackson2-3/+3
2005-01-11Put quotes around the CC and CXX variables passed to mklib. This makeIan Romanick1-1/+1
them work with multi-work compiler names (e.g., "ccache gcc").
2004-12-08Improve the behaviour of the build system wrt depend files.Keith Whitwell1-1/+1
- Remove the -Y option for makedepend, so that the standard directories are searched - No longer pipe the multiple errors that the -Y option caused into /dev/null -- we want to know about these failures. - Fix up a few other misc makedepend failures.
2004-06-25Make sure mklib sees the definition of CC and CXX. Make mklib respectIan Romanick1-1/+1
the definitions of CC and CXX on Linux. This fixed build issues with sunos5-gcc and build issues on GCC 2.x Linux when CC and CXX are set to a GCC 3.x compiler.
2004-06-01Build fixing for FreeBSD. GNU make is installed as gmake, so make a MAKEEric Anholt1-1/+2
variable (defaults to "make") and use that. Use the MKDEP and MKDEP_OPTIONS more. Our shell isn't bash, so change the instances of ">& /dev/null" to a more compatible "> /dev/null 2>&1".
2004-04-22obsoleteBrian Paul1-72/+0
2004-04-08use MKDEP varBrian Paul1-1/+1
2004-04-03shouldn't be in CVSBrian Paul1-5/+0
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 11:24:54 +0000