[cello-cvs] CVS cello/cl-ftgl/ftgl-int

[fgoenninger]

Update of /project/cello/cvsroot/cello/cl-ftgl/ftgl-int
In directory clnet:/tmp/cvs-serv3955

Modified Files:
	Makefile 
Log Message:
Changed: Minor changes, more flexibility for Compile and Link phases through separate commands.

--- /project/cello/cvsroot/cello/cl-ftgl/ftgl-int/Makefile	2006/08/23 20:07:32	1.2
+++ /project/cello/cvsroot/cello/cl-ftgl/ftgl-int/Makefile	2006/08/26 16:08:27	1.3
@@ -2,7 +2,7 @@
 # MAKEFILE for libFTGLinterface
 # =============================================================================
 
-# $Id: Makefile,v 1.2 2006/08/23 20:07:32 fgoenninger Exp $
+# $Id: Makefile,v 1.3 2006/08/26 16:08:27 fgoenninger Exp $
 
 # by Frank Goenninger, Bempflingen, Germany
 # August 2006
@@ -14,20 +14,26 @@
 SRCS = FTGLFromC.cpp
 OBJS = FTGLFromC.o
 
-INCLUDEDIRS = -I/usr/local/include/freetype2 -I/usr/local/include/freetype2/freetype -I/opt/ftgl/src/FTGL/include
+INCLUDEDIRS = -I/usr/X11R6/include/freetype2 -I/usr/X11R6/include/freetype2/freetype -I/opt/ftgl/src/FTGL/include
 
 TARGET = libFTGLint.dylib
-DEPLIBS = -framework Carbon -framework OpenGL -framework GLUT /usr/local/lib/libfreetype.dylib /opt/ftgl/src/FTGL/mac/build/Development/libftgl.a
+DEPLIBS = -framework Carbon -framework OpenGL /usr/X11R6/lib/libfreetype.a /opt/ftgl/src/FTGL/mac/build/Development/libftgl.a
+
+# DEPLIBS = -framework Carbon -framework OpenGL -framework GLUT /usr/X11R6/lib/libfreetype.a /opt/ftgl/src/FTGL/mac/build/Development/libftgl.a
+
+
+CC = gcc -O
+LD = g++ -O
 
-CC = g++ -O
 CCFLAGS = -dynamic
-LDFLAGS = -dynamiclib -flat_namespace
+# LDFLAGS = -dynamiclib -flat_namespace
+LDFLAGS = -dynamiclib
 
 FTGLFromC.o:  $(SRCS)
 	$(CC) $(CCFLAGS) $(INCLUDEDIRS) -o FTGLFromC.o -c FTGLFromC.cpp
 
 all:	$(OBJS)
-	$(CC) $(LDFLAGS) -o $(TARGET) $(DEPLIBS) FTGLFromC.o
+	$(LD) $(LDFLAGS) -o $(TARGET) $(DEPLIBS) FTGLFromC.o
 
 clean:
 	rm -f $(OBJS) $(TARGET)