Currently scons puts them in src/mapi/glapi, meosn puts them in
src/mapi/glapi/gen. This results in some things being compilable only by
one or the other, put them in the same places so that everyone is happy.
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
'#/src/mesa/main',
'#src/gallium/state_trackers/glx/xlib',
Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers
'#/src/mesa/main',
'#src/gallium/state_trackers/glx/xlib',
Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers
+ Dir('../../../mapi/glapi/gen'), # src/mapi build path for python-generated GL API files/headers
])
env.Append(CPPDEFINES = ['USE_XSHM'])
])
env.Append(CPPDEFINES = ['USE_XSHM'])
/* skip normal ones */
#define _GLAPI_SKIP_NORMAL_ENTRY_POINTS
/* skip normal ones */
#define _GLAPI_SKIP_NORMAL_ENTRY_POINTS
-#include "glapi/glapitemp.h"
#endif /* GLX_INDIRECT_RENDERING */
#endif /* GLX_INDIRECT_RENDERING */
'#/src/mapi',
'#/src/mesa',
Dir('.'), # src/mapi/glapi build path
'#/src/mapi',
'#/src/mesa',
Dir('.'), # src/mapi/glapi build path
- Dir('..'), # src/mapi build path
+ Dir('gen'), # src/mapi/glapi/gen build path
- target = '../../../mapi/glapi/glapitemp.h',
+ target = '../../../mapi/glapi/gen/glapitemp.h',
script = 'gl_apitemp.py',
source = sources,
command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
script = 'gl_apitemp.py',
source = sources,
command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
-#include "glapi/glapitemp.h"
'#src/mesa',
Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers
Dir('../../../mapi/glapi'), # src/mapi/glapi build path
'#src/mesa',
Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers
Dir('../../../mapi/glapi'), # src/mapi/glapi build path
+ Dir('../../../mapi/glapi/gen'), # src/mapi/glapi build path
'#/src/mesa',
'#/src/mesa/main',
Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers
'#/src/mesa',
'#/src/mesa/main',
Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers
+ Dir('../../../mapi/glapi/gen'), # src/mapi/glapi/gen build path for python-generated GL API files/headers
])
env.Append(CPPDEFINES = ['USE_XSHM'])
])
env.Append(CPPDEFINES = ['USE_XSHM'])
/* skip normal ones */
#define _GLAPI_SKIP_NORMAL_ENTRY_POINTS
/* skip normal ones */
#define _GLAPI_SKIP_NORMAL_ENTRY_POINTS
-#include "glapi/glapitemp.h"
#endif /* GLX_INDIRECT_RENDERING */
#endif /* GLX_INDIRECT_RENDERING */