X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2FMakefile.DJ;h=06a13fb1abde01c4f72d0ae89ace3438283492f7;hb=328621509f4690fb945201a90425662e4fd2fc2d;hp=cd9b10d8407aced6876cc9968ff2a612a663eddd;hpb=b3eda2443ad0e260997c9c3df789b297326114c1;p=mesa.git

diff --git a/src/mesa/Makefile.DJ b/src/mesa/Makefile.DJ
index cd9b10d8407..06a13fb1abd 100644
--- a/src/mesa/Makefile.DJ
+++ b/src/mesa/Makefile.DJ
@@ -20,9 +20,9 @@
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# DOS/DJGPP core makefile v1.6 for Mesa
+# DOS/DJGPP core makefile v1.7 for Mesa
 #
-#  Copyright (C) 2002 - Borca Daniel
+#  Copyright (C) 2002 - Daniel Borca
 #  Email : dborca@users.sourceforge.net
 #  Web   : http://www.geocities.com/dborca
 
@@ -64,6 +64,7 @@ export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH);$(LIBDIR);$(GLIDE)/lib
 
 CC = gcc
 CFLAGS += $(INCLUDE_DIRS)
+CFLAGS += -DUSE_EXTERNAL_DXTN_LIB=1
 ifeq ($(FX),1)
 CFLAGS += -D__DOS__
 CFLAGS += -I$(GLIDE)/include -DFX
@@ -73,7 +74,7 @@ LIBNAME = "Mesa DJGPP"
 endif
 
 AR = ar
-ARFLAGS = rus
+ARFLAGS = crus
 
 HAVEDXE3 = $(wildcard $(DJDIR)/bin/dxe3gen.exe)
 
@@ -102,8 +103,8 @@ DRIVER_SOURCES += \
 	$(GLIDE_DRIVER_SOURCES)
 else
 DRIVER_SOURCES += \
+	$(OSMESA_DRIVER_SOURCES) \
 	drivers/dos/video.c \
-	drivers/dos/virtual.S \
 	drivers/dos/vesa.c \
 	drivers/dos/blit.S \
 	drivers/dos/vga.c \
@@ -111,8 +112,6 @@ DRIVER_SOURCES += \
 	drivers/dos/dpmi.c
 endif
 
-#DRIVER_SOURCES += $(OSMESA_DRIVER_SOURCES)
-
 SOURCES = $(CORE_SOURCES) $(X86_SOURCES) $(COMMON_DRIVER_SOURCES) $(DRIVER_SOURCES)
 
 OBJECTS = $(addsuffix .o,$(basename $(SOURCES)))
@@ -157,6 +156,7 @@ clean:
 	-$(call UNLINK,math/*.o)
 	-$(call UNLINK,shader/*.o)
 	-$(call UNLINK,sparc/*.o)
+	-$(call UNLINK,ppc/*.o)
 	-$(call UNLINK,swrast/*.o)
 	-$(call UNLINK,swrast_setup/*.o)
 	-$(call UNLINK,tnl/*.o)