projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix unitialized values in radeonClear
[mesa.git]
/
src
/
mesa
/
Makefile.mgw
diff --git
a/src/mesa/Makefile.mgw
b/src/mesa/Makefile.mgw
index d1d415d09106f21b51e8784f9d7c7f8b34b15bbc..ebec5c055a87cc757efd3750fc1c8a518fb7051e 100644
(file)
--- a/
src/mesa/Makefile.mgw
+++ b/
src/mesa/Makefile.mgw
@@
-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.
# 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.
-# MinGW core makefile v1.
3
for Mesa
+# MinGW core makefile v1.
4
for Mesa
#
#
-# Copyright (C) 2002 -
Borca Daniel
+# Copyright (C) 2002 -
Daniel Borca
# Email : dborca@users.sourceforge.net
# Web : http://www.geocities.com/dborca
# Email : dborca@users.sourceforge.net
# Web : http://www.geocities.com/dborca
@@
-40,6
+40,9
@@
# As a consequence, you'll need the Win32 Glide3
# library to build any application.
# default = no
# 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
#
# X86=1 optimize for x86 (if possible, use MMX, SSE, 3DNow).
# default = no
#
@@
-54,32
+57,48
@@
.INTERMEDIATE: x86/gen_matypes.exe
.SUFFIXES: .rc .res
.INTERMEDIATE: x86/gen_matypes.exe
.SUFFIXES: .rc .res
+# Set this to the prefix of your build tools, i.e. mingw32-
+TOOLS_PREFIX = mingw32-
+
TOP = ../..
GLIDE ?= $(TOP)/glide3
LIBDIR = $(TOP)/lib
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
LDLIBS = -lgdi32
-CC =
mingw32-
gcc
-CFLAGS += -DBUILD_GL32 -D_OPENGL32_
-D_MSC_VER
+CC =
$(TOOLS_PREFIX)
gcc
+CFLAGS += -DBUILD_GL32 -D_OPENGL32_
CFLAGS += $(INCLUDE_DIRS)
CFLAGS += $(INCLUDE_DIRS)
+CFLAGS += -DUSE_EXTERNAL_DXTN_LIB=1
ifeq ($(FX),1)
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/windows/fx
/fxopengl.def
+
GL_RES = drivers/windows/fx
/fx.rc
else
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
endif
AR = ar
-ARFLAGS = rus
+ARFLAGS =
c
rus
-ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
UNLINK = del $(subst /,\,$(1))
UNLINK = del $(subst /,\,$(1))
-else
+ifneq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
+UNLINK = $(RM) $(1)
+endif
+ifneq ($(wildcard $(addsuffix /rm,$(subst :, ,$(PATH)))),)
UNLINK = $(RM) $(1)
endif
UNLINK = $(RM) $(1)
endif
@@
-90,6
+109,7
@@
CFLAGS += -DUSE_X86_ASM
CFLAGS += -DUSE_MMX_ASM
CFLAGS += -DUSE_SSE_ASM
CFLAGS += -DUSE_3DNOW_ASM
CFLAGS += -DUSE_MMX_ASM
CFLAGS += -DUSE_SSE_ASM
CFLAGS += -DUSE_3DNOW_ASM
+X86_SOURCES += $(X86_API)
else
X86_SOURCES =
endif
else
X86_SOURCES =
endif
@@
-97,12
+117,18
@@
endif
ifeq ($(FX),1)
DRIVER_SOURCES = \
$(GLIDE_DRIVER_SOURCES) \
ifeq ($(FX),1)
DRIVER_SOURCES = \
$(GLIDE_DRIVER_SOURCES) \
- drivers/glide/fxwgl.c
+ drivers/windows/fx/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
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)
SOURCES = $(CORE_SOURCES) $(X86_SOURCES) $(COMMON_DRIVER_SOURCES) $(DRIVER_SOURCES)
@@
-121,10
+147,15
@@
RESOURCE = $(GL_RES:.rc=.res)
.rc.res:
windres -o $@ -Irc -Ocoff $<
.rc.res:
windres -o $@ -Irc -Ocoff $<
-all: $(LIBDIR)/$(GL_DLL) $(LIBDIR)/$(GL_IMP)
+all: $(LIBDIR) $(LIBDIR)/$(GL_DLL) $(LIBDIR)/$(GL_IMP)
+
+$(LIBDIR):
+ mkdir -p $(LIBDIR)
$(LIBDIR)/$(GL_DLL) $(LIBDIR)/$(GL_IMP): $(OBJECTS) $(RESOURCE)
$(LIBDIR)/$(GL_DLL) $(LIBDIR)/$(GL_IMP): $(OBJECTS) $(RESOURCE)
- dllwrap -o $(LIBDIR)/$(GL_DLL) --output-lib $(LIBDIR)/$(GL_IMP) --target i386-mingw32 --def $(GL_DEF) $^ $(LDLIBS)
+ $(TOOLS_PREFIX)dllwrap -o $(LIBDIR)/$(GL_DLL) --output-lib $(LIBDIR)/$(GL_IMP) \
+ --target i386-mingw32 --def $(GL_DEF) -Wl,-enable-stdcall-fixup \
+ $^ $(LDLIBS)
$(X86_OBJECTS): x86/matypes.h
$(X86_OBJECTS): x86/matypes.h
@@
-137,10
+168,18
@@
x86/gen_matypes.exe: x86/gen_matypes.c
# [dBorca]
# glapi_x86.S needs some adjustments
# in order to generate correct entrypoints
# [dBorca]
# glapi_x86.S needs some adjustments
# in order to generate correct entrypoints
+# Trick: change the following condition to
+# be always false if you need C entrypoints
+# with USE_X86_ASM (useful for trace/debug)
+ifeq (1,1)
x86/glapi_x86.o: x86/glapi_x86.S
x86/glapi_x86.o: x86/glapi_x86.S
- $(CC) -o $@ $(CFLAGS) -U__WIN32__ -DSTDCALL_API -c $<
-#main/dispatch.o: main/dispatch.c
-# $(CC) -o $@ $(CFLAGS) -UUSE_X86_ASM -c $<
+ $(CC) -o $@ $(CFLAGS) -DSTDCALL_API -c $<
+else
+main/dispatch.o: main/dispatch.c
+ $(CC) -o $@ $(CFLAGS) -UUSE_X86_ASM -c $<
+glapi/glapi.o: glapi/glapi.c
+ $(CC) -o $@ $(CFLAGS) -UUSE_X86_ASM -c $<
+endif
# [dBorca]
# if we want codegen, we have to stdcall
# [dBorca]
# if we want codegen, we have to stdcall
@@
-154,11
+193,14
@@
clean:
-$(call UNLINK,math/*.o)
-$(call UNLINK,shader/*.o)
-$(call UNLINK,sparc/*.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)
-$(call UNLINK,x86/*.o)
-$(call UNLINK,drivers/common/*.o)
-$(call UNLINK,swrast/*.o)
-$(call UNLINK,swrast_setup/*.o)
-$(call UNLINK,tnl/*.o)
-$(call UNLINK,x86/*.o)
-$(call UNLINK,drivers/common/*.o)
- -$(call UNLINK,drivers/windows/gdi/*.o)
-$(call UNLINK,drivers/glide/*.o)
-$(call UNLINK,drivers/glide/*.o)
- -$(call UNLINK,drivers/glide/*.res)
+ -$(call UNLINK,drivers/windows/fx/*.o)
+ -$(call UNLINK,drivers/windows/fx/*.res)
+ -$(call UNLINK,drivers/windows/gdi/*.o)
+ -$(call UNLINK,drivers/windows/icd/*.o)