summaryrefslogtreecommitdiffstats
path: root/src/glx/apple/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Fix build of appleglxJon TURNEY2014-05-231-131/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define GLX_USE_APPLEGL, as config/darwin used to, to turn on specific code to use the applegl direct renderer Convert src/glx/apple/Makefile to automake Since the applegl libGL is now built by linking libappleglx into libGL, rather than by linking selected files into a special libGL: - Remove duplicate code in apple/glxreply.c and apple/apple_glx.c. This makes apple/glxreply.c empty, so remove it - Some indirect rendering code is already guarded by !GLX_USE_APPLEGL, but we need to add those guards to indirect_glx.c, indirect_init.c (via it's generator), render2.c and vertarr.c so they don't generate anything Fix and update various includes glapi_gentable.c (which is only used on darwin), should be included in shared glapi as well, to provide _glapi_create_table_from_handle() Note that neither swrast nor indirect is supported in the APPLEGL path at the moment, which makes things more complex than they need to be. More untangling is needed to allow that v2: Correct apple/Makefile.am for srcdir != builddir Signed-off-by: Jon TURNEY <[email protected]> Reviewed-by: Jeremy Huddleston Sequoia <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
* configure: use LIB_EXT rather than hardcoded .soEmil Velikov2014-03-111-4/+4
| | | | | | | | | | | | | | | Some platforms different library extension - dll, dylib, a. Honor that when we are creating the required links. Rename LIB_EXTENSION to LIB_EXT while we're here. With libglapi linking aside, building classic drivers on non-linux platforms should be possible now. v2: Resolve conflicts. Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Jon TURNEY <[email protected]>
* configure: remove old makefile variablesEmil Velikov2014-03-111-5/+4
| | | | | | | | | | | | All the variables were used before the automake conversion and do not make sense (nor are used) currently. Replace GL_LIB_NAME with lib$(GL_LIB).$(LIB_EXTENSION) for apple-glx. The build has been broken for ages, but this will ease the recovery process as it happens. Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Jon TURNEY <[email protected]>
* build: Rename sources.mak -> Makefile.sourcesMatt Turner2013-04-151-1/+1
| | | | | | | | For the sake of consistency. Tested-by: Emil Velikov <[email protected]> Reviewed-and-Tested-by: Andreas Boll <[email protected]> Reviewed-by: Jordan Justen <[email protected]>
* build: Use AX_PTHREAD's HAVE_PTHREAD preprocessor definitionMatt Turner2012-10-011-1/+1
|
* build: fix location of generated files in src/mesa (v4)Christopher James Halse Rogers2012-08-131-0/+4
| | | | | | | | | | | | | | | Also fix include paths for the generated headers. v2: Switch to using self-explanatory BUILDDIR/SRCDIR defined from top_builddir/top_srcdir rather than the ambiguous TOP. v3: Add both top_builddir and top_srcdir to include flags for mesa asm. These rely on both in-tree and build-time-generated includes. v4: Rebased on top of 948c8f502a. Reviewed-by: Eric Anholt <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Signed-off-by: Christopher James Halse Rogers <[email protected]> Signed-off-by: Matt Turner <[email protected]>
* automake: Globally add stub automake targets to the old Makefiles.Eric Anholt2012-06-111-1/+1
| | | | | | | | | I tried to update all the old Makefiles that included the default config to be sure they had a default target if they didn't previously have one, since this new all target will always point at it. Almost everything had one. Reviewed-by: Kenneth Graunke <[email protected]>
* darwin: Use ASL for loggingJeremy Huddleston2012-05-031-0/+1
| | | | Signed-off-by: Jeremy Huddleston <[email protected]>
* darwin: Build create_context.cJeremy Huddleston2012-03-161-0/+1
| | | | | | Fixes a build regression from: 588042a8ec4ea91a952c07a0768516fd590758f4 Signed-off-by: Jeremy Huddleston <[email protected]>
* glx: Make __glXSendError available in non-Apple buildsIan Romanick2011-12-191-1/+1
| | | | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Adam Jackson <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Cc: Jeremy Huddleston <[email protected]>
* darwin: Include glxhash.c in libGL on darwinJeremy Huddleston2011-07-161-0/+1
| | | | | | Fixes a build regression introduced by 4df137691ee29bb812347fa2c5f19095243ede22 Signed-off-by: Jeremy Huddleston <[email protected]>
* apple: Use glapi rather than reinventing the wheelJeremy Huddleston2011-06-071-17/+11
| | | | | | | | | | | | | | | | | | With this change, Apple's libGL is now using glapi rather than implementing its own dispatch. In this implementation, two dispatch tables are created: __ogl_framework_api always points into OpenGL.framework. __applegl_api is the vtable that is used. It points into OpenGL.framework or to local implementations that override / interpose this in OpenGL.framework The initialization for __ogl_framework_api was copied from XQuartz with some modifications and probably still needs further edits to better deal with aliases. This is a good step towards supporting both indirect and direct rendering on darwin. Signed-off-by: Jeremy Huddleston <[email protected]>
* apple: Fix multiple build failures in applegl_glx.cJeremy Huddleston2011-06-051-1/+2
| | | | | | | | It is still not building, but this gets us many steps closer See https://bugs.freedesktop.org/show_bug.cgi?id=29162 Signed-off-by: Jeremy Huddleston <[email protected]>
* apple: Rename glcontextmodes.[ch] to glxconfig.[ch]Jeremy Huddleston2011-06-051-1/+1
| | | | | | Fixes regression introduced by: 65d98e25770487456eb3d7eb8ec3ec8272f170b1 Signed-off-by: Jeremy Huddleston <[email protected]>
* apple: Move glapi to mapi.Vinson Lee2010-05-061-1/+2
| | | | | This was missed in commit 296adbd545b8efd38c9ed508166b2de2764a444b. Fixes darwin build.
* apple: Use mesa gl.h rather than generating one.Jeremy Huddleston2010-04-271-8/+3
| | | | Signed-off-by: Jeremy Huddleston <[email protected]>
* apple: Integrate our libGL into the existing build system betterJeremy Huddleston2010-04-271-73/+110
| | | | Signed-off-by: Jeremy Huddleston <[email protected]>
* darwin: Use clientattribJeremy Huddleston2010-04-271-1/+1
| | | | Signed-off-by: Jeremy Huddleston <[email protected]>
* apple: Change ifdefs for DRI to be DRI && !APPLEJeremy Huddleston2010-04-271-2/+2
| | | | Signed-off-by: Jeremy Huddleston <[email protected]>
* apple: Initial import of libGL for OSX from AppleSGLX svn repository.Jeremy Huddleston2010-04-271-0/+97
| | | | Signed-off-by: Jeremy Huddleston <[email protected]>
* Revert accidental commits from the xquartz treeJeremy Huddleston2010-04-011-129/+0
| | | | | | | | | | | This reverts commit 9aadc793f3db64cefa0b08f18abad424a659dacc. This reverts commit 69ea4e7718efb60b6b0d795a355cebd6712ceac1. This reverts commit dbe8b013936d977ec63d6607bfd2fc6772d29787. This reverts commit 23215ef4d60a86d9f3b3fdc08e3fdadc59e98890. This reverts commit 9495e3703062d1ddaf3161f4efc23f0b51284d9b. This reverts commit 0594cf70883b64692ba617d85f4f9b4e636e5c2b. This reverts commit 86a7978d37393ee34f876569ac06ffdb8d7289ae. This reverts commit 437902ce978cde9a0e1aa260f12dc232a8501c42.
* apple: Use mesa gl.h rather than generating one.Jeremy Huddleston2010-04-011-8/+3
| | | | Signed-off-by: Jeremy Huddleston <[email protected]>
* apple: Integrate our libGL into the existing build system betterJeremy Huddleston2010-04-011-73/+110
| | | | Signed-off-by: Jeremy Huddleston <[email protected]>
* apple: Initial import of libGL for OSX from AppleSGLX svn repository.Jeremy Huddleston2010-04-011-0/+97
Signed-off-by: Jeremy Huddleston <[email protected]>