diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-27 08:17:50 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-04 14:23:00 +0200 |
| commit | 02b914d3b9b658a16e17cf2d95deede75dbbacc9 (patch) | |
| tree | 3757711ab3e1db8e1b59877354096503d9635112 /mesalib/src/mapi/glapi | |
| parent | f479a5fc7f844d96b169c399cb1e8ac085de6c2b (diff) | |
| download | vcxsrv-02b914d3b9b658a16e17cf2d95deede75dbbacc9.tar.gz vcxsrv-02b914d3b9b658a16e17cf2d95deede75dbbacc9.tar.bz2 vcxsrv-02b914d3b9b658a16e17cf2d95deede75dbbacc9.zip | |
xwininfo fontconfig libX11 libXau libXext libxcb mesa pixman
xkeyboard-config git update 27 Aug 2012
Diffstat (limited to 'mesalib/src/mapi/glapi')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/Makefile.am | 16 | ||||
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/glapi_gen.mk | 4 |
2 files changed, 12 insertions, 8 deletions
diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am index 499ec09a8..40aaf51cd 100644 --- a/mesalib/src/mapi/glapi/gen/Makefile.am +++ b/mesalib/src/mapi/glapi/gen/Makefile.am @@ -38,10 +38,18 @@ MESA_GLAPI_OUTPUTS = \ $(MESA_GLAPI_DIR)/glapitable.h \ $(MESA_GLAPI_DIR)/glapi_gentable.c -MESA_GLAPI_ASM_OUTPUTS = \ - $(MESA_GLAPI_DIR)/glapi_x86.S \ - $(MESA_GLAPI_DIR)/glapi_x86-64.S \ - $(MESA_GLAPI_DIR)/glapi_sparc.S +MESA_GLAPI_ASM_OUTPUTS = +if HAVE_X86_ASM +MESA_GLAPI_ASM_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_x86.S +endif + +if HAVE_X86_64_ASM +MESA_GLAPI_ASM_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_x86-64.S +endif + +if HAVE_SPARC_ASM +MESA_GLAPI_ASM_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_sparc.S +endif MESA_OUTPUTS = \ $(MESA_GLAPI_OUTPUTS) \ diff --git a/mesalib/src/mapi/glapi/gen/glapi_gen.mk b/mesalib/src/mapi/glapi/gen/glapi_gen.mk index eab8eb40c..f65286fbd 100644 --- a/mesalib/src/mapi/glapi/gen/glapi_gen.mk +++ b/mesalib/src/mapi/glapi/gen/glapi_gen.mk @@ -1,9 +1,5 @@ # Helpers for glapi header generation -ifndef top_srcdir -$(error top_srcdir must be defined.) -endif - glapi_gen_common_deps := \ $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.xml) \ $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.py) |