fix for bug#10182

[mesa.git] / src / mesa / Makefile.DJ

diff --git a/src/mesa/Makefile.DJ b/src/mesa/Makefile.DJ
index fdcc2ec546728d89e8486ecf03fb64324d068fc3..06a13fb1abde01c4f72d0ae89ace3438283492f7 100644 (file)
--- 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
 
@@ -40,15 +40,7 @@
 #                      As a consequence, you'll need the DJGPP Glide3
 #                      library to build any application.
 #                      default = no
-#      HAVE_X86=1      optimize for i386.
-#                      default = no
-#      HAVE_MMX=1      allow MMX specializations, provided your assembler
-#                      supports MMX instruction set. However, the true CPU
-#                      capabilities are checked at run-time to avoid crashes.
-#                      default = no
-#      HAVE_SSE=1      (see HAVE_MMX)
-#                      default = no
-#      HAVE_3DNOW=1    (see HAVE_MMX)
+#      X86=1           optimize for x86 (if possible, use MMX, SSE, 3DNow).
 #                      default = no
 #
 #    Targets:
@@ -71,9 +63,10 @@ GL_IMP = libigl.a
 export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH);$(LIBDIR);$(GLIDE)/lib
 
 CC = gcc
-CFLAGS += -I$(TOP)/include -I. -Imain -Iglapi
+CFLAGS += $(INCLUDE_DIRS)
+CFLAGS += -DUSE_EXTERNAL_DXTN_LIB=1
 ifeq ($(FX),1)
-CFLAGS += -D__DOS__ -DH3
+CFLAGS += -D__DOS__
 CFLAGS += -I$(GLIDE)/include -DFX
 LIBNAME = "Mesa/FX DJGPP"
 else
@@ -81,7 +74,7 @@ LIBNAME = "Mesa DJGPP"
 endif
 
 AR = ar
-ARFLAGS = rus
+ARFLAGS = crus
 
 HAVEDXE3 = $(wildcard $(DJDIR)/bin/dxe3gen.exe)
 
@@ -93,59 +86,12 @@ endif
 
 include sources
 
-X86_SOURCES = \
-       x86/x86.c \
-       x86/glapi_x86.S \
-       x86/common_x86.c \
-       x86/common_x86_asm.S \
-       x86/x86_xform2.S \
-       x86/x86_xform3.S \
-       x86/x86_xform4.S \
-       x86/x86_cliptest.S
-
-MMX_SOURCES = \
-       x86/mmx_blend.S
-
-SSE_SOURCES = \
-       x86/sse.c \
-       x86/sse_xform2.S \
-       x86/sse_xform3.S \
-       x86/sse_xform4.S \
-       x86/sse_normal.S
-
-K3D_SOURCES = \
-       x86/3dnow.c \
-       x86/3dnow_xform2.S \
-       x86/3dnow_xform3.S \
-       x86/3dnow_xform4.S \
-       x86/3dnow_normal.S
-
-CORE_SOURCES = \
-       $(MAIN_SOURCES) \
-       $(GLAPI_SOURCES) \
-       $(MATH_SOURCES) \
-       $(ARRAY_CACHE_SOURCES) \
-       $(TNL_SOURCES) \
-       $(SWRAST_SOURCES) \
-       $(SWRAST_SETUP_SOURCES)
-
-ifeq ($(HAVE_MMX),1)
-X86_SOURCES += $(MMX_SOURCES)
+ifeq ($(X86),1)
+CFLAGS += -DUSE_X86_ASM
 CFLAGS += -DUSE_MMX_ASM
-HAVE_X86 = 1
-endif
-ifeq ($(HAVE_SSE),1)
-X86_SOURCES += $(SSE_SOURCES)
 CFLAGS += -DUSE_SSE_ASM
-HAVE_X86 = 1
-endif
-ifeq ($(HAVE_3DNOW),1)
-X86_SOURCES += $(K3D_SOURCES)
 CFLAGS += -DUSE_3DNOW_ASM
-HAVE_X86 = 1
-endif
-ifeq ($(HAVE_X86),1)
-CFLAGS += -DUSE_X86_ASM
+X86_SOURCES += $(X86_API)
 else
 X86_SOURCES =
 endif
@@ -154,23 +100,15 @@ DRIVER_SOURCES = \
        drivers/dos/dmesa.c
 ifeq ($(FX),1)
 DRIVER_SOURCES += \
-       drivers/glide/fxapi.c \
-       drivers/glide/fxdd.c \
-       drivers/glide/fxddspan.c \
-       drivers/glide/fxddtex.c \
-       drivers/glide/fxsetup.c \
-       drivers/glide/fxtexman.c \
-       drivers/glide/fxtris.c \
-       drivers/glide/fxvb.c \
-       drivers/glide/fxglidew.c \
-       drivers/glide/fxg.c
+       $(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 \
+       drivers/dos/null.c \
        drivers/dos/dpmi.c
 endif
 
@@ -216,6 +154,9 @@ clean:
        -$(call UNLINK,glapi/*.o)
        -$(call UNLINK,main/*.o)
        -$(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)