diff options
| author | Karl Schultz <[email protected]> | 2001-09-21 21:32:14 +0000 |
|---|---|---|
| committer | Karl Schultz <[email protected]> | 2001-09-21 21:32:14 +0000 |
| commit | 05ba9becc3211795af539d79b70c8a6af2688108 (patch) | |
| tree | 3f5b7a3cff35d6d607d6c32f41c051167d5d19e5 /src/mesa/drivers/osmesa/Makefile.win | |
| parent | 445e3cbd0dd2a526cb6628975f5351cbab3956a8 (diff) | |
Make osmesa a DLL instead of a static lib (Windows). This is more
consistent with the other modules and platforms. It also makes the
API and linkage on Windows more consistent.
Diffstat (limited to 'src/mesa/drivers/osmesa/Makefile.win')
| -rw-r--r-- | src/mesa/drivers/osmesa/Makefile.win | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/mesa/drivers/osmesa/Makefile.win b/src/mesa/drivers/osmesa/Makefile.win index c754782b52d..d6c11b169fc 100644 --- a/src/mesa/drivers/osmesa/Makefile.win +++ b/src/mesa/drivers/osmesa/Makefile.win @@ -13,24 +13,27 @@ DRIVER_SRCS = $(OSMESA_SRCS) SRCS = $(OSMESA_SRCS) -all : osmesalib +all : osmesadll !include "$(TOP)/mesawin32.mak" -osmesalib: $(OSMESALIB) +osmesadll: $(OSMESADLL) -# Undefine _DLL because osmesa is a LIB, not a DLL -CFLAGS = $(cvarsdll) $(CFLAGS) -U_DLL -D_OPENGL32_ -I$(TOP)/src -LFLAGS = /LIB +CFLAGS = $(cvarsdll) $(CFLAGS) -D_OPENGL32_ -DBUILD_GL32 -I$(TOP)/src +LFLAGS = $(LFLAGS) $(dlllflags) OBJS = $(ASM_SRCS:.S=.obj) $(CORE_SRCS:.c=.obj) $(DRIVER_SRCS:.c=.obj) -LIBS = $(TOP)/lib/$(MESALIB) +LIBS = $(guilibsdll) $(TOP)/lib/$(MESALIB) -$(OSMESALIB) : $(OBJS) - $(link) $(LFLAGS) -out:$(OSMESALIB) $(OBJS) $(LIBS) +$(OSMESADLL) : $(OBJS) osmesa.def + $(link) $(LFLAGS) -def:osmesa.def -out:$(OSMESADLL) $(OBJS) $(LIBS) @echo "copying OSMesa library to library directory..." -copy $(OSMESALIB) $(TOP)\lib + @echo "copying OSMesa dll to library directory..." + -copy $(OSMESADLL) $(TOP)\lib -install : $(OSMESALIB) +install : $(OSMESADLL) @echo "copying OSMesa library to system library directory..." -copy $(OSMESALIB) $(LIBINSTALL) + @echo "copying OSMesa dll to system library directory..." + -copy $(OSMESADLL) $(DLLINSTALL) |