diff --git a/Make/makedefs b/Make/makedefs index 2477e09e2..43d3d170b 100644 --- a/Make/makedefs +++ b/Make/makedefs @@ -385,7 +385,7 @@ endif ifeq ($(OS),Darwin) C++ = c++ INC += -I/usr/X11R6/include - LDFLAGS += -L/usr/X11R6/lib + LDFLAGS += -L/usr/X11R6/lib -L/sw/lib DEF += -Wall -D__DARWIN_OSX__ OPTF = -O2 DBGF = -g -DOSG_COMPILE_UNIT_TESTS diff --git a/src/osgPlugins/iv/GNUmakefile.orig b/src/osgPlugins/iv/GNUmakefile.orig deleted file mode 100644 index 981f0a5d9..000000000 --- a/src/osgPlugins/iv/GNUmakefile.orig +++ /dev/null @@ -1,16 +0,0 @@ - -CXXFLAGS=-g -Wall -OBJS=scanner.o parser.o main.o nodecache.o osgvisitor.o normals.o readerwriter.o -TARGET=osgdb_iv.so - -$(TARGET): $(OBJS) - $(CXX) -shared $(OBJS) -o osgdb_wrl.so - -scanner.cpp: scanner.l parser.cpp - flex -oscanner.cpp scanner.l - -parser.cpp: parser.y - bison --debug -d -o parser.cpp parser.y - -clean: - rm -f *.o main $(TARGET) $(OBJS) scanner.cpp parser.cpp *~ diff --git a/src/osgPlugins/lwo/README.osg b/src/osgPlugins/lwo/README_osg.txt similarity index 100% rename from src/osgPlugins/lwo/README.osg rename to src/osgPlugins/lwo/README_osg.txt diff --git a/src/osgPlugins/obj/README.osg b/src/osgPlugins/obj/README_osg.txt similarity index 100% rename from src/osgPlugins/obj/README.osg rename to src/osgPlugins/obj/README_osg.txt