clean up makefiles some more for Windows
This commit is contained in:
parent
4742735a5c
commit
573dd2206b
|
@ -1,4 +1,4 @@
|
||||||
# $Id: Makefile.win,v 1.2 2001/09/18 16:39:38 kschultz Exp $
|
# $Id: Makefile.win,v 1.3 2001/09/18 20:47:23 kschultz Exp $
|
||||||
|
|
||||||
# Mesa 3-D graphics library
|
# Mesa 3-D graphics library
|
||||||
# Version: 3.5
|
# Version: 3.5
|
||||||
|
@ -70,13 +70,13 @@ realclean::
|
||||||
targets: readtex.c readtex.h $(PROGS)
|
targets: readtex.c readtex.h $(PROGS)
|
||||||
|
|
||||||
# remove comments when we get non-osmesa pgm working
|
# remove comments when we get non-osmesa pgm working
|
||||||
#$(EXES) : $*.obj $(DEPLIBS)
|
#$(EXES) : $*.obj
|
||||||
# echo $@
|
# @echo $@
|
||||||
# $(link) -out:$@ $** $(LIBS)
|
# $(link) -out:$@ $** /LIBPATH:$(LIBDIR) $(LIBS)
|
||||||
|
|
||||||
$(OSMESAEXES) : $*.obj $(DEPLIBS)
|
$(OSMESAEXES) : $*.obj
|
||||||
echo $@
|
@echo $@
|
||||||
$(link) -out:$@ $** $(LIBS) $(EXTRALIBS)
|
$(link) -out:$@ $** /LIBPATH:$(LIBDIR) $(LIBS) $(EXTRALIBS)
|
||||||
|
|
||||||
readtex.c:
|
readtex.c:
|
||||||
@copy ../util/readtex.c .
|
@copy ../util/readtex.c .
|
||||||
|
|
|
@ -110,9 +110,7 @@ GLU_SRCS = \
|
||||||
|
|
||||||
SRCS = $(GLU_SRCS)
|
SRCS = $(GLU_SRCS)
|
||||||
|
|
||||||
GLUDLL = glu32.dll
|
all : gludll
|
||||||
|
|
||||||
all : gludll install
|
|
||||||
|
|
||||||
!include "$(TOP)/mesawin32.mak"
|
!include "$(TOP)/mesawin32.mak"
|
||||||
|
|
||||||
|
@ -122,7 +120,7 @@ CFLAGS = $(cvarsdll) $(CFLAGS) -D_OPENGL32_ -Iinclude -DBUILD_GL32
|
||||||
LFLAGS = $(dlllflags) $(LFLAGS)
|
LFLAGS = $(dlllflags) $(LFLAGS)
|
||||||
|
|
||||||
OBJS = $(GLU_SRCS:.c=.obj)
|
OBJS = $(GLU_SRCS:.c=.obj)
|
||||||
LIBS = ../lib/opengl32.lib winmm.lib $(guilibsdll)
|
LIBS = ../lib/$(MESALIB) winmm.lib $(guilibsdll)
|
||||||
|
|
||||||
# Uncomment these definitions to try to compile the NURBS code.
|
# Uncomment these definitions to try to compile the NURBS code.
|
||||||
#OBJS = $(GLU_SRCS_CC:.cc=.obj) $(GLU_SRCS:.c=.obj)
|
#OBJS = $(GLU_SRCS_CC:.cc=.obj) $(GLU_SRCS:.c=.obj)
|
||||||
|
@ -131,12 +129,18 @@ LIBS = ../lib/opengl32.lib winmm.lib $(guilibsdll)
|
||||||
|
|
||||||
$(GLUDLL): $(OBJS) glu.def
|
$(GLUDLL): $(OBJS) glu.def
|
||||||
$(link) $(LFLAGS) -out:$(GLUDLL) -def:glu.def $(OBJS) $(LIBS)
|
$(link) $(LFLAGS) -out:$(GLUDLL) -def:glu.def $(OBJS) $(LIBS)
|
||||||
|
@echo "copying Mesa GLU dynamic link library to library directory..."
|
||||||
install : $(GLUDLL)
|
|
||||||
@echo "copying Mesa GLU dynamic link library to system directory..."
|
|
||||||
-copy $(GLUDLL) $(TOP)\lib
|
-copy $(GLUDLL) $(TOP)\lib
|
||||||
@echo "copying Mesa GLU import library to library directory..."
|
@echo "copying Mesa GLU import library to library directory..."
|
||||||
-copy $(GLU) $(TOP)\lib
|
-copy $(GLULIB) $(TOP)\lib
|
||||||
|
|
||||||
|
install : $(GLUDLL) $(GLULIB)
|
||||||
|
@echo "copying Mesa GLU dynamic link library to system directory..."
|
||||||
|
-copy $(GLUDLL) $(DLLINSTALL)
|
||||||
|
@echo "copying Mesa GLU header files to include directory..."
|
||||||
|
-copy ..\..\include\GL\glu.h $(INCLUDEINSTALL)
|
||||||
|
@echo "copying Mesa GLU import library to system library directory..."
|
||||||
|
-copy $(GLULIB) $(LIBINSTALL)
|
||||||
|
|
||||||
clean ::
|
clean ::
|
||||||
@del /f libtess\*.obj libutil\*.obj
|
@del /f libtess\*.obj libutil\*.obj
|
||||||
|
@ -144,7 +148,7 @@ clean ::
|
||||||
@del /f libnurbs\nurbtess\*.obj
|
@del /f libnurbs\nurbtess\*.obj
|
||||||
|
|
||||||
# override default inference rule with one that writes the object to
|
# override default inference rule with one that writes the object to
|
||||||
# the correct subdir.
|
# the same subdir as the c file.
|
||||||
|
|
||||||
.c.obj :
|
.c.obj :
|
||||||
$(cc) $(CFLAGS) -I. $< /Fo$*.obj
|
$(cc) $(CFLAGS) -I. $< /Fo$*.obj
|
||||||
|
|
|
@ -22,8 +22,7 @@ CFLAGS = $(cvarsdll) $(CFLAGS) $(OPTIMIZE_CFLAGS) -DMESA -DBUILD_GL32
|
||||||
LFLAGS = $(dlllflags) $(LFLAGS)
|
LFLAGS = $(dlllflags) $(LFLAGS)
|
||||||
|
|
||||||
OBJS = $(SRCS:.c=.obj)
|
OBJS = $(SRCS:.c=.obj)
|
||||||
MS_LIBS = $(MS_OPENGL) $(MS_GLU) winmm.lib $(guilibsdll)
|
MS_LIBS = ../lib/$(MESALIB) ../lib/$(GLULIB) winmm.lib $(guilibsdll)
|
||||||
MS_LIBS = ../lib/opengl32.lib ../lib/glu32.lib winmm.lib $(guilibsdll)
|
|
||||||
SGI_LIBS = $(SGI_OPENGL) $(SGI_GLU) winmm.lib $(guilibsdll)
|
SGI_LIBS = $(SGI_OPENGL) $(SGI_GLU) winmm.lib $(guilibsdll)
|
||||||
|
|
||||||
glut32.dll : $(OBJS) glut.def
|
glut32.dll : $(OBJS) glut.def
|
||||||
|
|
|
@ -6,32 +6,31 @@ TOP = ..\..
|
||||||
|
|
||||||
OSMESA_SRCS = osmesa.c
|
OSMESA_SRCS = osmesa.c
|
||||||
OSMESA_OBJS = osmesa.obj
|
OSMESA_OBJS = osmesa.obj
|
||||||
OSMESALIB = OSmesa.lib
|
|
||||||
|
|
||||||
ASM_SRCS =
|
ASM_SRCS =
|
||||||
CORE_SRCS = $(OSMESA_SRCS)
|
CORE_SRCS =
|
||||||
DRIVER_SRCS =
|
DRIVER_SRCS = $(OSMESA_SRCS)
|
||||||
|
|
||||||
SRCS = $(OSMESA_SRCS)
|
SRCS = $(OSMESA_SRCS)
|
||||||
|
|
||||||
all : osmesalib install
|
all : osmesalib
|
||||||
|
|
||||||
!include "$(TOP)/mesawin32.mak"
|
!include "$(TOP)/mesawin32.mak"
|
||||||
|
|
||||||
osmesalib: $(OSMESALIB)
|
osmesalib: $(OSMESALIB)
|
||||||
|
|
||||||
CFLAGS = $(cvarsdll) $(CFLAGS) -D_OPENGL32_ -I$(TOP)/src
|
# Undefine _DLL because osmesa is a LIB, not a DLL
|
||||||
|
CFLAGS = $(cvarsdll) $(CFLAGS) -U_DLL -D_OPENGL32_ -I$(TOP)/src
|
||||||
LFLAGS = /LIB
|
LFLAGS = /LIB
|
||||||
|
|
||||||
OBJS = $(ASM_SRCS:.S=.obj) $(CORE_SRCS:.c=.obj) $(DRIVER_SRCS:.c=.obj)
|
OBJS = $(ASM_SRCS:.S=.obj) $(CORE_SRCS:.c=.obj) $(DRIVER_SRCS:.c=.obj)
|
||||||
LIBS = $(TOP)/lib/OpenGL32.lib $(TOP)/src/opengl32.exp
|
LIBS = $(TOP)/lib/$(MESALIB)
|
||||||
|
|
||||||
$(OSMESALIB) : $(OBJS)
|
$(OSMESALIB) : $(OBJS)
|
||||||
$(link) $(LFLAGS) -out:$(OSMESALIB) $(OBJS) $(LIBS)
|
$(link) $(LFLAGS) -out:$(OSMESALIB) $(OBJS) $(LIBS)
|
||||||
|
|
||||||
install : $(OSMESALIB)
|
|
||||||
@echo "copying OSMesa library to library directory..."
|
@echo "copying OSMesa library to library directory..."
|
||||||
-copy $(OSMESALIB) $(TOP)\lib
|
-copy $(OSMESALIB) $(TOP)\lib
|
||||||
|
|
||||||
clean ::
|
install : $(OSMESALIB)
|
||||||
@del /f osmesa.obj
|
@echo "copying OSMesa library to system library directory..."
|
||||||
|
-copy $(OSMESALIB) $(LIBINSTALL)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Makefile for Win32
|
# Makefile for Win32
|
||||||
#
|
#
|
||||||
# NOTE: the install target may overwrite important files in the system dir
|
# NOTE: the install target may overwrite important files in the system dirs
|
||||||
# Sept 12, 2001
|
# Sept 12, 2001
|
||||||
# Windows driver not working. OSMesa driver works.
|
# Windows driver not working. OSMesa driver works.
|
||||||
#
|
#
|
||||||
|
@ -157,7 +157,7 @@ CFLAGS = $(cvarsdll) $(CFLAGS) -D_OPENGL32_ -DBUILD_GL32 -DNO_PARALLEL -DNO_STER
|
||||||
LFLAGS = $(dlllflags) $(LFLAGS)
|
LFLAGS = $(dlllflags) $(LFLAGS)
|
||||||
|
|
||||||
OBJS = $(ASM_SRCS:.S=.obj) $(CORE_SRCS:.c=.obj) $(DRIVER_SRCS:.c=.obj)
|
OBJS = $(ASM_SRCS:.S=.obj) $(CORE_SRCS:.c=.obj) $(DRIVER_SRCS:.c=.obj)
|
||||||
LIBS = $(GLU) winmm.lib $(guilibsdll)
|
LIBS = winmm.lib $(guilibsdll)
|
||||||
|
|
||||||
$(MESADLL) : $(OBJS) mesa.def
|
$(MESADLL) : $(OBJS) mesa.def
|
||||||
$(link) $(LFLAGS) -out:$(MESADLL) -def:mesa.def $(OBJS) $(LIBS)
|
$(link) $(LFLAGS) -out:$(MESADLL) -def:mesa.def $(OBJS) $(LIBS)
|
||||||
|
@ -174,6 +174,7 @@ $(SUBDIRS) :
|
||||||
@cd ..
|
@cd ..
|
||||||
|
|
||||||
install : $(MESADLL)
|
install : $(MESADLL)
|
||||||
|
@echo.
|
||||||
@echo "copying Mesa dynamic link library to system directory..."
|
@echo "copying Mesa dynamic link library to system directory..."
|
||||||
-copy $(MESADLL) $(DLLINSTALL)
|
-copy $(MESADLL) $(DLLINSTALL)
|
||||||
@echo "copying Mesa header files to include directory..."
|
@echo "copying Mesa header files to include directory..."
|
||||||
|
@ -192,7 +193,10 @@ clean ::
|
||||||
@del /f osmesa\*.obj
|
@del /f osmesa\*.obj
|
||||||
@del /f Windows\*.obj
|
@del /f Windows\*.obj
|
||||||
|
|
||||||
|
clobber ::
|
||||||
|
@del /f OSmesa\*.lib
|
||||||
|
|
||||||
# override default inference rule with one that writes the object to
|
# override default inference rule with one that writes the object to
|
||||||
# the correct subdir
|
# the same subdir that the c file is in.
|
||||||
.c.obj :
|
.c.obj :
|
||||||
$(cc) $(CFLAGS) -I. $< /Fo$*.obj
|
$(cc) $(CFLAGS) -I. $< /Fo$*.obj
|
||||||
|
|
Loading…
Reference in New Issue