From 86e001b78cb46c1d5a216dd50b3d7fe32db23575 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 25 Aug 2004 14:59:45 +0000
Subject: Windows ICD driver code (patch 1014800)

---
 src/mesa/Makefile.mgw | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

(limited to 'src/mesa/Makefile.mgw')

diff --git a/src/mesa/Makefile.mgw b/src/mesa/Makefile.mgw
index accfd1479c..fd1e45fd66 100644
--- a/src/mesa/Makefile.mgw
+++ b/src/mesa/Makefile.mgw
@@ -40,6 +40,9 @@
 #			As a consequence, you'll need the Win32 Glide3
 #			library to build any application.
 #			default = no
+#	ICD=1		build the installable client driver interface
+#			(windows opengl driver interface)
+#			default = no
 #	X86=1		optimize for x86 (if possible, use MMX, SSE, 3DNow).
 #			default = no
 #
@@ -57,8 +60,13 @@
 TOP = ../..
 GLIDE ?= $(TOP)/glide3
 LIBDIR = $(TOP)/lib
-GL_DLL = opengl32.dll
-GL_IMP = libopengl32.a
+ifeq ($(ICD),1)
+  GL_DLL = mesa32.dll
+  GL_IMP = libmesa32.a
+else
+  GL_DLL = opengl32.dll
+  GL_IMP = libopengl32.a
+endif
 
 LDLIBS = -lgdi32
 
@@ -66,12 +74,17 @@ CC = mingw32-gcc
 CFLAGS += -DBUILD_GL32 -D_OPENGL32_ -D_MSC_VER
 CFLAGS += $(INCLUDE_DIRS)
 ifeq ($(FX),1)
-CFLAGS += -I$(GLIDE)/include -DFX
-LDLIBS += -L$(GLIDE)/lib -lglide3x
-GL_DEF = drivers/glide/fxopengl.def
-GL_RES = drivers/glide/fx.rc
+  CFLAGS += -I$(GLIDE)/include -DFX
+  LDLIBS += -L$(GLIDE)/lib -lglide3x
+  GL_DEF = drivers/glide/fxopengl.def
+  GL_RES = drivers/glide/fx.rc
 else
-GL_DEF = drivers/windows/gdi/mesa.def
+  ifeq ($(ICD),1)
+    CFLAGS += -DUSE_MGL_NAMESPACE
+    GL_DEF = drivers/windows/icd/mesa.def
+  else    
+    GL_DEF = drivers/windows/gdi/mesa.def
+  endif
 endif
 
 AR = ar
@@ -100,10 +113,16 @@ DRIVER_SOURCES = \
 	$(GLIDE_DRIVER_SOURCES) \
 	drivers/glide/fxwgl.c
 else
+ifeq ($(ICD),1)
+DRIVER_SOURCES = \
+	drivers/windows/gdi/wmesa.c \
+	drivers/windows/icd/icd.c
+else
 DRIVER_SOURCES = \
 	drivers/windows/gdi/wmesa.c \
 	drivers/windows/gdi/wgl.c
 endif
+endif
 
 SOURCES = $(CORE_SOURCES) $(X86_SOURCES) $(COMMON_DRIVER_SOURCES) $(DRIVER_SOURCES)
 
@@ -161,5 +180,6 @@ clean:
 	-$(call UNLINK,x86/*.o)
 	-$(call UNLINK,drivers/common/*.o)
 	-$(call UNLINK,drivers/windows/gdi/*.o)
+	-$(call UNLINK,drivers/windows/icd/*.o)
 	-$(call UNLINK,drivers/glide/*.o)
 	-$(call UNLINK,drivers/glide/*.res)
-- 
cgit v1.2.3