diff options
Diffstat (limited to 'src/mesa/Makefile.X11')
| -rw-r--r-- | src/mesa/Makefile.X11 | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11 index e62907b5523..c1706da5580 100644 --- a/src/mesa/Makefile.X11 +++ b/src/mesa/Makefile.X11 @@ -25,6 +25,7 @@ MAIN_SOURCES = \ main/api_noop.c \ main/api_validate.c \ main/accum.c \ + main/arbparse.c \ main/arbprogram.c \ main/arbfragparse.c \ main/arbvertparse.c \ @@ -207,7 +208,8 @@ GLIDE_DRIVER_SOURCES = \ drivers/glide/fxtexman.c \ drivers/glide/fxtris.c \ drivers/glide/fxvb.c \ - drivers/glide/fxglidew.c + drivers/glide/fxglidew.c \ + drivers/glide/fxg.c SVGA_DRIVER_SOURCES = \ drivers/svga/svgamesa.c \ @@ -234,11 +236,13 @@ CORE_SOURCES = \ # This will probably get set to $(X86_SOURCES) in Make-config: ASM_SOURCES = +ifndef SOLO # This should get set in Make-config someday: DRIVER_SOURCES = \ $(X11_DRIVER_SOURCES) \ $(GLIDE_DRIVER_SOURCES) \ $(SVGA_DRIVER_SOURCES) +endif ### Object files @@ -302,7 +306,7 @@ targets: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(OSMESA_LIB) $(LIBMESA) $(LIBDIR)/$(GL_LIB): $(OBJECTS) $(TOP)/bin/mklib -o $(GL_LIB_NAME) -major $(GL_MAJOR) \ -minor $(GL_MINOR) -patch $(GL_TINY) -install $(LIBDIR) \ - $(GL_LIB_DEPS) $(OBJECTS) + $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS) # Make the OSMesa library @@ -311,7 +315,7 @@ $(LIBDIR)/$(OSMESA_LIB): $(OSMESA_OBJECTS) $(TOP)/bin/mklib -o $(OSMESA_LIB_NAME) -major $(MESA_MAJOR) \ -minor $(MESA_MINOR) -patch $(GL_TINY) -L$(LIBDIR) \ -l$(GL_LIB_NAME) -install $(LIBDIR) \ - $(OSMESA_OBJECTS) ; \ + $(MKLIB_OPTIONS) $(OSMESA_OBJECTS) ; \ fi @@ -346,9 +350,9 @@ tags: # Remove .o and backup files clean: - -rm *.a + -rm -f *.a -rm -f */*.o */*~ */*.o */*~ - -rm -f drivers/*/*.o + -rm -f drivers/*/*.o drivers/*/*/*.o include $(TOP)/Make-config |