diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gallium/state_trackers/vega/Makefile.am | 4 | ||||
-rw-r--r-- | src/gallium/state_trackers/vega/SConscript | 2 | ||||
-rw-r--r-- | src/gallium/state_trackers/vega/api.c | 2 | ||||
-rw-r--r-- | src/mapi/Android.mk | 16 | ||||
-rw-r--r-- | src/mapi/Makefile.sources (renamed from src/mapi/mapi/Makefile.sources) | 24 | ||||
-rw-r--r-- | src/mapi/entry.c (renamed from src/mapi/mapi/entry.c) | 0 | ||||
-rw-r--r-- | src/mapi/entry.h (renamed from src/mapi/mapi/entry.h) | 0 | ||||
-rw-r--r-- | src/mapi/entry_x86-64_tls.h (renamed from src/mapi/mapi/entry_x86-64_tls.h) | 0 | ||||
-rw-r--r-- | src/mapi/entry_x86_tls.h (renamed from src/mapi/mapi/entry_x86_tls.h) | 0 | ||||
-rw-r--r-- | src/mapi/entry_x86_tsd.h (renamed from src/mapi/mapi/entry_x86_tsd.h) | 0 | ||||
-rw-r--r-- | src/mapi/es1api/Makefile.am | 2 | ||||
-rw-r--r-- | src/mapi/es2api/Makefile.am | 2 | ||||
-rw-r--r-- | src/mapi/glapi/Makefile.am | 2 | ||||
-rw-r--r-- | src/mapi/glapi/SConscript | 2 | ||||
-rw-r--r-- | src/mapi/glapi/gen/Makefile.am | 2 | ||||
-rw-r--r-- | src/mapi/glapi/gen/glapi_gen.mk | 2 | ||||
-rw-r--r-- | src/mapi/glapi/glapi.c | 2 | ||||
-rw-r--r-- | src/mapi/glapi/glapi_entrypoint.c | 2 | ||||
-rw-r--r-- | src/mapi/glapi/glthread.h | 2 | ||||
-rw-r--r-- | src/mapi/mapi.c (renamed from src/mapi/mapi/mapi.c) | 0 | ||||
-rw-r--r-- | src/mapi/mapi.h (renamed from src/mapi/mapi/mapi.h) | 0 | ||||
-rw-r--r-- | src/mapi/mapi_abi.py (renamed from src/mapi/mapi/mapi_abi.py) | 2 | ||||
-rw-r--r-- | src/mapi/mapi_glapi.c (renamed from src/mapi/mapi/mapi_glapi.c) | 6 | ||||
-rw-r--r-- | src/mapi/mapi_tmp.h (renamed from src/mapi/mapi/mapi_tmp.h) | 0 | ||||
-rw-r--r-- | src/mapi/shared-glapi/Makefile.am | 2 | ||||
-rw-r--r-- | src/mapi/shared-glapi/SConscript | 4 | ||||
-rw-r--r-- | src/mapi/stub.c (renamed from src/mapi/mapi/stub.c) | 0 | ||||
-rw-r--r-- | src/mapi/stub.h (renamed from src/mapi/mapi/stub.h) | 0 | ||||
-rw-r--r-- | src/mapi/table.c (renamed from src/mapi/mapi/table.c) | 0 | ||||
-rw-r--r-- | src/mapi/table.h (renamed from src/mapi/mapi/table.h) | 0 | ||||
-rw-r--r-- | src/mapi/u_compiler.h (renamed from src/mapi/mapi/u_compiler.h) | 0 | ||||
-rw-r--r-- | src/mapi/u_current.c (renamed from src/mapi/mapi/u_current.c) | 0 | ||||
-rw-r--r-- | src/mapi/u_current.h (renamed from src/mapi/mapi/u_current.h) | 0 | ||||
-rw-r--r-- | src/mapi/u_execmem.c (renamed from src/mapi/mapi/u_execmem.c) | 0 | ||||
-rw-r--r-- | src/mapi/u_execmem.h (renamed from src/mapi/mapi/u_execmem.h) | 0 | ||||
-rw-r--r-- | src/mapi/u_macros.h (renamed from src/mapi/mapi/u_macros.h) | 0 | ||||
-rw-r--r-- | src/mapi/u_thread.h (renamed from src/mapi/mapi/u_thread.h) | 0 | ||||
-rw-r--r-- | src/mapi/vgapi/Makefile.am | 6 | ||||
-rw-r--r-- | src/mapi/vgapi/SConscript | 4 |
39 files changed, 45 insertions, 45 deletions
diff --git a/src/gallium/state_trackers/vega/Makefile.am b/src/gallium/state_trackers/vega/Makefile.am index 3ae096c85f3..5c5d071d105 100644 --- a/src/gallium/state_trackers/vega/Makefile.am +++ b/src/gallium/state_trackers/vega/Makefile.am @@ -63,6 +63,6 @@ libvega_la_SOURCES = \ BUILT_SOURCES = api_tmp.h CLEANFILES = api_tmp.h -api_tmp.h: $(top_srcdir)/src/mapi/vgapi/vgapi.csv $(top_srcdir)/src/mapi/mapi/mapi_abi.py - $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(top_srcdir)/src/mapi/mapi/mapi_abi.py \ +api_tmp.h: $(top_srcdir)/src/mapi/vgapi/vgapi.csv $(top_srcdir)/src/mapi/mapi_abi.py + $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(top_srcdir)/src/mapi/mapi_abi.py \ --printer vgapi --mode app $< > $@ diff --git a/src/gallium/state_trackers/vega/SConscript b/src/gallium/state_trackers/vega/SConscript index 394eaffe7bd..f8d75040255 100644 --- a/src/gallium/state_trackers/vega/SConscript +++ b/src/gallium/state_trackers/vega/SConscript @@ -49,7 +49,7 @@ vega_sources = [ api_tmp, = env.CodeGenerate( target = 'api_tmp.h', - script = '#src/mapi/mapi/mapi_abi.py', + script = '#src/mapi/mapi_abi.py', source = '#src/mapi/vgapi/vgapi.csv', command = python_cmd + ' $SCRIPT --printer vgapi --mode app $SOURCE > $TARGET' ) diff --git a/src/gallium/state_trackers/vega/api.c b/src/gallium/state_trackers/vega/api.c index 4bf7c71d453..8fb0c418b19 100644 --- a/src/gallium/state_trackers/vega/api.c +++ b/src/gallium/state_trackers/vega/api.c @@ -26,7 +26,7 @@ * Chia-I Wu <olv@lunarg.com> */ -#include "mapi/mapi.h" +#include "mapi.h" /* define vega_spec and vega_procs for use with mapi */ #define API_TMP_DEFINE_SPEC diff --git a/src/mapi/Android.mk b/src/mapi/Android.mk index d1749a2625d..f10437874dd 100644 --- a/src/mapi/Android.mk +++ b/src/mapi/Android.mk @@ -36,12 +36,12 @@ include $(CLEAR_VARS) abi_header := shared-glapi/glapi_mapi_tmp.h LOCAL_SRC_FILES := \ - mapi/entry.c \ - mapi/mapi_glapi.c \ - mapi/stub.c \ - mapi/table.c \ - mapi/u_current.c \ - mapi/u_execmem.c + entry.c \ + mapi_glapi.c \ + stub.c \ + table.c \ + u_current.c \ + u_execmem.c LOCAL_CFLAGS := \ -DMAPI_MODE_GLAPI \ @@ -68,9 +68,9 @@ include $(BUILD_SHARED_LIBRARY) mapi_abi_deps := \ $(wildcard $(LOCAL_PATH)/glapi/gen/*.py) \ $(wildcard $(LOCAL_PATH)/glapi/gen/*.xml) \ - $(LOCAL_PATH)/mapi/mapi_abi.py + $(LOCAL_PATH)/mapi_abi.py -$(mapi_abi_headers): PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/mapi/mapi_abi.py +$(mapi_abi_headers): PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/mapi_abi.py $(mapi_abi_headers): PRIVATE_APIXML := $(LOCAL_PATH)/glapi/gen/gl_and_es_API.xml $(mapi_abi_headers): $(mapi_abi_deps) @mkdir -p $(dir $@) diff --git a/src/mapi/mapi/Makefile.sources b/src/mapi/Makefile.sources index a2f6c716984..aff465a6015 100644 --- a/src/mapi/mapi/Makefile.sources +++ b/src/mapi/Makefile.sources @@ -1,4 +1,4 @@ -# src/mapi/mapi/Makefile.sources +# src/mapi/Makefile.sources # # mapi may be used in several ways # @@ -15,22 +15,22 @@ # this mode, compile MAPI_BRIDGE_FILES with MAPI_MODE_BRIDGE defined. MAPI_UTIL_FILES = \ - $(TOP)/src/mapi/mapi/u_current.c \ - $(TOP)/src/mapi/mapi/u_execmem.c + $(TOP)/src/mapi/u_current.c \ + $(TOP)/src/mapi/u_execmem.c MAPI_FILES = \ - $(TOP)/src/mapi/mapi/entry.c \ - $(TOP)/src/mapi/mapi/mapi.c \ - $(TOP)/src/mapi/mapi/stub.c \ - $(TOP)/src/mapi/mapi/table.c \ + $(TOP)/src/mapi/entry.c \ + $(TOP)/src/mapi/mapi.c \ + $(TOP)/src/mapi/stub.c \ + $(TOP)/src/mapi/table.c \ $(MAPI_UTIL_FILES) MAPI_GLAPI_FILES = \ - $(TOP)/src/mapi/mapi/entry.c \ - $(TOP)/src/mapi/mapi/mapi_glapi.c \ - $(TOP)/src/mapi/mapi/stub.c \ - $(TOP)/src/mapi/mapi/table.c \ + $(TOP)/src/mapi/entry.c \ + $(TOP)/src/mapi/mapi_glapi.c \ + $(TOP)/src/mapi/stub.c \ + $(TOP)/src/mapi/table.c \ $(MAPI_UTIL_FILES) MAPI_BRIDGE_FILES = \ - $(TOP)/src/mapi/mapi/entry.c + $(TOP)/src/mapi/entry.c diff --git a/src/mapi/mapi/entry.c b/src/mapi/entry.c index 3d9168a7243..3d9168a7243 100644 --- a/src/mapi/mapi/entry.c +++ b/src/mapi/entry.c diff --git a/src/mapi/mapi/entry.h b/src/mapi/entry.h index 9df81000470..9df81000470 100644 --- a/src/mapi/mapi/entry.h +++ b/src/mapi/entry.h diff --git a/src/mapi/mapi/entry_x86-64_tls.h b/src/mapi/entry_x86-64_tls.h index 72d4125a694..72d4125a694 100644 --- a/src/mapi/mapi/entry_x86-64_tls.h +++ b/src/mapi/entry_x86-64_tls.h diff --git a/src/mapi/mapi/entry_x86_tls.h b/src/mapi/entry_x86_tls.h index de918128eee..de918128eee 100644 --- a/src/mapi/mapi/entry_x86_tls.h +++ b/src/mapi/entry_x86_tls.h diff --git a/src/mapi/mapi/entry_x86_tsd.h b/src/mapi/entry_x86_tsd.h index c479c199e23..c479c199e23 100644 --- a/src/mapi/mapi/entry_x86_tsd.h +++ b/src/mapi/entry_x86_tsd.h diff --git a/src/mapi/es1api/Makefile.am b/src/mapi/es1api/Makefile.am index bd3c60d7a7b..eb98f165aa9 100644 --- a/src/mapi/es1api/Makefile.am +++ b/src/mapi/es1api/Makefile.am @@ -42,7 +42,7 @@ GLES_include_HEADERS = \ lib_LTLIBRARIES = libGLESv1_CM.la -libGLESv1_CM_la_SOURCES = ../mapi/entry.c glapi_mapi_tmp.h +libGLESv1_CM_la_SOURCES = ../entry.c glapi_mapi_tmp.h libGLESv1_CM_la_LIBADD = $(GLESv1_CM_LIB_DEPS) libGLESv1_CM_la_LDFLAGS = -version-number 1:1 -no-undefined diff --git a/src/mapi/es2api/Makefile.am b/src/mapi/es2api/Makefile.am index 9f79536942d..c6b0ca4ac3c 100644 --- a/src/mapi/es2api/Makefile.am +++ b/src/mapi/es2api/Makefile.am @@ -46,7 +46,7 @@ GLES3_include_HEADERS = \ lib_LTLIBRARIES = libGLESv2.la -libGLESv2_la_SOURCES = ../mapi/entry.c glapi_mapi_tmp.h +libGLESv2_la_SOURCES = ../entry.c glapi_mapi_tmp.h libGLESv2_la_LIBADD = $(GLESv2_LIB_DEPS) libGLESv2_la_LDFLAGS = -version-number 2 -no-undefined diff --git a/src/mapi/glapi/Makefile.am b/src/mapi/glapi/Makefile.am index cf2602aed0a..1698d1474e2 100644 --- a/src/mapi/glapi/Makefile.am +++ b/src/mapi/glapi/Makefile.am @@ -21,7 +21,7 @@ TOP = $(top_srcdir) include Makefile.sources -include ../mapi/Makefile.sources +include ../Makefile.sources AM_CPPFLAGS = \ $(DEFINES) \ diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript index 00cce3e7fda..79cbb6a40d1 100644 --- a/src/mapi/glapi/SConscript +++ b/src/mapi/glapi/SConscript @@ -43,7 +43,7 @@ mapi_sources = [ 'u_execmem.c', ] for s in mapi_sources: - o = env.SharedObject(s[:-2], '../mapi/' + s) + o = env.SharedObject(s[:-2], '../' + s) glapi_sources.append(o) # diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index 36e47e21eac..97200598e65 100644 --- a/src/mapi/glapi/gen/Makefile.am +++ b/src/mapi/glapi/gen/Makefile.am @@ -20,7 +20,7 @@ XORG_INDENT_FLAGS = -linux -bad -bap -blf -bli0 -cbi0 -cdw -nce -cs -i4 -lc80 -p MESA_DIR = $(top_srcdir)/src/mesa MESA_GLAPI_DIR = $(top_srcdir)/src/mapi/glapi -MESA_MAPI_DIR = $(top_srcdir)/src/mapi/mapi +MESA_MAPI_DIR = $(top_srcdir)/src/mapi MESA_GLX_DIR = $(top_srcdir)/src/glx MESA_GLAPI_OUTPUTS = \ diff --git a/src/mapi/glapi/gen/glapi_gen.mk b/src/mapi/glapi/gen/glapi_gen.mk index f65286fbd9a..242ae5fd908 100644 --- a/src/mapi/glapi/gen/glapi_gen.mk +++ b/src/mapi/glapi/gen/glapi_gen.mk @@ -4,7 +4,7 @@ glapi_gen_common_deps := \ $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.xml) \ $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.py) -glapi_gen_mapi_script := $(top_srcdir)/src/mapi/mapi/mapi_abi.py +glapi_gen_mapi_script := $(top_srcdir)/src/mapi/mapi_abi.py glapi_gen_mapi_deps := \ $(glapi_gen_mapi_script) \ $(glapi_gen_common_deps) diff --git a/src/mapi/glapi/glapi.c b/src/mapi/glapi/glapi.c index f7655c558c4..18a7d31a758 100644 --- a/src/mapi/glapi/glapi.c +++ b/src/mapi/glapi/glapi.c @@ -27,7 +27,7 @@ */ #include "glapi/glapi.h" -#include "mapi/u_current.h" +#include "u_current.h" /* * Global variables, _glapi_get_context, and _glapi_get_dispatch are defined in diff --git a/src/mapi/glapi/glapi_entrypoint.c b/src/mapi/glapi/glapi_entrypoint.c index 7a0eb353775..791bd428b02 100644 --- a/src/mapi/glapi/glapi_entrypoint.c +++ b/src/mapi/glapi/glapi_entrypoint.c @@ -30,7 +30,7 @@ #include "glapi/glapi_priv.h" -#include "mapi/u_execmem.h" +#include "u_execmem.h" #ifdef USE_X86_ASM diff --git a/src/mapi/glapi/glthread.h b/src/mapi/glapi/glthread.h index 1c3f4e2bf76..2399abb2bae 100644 --- a/src/mapi/glapi/glthread.h +++ b/src/mapi/glapi/glthread.h @@ -1,7 +1,7 @@ #ifndef GLTHREAD_H #define GLTHREAD_H -#include "mapi/u_thread.h" +#include "u_thread.h" #ifdef __cplusplus extern "C" { diff --git a/src/mapi/mapi/mapi.c b/src/mapi/mapi.c index b471c40b144..b471c40b144 100644 --- a/src/mapi/mapi/mapi.c +++ b/src/mapi/mapi.c diff --git a/src/mapi/mapi/mapi.h b/src/mapi/mapi.h index c7e43e22e9f..c7e43e22e9f 100644 --- a/src/mapi/mapi/mapi.h +++ b/src/mapi/mapi.h diff --git a/src/mapi/mapi/mapi_abi.py b/src/mapi/mapi_abi.py index c645c02f919..6bfcfa9af68 100644 --- a/src/mapi/mapi/mapi_abi.py +++ b/src/mapi/mapi_abi.py @@ -29,7 +29,7 @@ import sys # make it possible to import glapi import os -GLAPI = os.path.join(".", os.path.dirname(sys.argv[0]), "../glapi/gen") +GLAPI = os.path.join(".", os.path.dirname(sys.argv[0]), "glapi/gen") sys.path.append(GLAPI) import re diff --git a/src/mapi/mapi/mapi_glapi.c b/src/mapi/mapi_glapi.c index 4627c4de02b..a6838ce61e4 100644 --- a/src/mapi/mapi/mapi_glapi.c +++ b/src/mapi/mapi_glapi.c @@ -29,9 +29,9 @@ #include <string.h> #include "glapi/glapi.h" -#include "mapi/u_current.h" -#include "mapi/table.h" /* for MAPI_TABLE_NUM_SLOTS */ -#include "mapi/stub.h" +#include "u_current.h" +#include "table.h" /* for MAPI_TABLE_NUM_SLOTS */ +#include "stub.h" /* * Global variables, _glapi_get_context, and _glapi_get_dispatch are defined in diff --git a/src/mapi/mapi/mapi_tmp.h b/src/mapi/mapi_tmp.h index f326b4a4e14..f326b4a4e14 100644 --- a/src/mapi/mapi/mapi_tmp.h +++ b/src/mapi/mapi_tmp.h diff --git a/src/mapi/shared-glapi/Makefile.am b/src/mapi/shared-glapi/Makefile.am index 2cc5c590548..2021a7330f1 100644 --- a/src/mapi/shared-glapi/Makefile.am +++ b/src/mapi/shared-glapi/Makefile.am @@ -2,7 +2,7 @@ TOP = $(top_srcdir) GLAPI = $(top_srcdir)/src/mapi/glapi -include $(top_srcdir)/src/mapi/mapi/Makefile.sources +include $(top_srcdir)/src/mapi/Makefile.sources lib_LTLIBRARIES = libglapi.la libglapi_la_SOURCES = $(MAPI_GLAPI_FILES) diff --git a/src/mapi/shared-glapi/SConscript b/src/mapi/shared-glapi/SConscript index 0097c1c79ec..07b3eff118d 100644 --- a/src/mapi/shared-glapi/SConscript +++ b/src/mapi/shared-glapi/SConscript @@ -28,7 +28,7 @@ def mapi_objects(env, printer, mode): # generate ABI header header = env.CodeGenerate( target = header_name, - script = '../mapi/mapi_abi.py', + script = '../mapi_abi.py', source = '../glapi/gen/gl_and_es_API.xml', command = python_cmd + ' $SCRIPT ' + \ '--printer %s --mode lib $SOURCE > $TARGET' % (printer), @@ -59,7 +59,7 @@ def mapi_objects(env, printer, mode): for s in mapi_sources[mode]: o = env.SharedObject( target = '%s-%s' % (printer, s[:-2]), - source = '../mapi/' + s, + source = '../' + s, CPPPATH = cpppath, CPPDEFINES = cppdefines, ) diff --git a/src/mapi/mapi/stub.c b/src/mapi/stub.c index 688dc8143a4..688dc8143a4 100644 --- a/src/mapi/mapi/stub.c +++ b/src/mapi/stub.c diff --git a/src/mapi/mapi/stub.h b/src/mapi/stub.h index 98e2553ecdd..98e2553ecdd 100644 --- a/src/mapi/mapi/stub.h +++ b/src/mapi/stub.h diff --git a/src/mapi/mapi/table.c b/src/mapi/table.c index 9bb9f654a2a..9bb9f654a2a 100644 --- a/src/mapi/mapi/table.c +++ b/src/mapi/table.c diff --git a/src/mapi/mapi/table.h b/src/mapi/table.h index d84523f7777..d84523f7777 100644 --- a/src/mapi/mapi/table.h +++ b/src/mapi/table.h diff --git a/src/mapi/mapi/u_compiler.h b/src/mapi/u_compiler.h index f376e97a0f3..f376e97a0f3 100644 --- a/src/mapi/mapi/u_compiler.h +++ b/src/mapi/u_compiler.h diff --git a/src/mapi/mapi/u_current.c b/src/mapi/u_current.c index d902375f8c6..d902375f8c6 100644 --- a/src/mapi/mapi/u_current.c +++ b/src/mapi/u_current.c diff --git a/src/mapi/mapi/u_current.h b/src/mapi/u_current.h index f9cffd8c3d0..f9cffd8c3d0 100644 --- a/src/mapi/mapi/u_current.h +++ b/src/mapi/u_current.h diff --git a/src/mapi/mapi/u_execmem.c b/src/mapi/u_execmem.c index e5072e06e9a..e5072e06e9a 100644 --- a/src/mapi/mapi/u_execmem.c +++ b/src/mapi/u_execmem.c diff --git a/src/mapi/mapi/u_execmem.h b/src/mapi/u_execmem.h index 13fff8df225..13fff8df225 100644 --- a/src/mapi/mapi/u_execmem.h +++ b/src/mapi/u_execmem.h diff --git a/src/mapi/mapi/u_macros.h b/src/mapi/u_macros.h index 72345b5f156..72345b5f156 100644 --- a/src/mapi/mapi/u_macros.h +++ b/src/mapi/u_macros.h diff --git a/src/mapi/mapi/u_thread.h b/src/mapi/u_thread.h index a5e5043701f..a5e5043701f 100644 --- a/src/mapi/mapi/u_thread.h +++ b/src/mapi/u_thread.h diff --git a/src/mapi/vgapi/Makefile.am b/src/mapi/vgapi/Makefile.am index 7d7c581236e..0af7115eb70 100644 --- a/src/mapi/vgapi/Makefile.am +++ b/src/mapi/vgapi/Makefile.am @@ -40,13 +40,13 @@ VG_include_HEADERS = \ lib_LTLIBRARIES = libOpenVG.la TOP=$(top_srcdir) -include ../mapi/Makefile.sources +include ../Makefile.sources libOpenVG_la_SOURCES = $(MAPI_FILES) vgapi_tmp.h libOpenVG_la_LIBADD = $(VG_LIB_DEPS) libOpenVG_la_LDFLAGS = -version-number 1 -no-undefined -vgapi_tmp.h: $(srcdir)/vgapi.csv $(top_srcdir)/src/mapi/mapi/mapi_abi.py - $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(top_srcdir)/src/mapi/mapi/mapi_abi.py \ +vgapi_tmp.h: $(srcdir)/vgapi.csv $(top_srcdir)/src/mapi/mapi_abi.py + $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(top_srcdir)/src/mapi/mapi_abi.py \ --printer vgapi --mode lib $< > $@ BUILT_SOURCES = vgapi_tmp.h diff --git a/src/mapi/vgapi/SConscript b/src/mapi/vgapi/SConscript index fd4467bb231..63102c107ed 100644 --- a/src/mapi/vgapi/SConscript +++ b/src/mapi/vgapi/SConscript @@ -9,7 +9,7 @@ env = env.Clone() vgapi_header, = env.CodeGenerate( target = 'vgapi_tmp.h', - script = '../mapi/mapi_abi.py', + script = '../mapi_abi.py', source = 'vgapi.csv', command = python_cmd + ' $SCRIPT --printer vgapi --mode lib $SOURCE > $TARGET' ) @@ -37,7 +37,7 @@ mapi_sources = [ vgapi_objects = [] for s in mapi_sources: - o = env.SharedObject(s[:-2], '../mapi/' + s) + o = env.SharedObject(s[:-2], '../' + s) vgapi_objects.append(o) env.Depends(vgapi_objects, vgapi_header) |