diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-14 14:08:20 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-14 14:08:20 +0100 |
| commit | 7c06219c5953076ef3236b6a8959b99329c77ee9 (patch) | |
| tree | c4b00bb9d592afcdffdb3e98c7c7320e29488adb /mesalib/src/mapi/glapi/gen/Makefile | |
| parent | 2b5652fc7742c5ac57aca701214b046626a729e9 (diff) | |
| parent | 53d28537755790ee4625dc16f560cad5aa93f56b (diff) | |
| download | vcxsrv-7c06219c5953076ef3236b6a8959b99329c77ee9.tar.gz vcxsrv-7c06219c5953076ef3236b6a8959b99329c77ee9.tar.bz2 vcxsrv-7c06219c5953076ef3236b6a8959b99329c77ee9.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml
mesalib/src/mapi/glapi/gen/glX_proto_recv.py
mesalib/src/mapi/glapi/gen/glX_proto_size.py
mesalib/src/mapi/glapi/gen/gl_gentable.py
mesalib/src/mapi/glapi/gen/gl_table.py
Diffstat (limited to 'mesalib/src/mapi/glapi/gen/Makefile')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/Makefile | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/mesalib/src/mapi/glapi/gen/Makefile b/mesalib/src/mapi/glapi/gen/Makefile index 4110cda7b..c409285dd 100644 --- a/mesalib/src/mapi/glapi/gen/Makefile +++ b/mesalib/src/mapi/glapi/gen/Makefile @@ -41,21 +41,13 @@ MESA_OUTPUTS = \ XORG_GLX_DIR = $(XORG_BASE)/glx XORG_GLAPI_DIR = $(XORG_BASE)/glx -XORG_GLAPI_FILES = \ - $(XORG_GLAPI_DIR)/glapi_getproc.c \ - $(XORG_GLAPI_DIR)/glapi_nop.c \ - $(XORG_GLAPI_DIR)/glthread.c \ - $(XORG_GLAPI_DIR)/glthread.h - XORG_GLAPI_OUTPUTS = \ $(XORG_GLAPI_DIR)/glprocs.h \ - $(XORG_GLAPI_DIR)/glapioffsets.h \ $(XORG_GLAPI_DIR)/glapitable.h \ - $(XORG_GLAPI_DIR)/glapidispatch.h \ + $(XORG_GLAPI_DIR)/dispatch.h \ $(XORG_GLAPI_DIR)/glapi_gentable.c XORG_OUTPUTS = \ - $(XORG_GLAPI_FILES) \ $(XORG_GLAPI_OUTPUTS) \ $(XORG_GLX_DIR)/indirect_dispatch.c \ $(XORG_GLX_DIR)/indirect_dispatch_swap.c \ @@ -148,6 +140,9 @@ clean: $(XORG_GLAPI_DIR)/%.c: $(MESA_GLAPI_DIR)/%.c cp $< $@ +$(XORG_GLAPI_DIR)/dispatch.h: $(MESA_DIR)/main/dispatch.h + cp $< $@ + $(XORG_GLAPI_DIR)/%.h: $(MESA_GLAPI_DIR)/%.h cp $< $@ |