62 lines
2 KiB
Diff
62 lines
2 KiB
Diff
diff -urN molscript-2.1.2.orig/Makefile.complete molscript-2.1.2/Makefile.complete
|
|
--- molscript-2.1.2.orig/Makefile.complete 1998-11-25 01:04:39.000000000 -0800
|
|
+++ molscript-2.1.2/Makefile.complete 2005-11-21 12:28:06.000000000 -0800
|
|
@@ -23,9 +23,9 @@
|
|
|
|
# OpenGL and GLUT for X (UNIX).
|
|
# Must be modified for Windows 95/NT. <---
|
|
-GLUTDIR = $(FREEWAREDIR)/glut
|
|
-GLUTLINK = $(GLUTDIR)/lib/glut/libglut.a -lGLU -lGL -lXmu -lXext -lX11
|
|
-OPENGLFLAG = -DOPENGL_SUPPORT -I$(GLUTDIR)/include
|
|
+GLUTDIR = $(FREEWAREDIR)
|
|
+GLUTLINK = -lglut -lGLU -lGL -lXmu -lXext -lX11
|
|
+OPENGLFLAG = -DOPENGL_SUPPORT -I$(GLUTDIR)/include/GL
|
|
OPENGLOBJ = opengl.o
|
|
OPENGLCLIBOBJ = ogl_utils.o ogl_body.o ogl_bitmap_character.o
|
|
|
|
@@ -35,25 +35,25 @@
|
|
|
|
# JPEG image file format; requires the JPEG library.
|
|
# Comment out these lines if the JPEG library is not available. <---
|
|
-JPEGDIR = $(FREEWAREDIR)/jpeg
|
|
-JPEGLINK = $(JPEGDIR)/libjpeg.a
|
|
-JPEGFLAG = -DJPEG_SUPPORT -I$(JPEGDIR)
|
|
+JPEGDIR = $(FREEWAREDIR)
|
|
+JPEGLINK = -ljpeg
|
|
+JPEGFLAG = -DJPEG_SUPPORT
|
|
JPEGOBJ = jpeg_img.o
|
|
|
|
# PNG image file format; requires the PNG library and the zlib library.
|
|
# Comment out these lines if the PNG and zlib libraries are not available. <---
|
|
-ZLIBDIR = $(FREEWAREDIR)/zlib
|
|
-ZLIBLINK = $(ZLIBDIR)/libz.a
|
|
-PNGDIR = $(FREEWAREDIR)/libpng
|
|
-PNGLINK = $(PNGDIR)/libpng.a
|
|
-PNGFLAG = -DPNG_SUPPORT -I$(PNGDIR) -I$(ZLIBDIR)
|
|
+ZLIBDIR = $(FREEWAREDIR)
|
|
+ZLIBLINK = -lz
|
|
+PNGDIR = $(FREEWAREDIR)
|
|
+PNGLINK = -lpng
|
|
+PNGFLAG = -DPNG_SUPPORT
|
|
PNGOBJ = png_img.o
|
|
|
|
# GIF image file format; requires the gd 1.3 library.
|
|
# Comment out these lines if the gd 1.3 library is not available. <---
|
|
-GIFDIR = $(FREEWAREDIR)/gd
|
|
-GIFLINK = $(GIFDIR)/libgd.a
|
|
-GIFFLAG = -DGIF_SUPPORT -I$(GIFDIR)
|
|
+GIFDIR = $(FREEWAREDIR)
|
|
+GIFLINK = -lgd
|
|
+GIFFLAG = -DGIF_SUPPORT
|
|
GIFOBJ = gif_img.o
|
|
|
|
# SGI IRIX's C compiler.
|
|
@@ -62,7 +62,7 @@
|
|
COPT = -O1
|
|
# Correctness flags:
|
|
#CCHECK = -ansi -fullwarn -g -DSELECT_DEBUG
|
|
-CCHECK = -ansi -fullwarn
|
|
+CCHECK = -ansi
|
|
#CCHECK = -ansi -fullwarn -DNDEBUG
|
|
|
|
# General cc compile flags.
|