diff --git a/OpenSceneGraph-1.1.diff b/OpenSceneGraph-1.1.diff deleted file mode 100644 index 50ea295..0000000 --- a/OpenSceneGraph-1.1.diff +++ /dev/null @@ -1,2026 +0,0 @@ -diff -uNr OSG_OP_OT-1.1.orig/debian/Doxyfile-openscenegraph OSG_OP_OT-1.1/debian/Doxyfile-openscenegraph ---- OSG_OP_OT-1.1.orig/debian/Doxyfile-openscenegraph 1970-01-01 01:00:00.000000000 +0100 -+++ OSG_OP_OT-1.1/debian/Doxyfile-openscenegraph 2006-08-24 04:55:38.000000000 +0200 -@@ -0,0 +1,205 @@ -+# Doxyfile 1.3.4 -+ -+#--------------------------------------------------------------------------- -+# Project related configuration options -+#--------------------------------------------------------------------------- -+PROJECT_NAME = OpenSceneGraph -+PROJECT_NUMBER = -+OUTPUT_DIRECTORY = . -+OUTPUT_LANGUAGE = English -+USE_WINDOWS_ENCODING = NO -+BRIEF_MEMBER_DESC = YES -+REPEAT_BRIEF = YES -+ALWAYS_DETAILED_SEC = NO -+INLINE_INHERITED_MEMB = NO -+FULL_PATH_NAMES = NO -+STRIP_FROM_PATH = -+SHORT_NAMES = NO -+JAVADOC_AUTOBRIEF = NO -+MULTILINE_CPP_IS_BRIEF = NO -+DETAILS_AT_TOP = NO -+INHERIT_DOCS = YES -+DISTRIBUTE_GROUP_DOC = NO -+TAB_SIZE = 8 -+ALIASES = -+OPTIMIZE_OUTPUT_FOR_C = NO -+OPTIMIZE_OUTPUT_JAVA = NO -+SUBGROUPING = YES -+#--------------------------------------------------------------------------- -+# Build related configuration options -+#--------------------------------------------------------------------------- -+EXTRACT_ALL = YES -+EXTRACT_PRIVATE = NO -+EXTRACT_STATIC = NO -+EXTRACT_LOCAL_CLASSES = YES -+HIDE_UNDOC_MEMBERS = NO -+HIDE_UNDOC_CLASSES = NO -+HIDE_FRIEND_COMPOUNDS = NO -+HIDE_IN_BODY_DOCS = NO -+INTERNAL_DOCS = NO -+CASE_SENSE_NAMES = YES -+HIDE_SCOPE_NAMES = NO -+SHOW_INCLUDE_FILES = YES -+INLINE_INFO = YES -+SORT_MEMBER_DOCS = YES -+GENERATE_TODOLIST = YES -+GENERATE_TESTLIST = YES -+GENERATE_BUGLIST = YES -+GENERATE_DEPRECATEDLIST= YES -+ENABLED_SECTIONS = -+MAX_INITIALIZER_LINES = 30 -+SHOW_USED_FILES = YES -+#--------------------------------------------------------------------------- -+# configuration options related to warning and progress messages -+#--------------------------------------------------------------------------- -+QUIET = YES -+WARNINGS = NO -+WARN_IF_UNDOCUMENTED = NO -+WARN_IF_DOC_ERROR = NO -+WARN_FORMAT = "$file:$line: $text" -+WARN_LOGFILE = -+#--------------------------------------------------------------------------- -+# configuration options related to the input files -+#--------------------------------------------------------------------------- -+INPUT = OpenSceneGraph/include -+FILE_PATTERNS = * -+RECURSIVE = YES -+EXCLUDE = -+EXCLUDE_SYMLINKS = NO -+EXCLUDE_PATTERNS = -+EXAMPLE_PATH = -+EXAMPLE_PATTERNS = -+EXAMPLE_RECURSIVE = NO -+IMAGE_PATH = -+INPUT_FILTER = -+FILTER_SOURCE_FILES = NO -+#--------------------------------------------------------------------------- -+# configuration options related to source browsing -+#--------------------------------------------------------------------------- -+SOURCE_BROWSER = NO -+INLINE_SOURCES = NO -+STRIP_CODE_COMMENTS = YES -+REFERENCED_BY_RELATION = YES -+REFERENCES_RELATION = YES -+VERBATIM_HEADERS = YES -+#--------------------------------------------------------------------------- -+# configuration options related to the alphabetical class index -+#--------------------------------------------------------------------------- -+ALPHABETICAL_INDEX = NO -+COLS_IN_ALPHA_INDEX = 5 -+IGNORE_PREFIX = -+#--------------------------------------------------------------------------- -+# configuration options related to the HTML output -+#--------------------------------------------------------------------------- -+GENERATE_HTML = YES -+HTML_OUTPUT = OpenSceneGraph/html -+HTML_FILE_EXTENSION = .html -+HTML_HEADER = -+HTML_FOOTER = -+HTML_STYLESHEET = -+HTML_ALIGN_MEMBERS = YES -+GENERATE_HTMLHELP = NO -+CHM_FILE = -+HHC_LOCATION = -+GENERATE_CHI = NO -+BINARY_TOC = NO -+TOC_EXPAND = NO -+DISABLE_INDEX = NO -+ENUM_VALUES_PER_LINE = 4 -+GENERATE_TREEVIEW = NO -+TREEVIEW_WIDTH = 250 -+#--------------------------------------------------------------------------- -+# configuration options related to the LaTeX output -+#--------------------------------------------------------------------------- -+GENERATE_LATEX = NO -+LATEX_OUTPUT = latex -+LATEX_CMD_NAME = latex -+MAKEINDEX_CMD_NAME = makeindex -+COMPACT_LATEX = NO -+PAPER_TYPE = a4wide -+EXTRA_PACKAGES = -+LATEX_HEADER = -+PDF_HYPERLINKS = NO -+USE_PDFLATEX = NO -+LATEX_BATCHMODE = NO -+LATEX_HIDE_INDICES = NO -+#--------------------------------------------------------------------------- -+# configuration options related to the RTF output -+#--------------------------------------------------------------------------- -+GENERATE_RTF = NO -+RTF_OUTPUT = rtf -+COMPACT_RTF = NO -+RTF_HYPERLINKS = NO -+RTF_STYLESHEET_FILE = -+RTF_EXTENSIONS_FILE = -+#--------------------------------------------------------------------------- -+# configuration options related to the man page output -+#--------------------------------------------------------------------------- -+GENERATE_MAN = NO -+MAN_OUTPUT = man -+MAN_EXTENSION = .3 -+MAN_LINKS = NO -+#--------------------------------------------------------------------------- -+# configuration options related to the XML output -+#--------------------------------------------------------------------------- -+GENERATE_XML = NO -+XML_OUTPUT = xml -+XML_SCHEMA = -+XML_DTD = -+#--------------------------------------------------------------------------- -+# configuration options for the AutoGen Definitions output -+#--------------------------------------------------------------------------- -+GENERATE_AUTOGEN_DEF = NO -+#--------------------------------------------------------------------------- -+# configuration options related to the Perl module output -+#--------------------------------------------------------------------------- -+GENERATE_PERLMOD = NO -+PERLMOD_LATEX = NO -+PERLMOD_PRETTY = YES -+PERLMOD_MAKEVAR_PREFIX = -+#--------------------------------------------------------------------------- -+# Configuration options related to the preprocessor -+#--------------------------------------------------------------------------- -+ENABLE_PREPROCESSING = YES -+MACRO_EXPANSION = NO -+EXPAND_ONLY_PREDEF = NO -+SEARCH_INCLUDES = YES -+INCLUDE_PATH = -+INCLUDE_FILE_PATTERNS = -+PREDEFINED = -+EXPAND_AS_DEFINED = -+SKIP_FUNCTION_MACROS = YES -+#--------------------------------------------------------------------------- -+# Configuration::addtions related to external references -+#--------------------------------------------------------------------------- -+TAGFILES = -+GENERATE_TAGFILE = -+ALLEXTERNALS = NO -+EXTERNAL_GROUPS = YES -+PERL_PATH = /usr/bin/perl -+#--------------------------------------------------------------------------- -+# Configuration options related to the dot tool -+#--------------------------------------------------------------------------- -+CLASS_DIAGRAMS = YES -+HIDE_UNDOC_RELATIONS = YES -+HAVE_DOT = NO -+CLASS_GRAPH = YES -+COLLABORATION_GRAPH = YES -+UML_LOOK = NO -+TEMPLATE_RELATIONS = NO -+INCLUDE_GRAPH = YES -+INCLUDED_BY_GRAPH = YES -+CALL_GRAPH = NO -+GRAPHICAL_HIERARCHY = YES -+DOT_IMAGE_FORMAT = png -+DOT_PATH = -+DOTFILE_DIRS = -+MAX_DOT_GRAPH_WIDTH = 1024 -+MAX_DOT_GRAPH_HEIGHT = 1024 -+MAX_DOT_GRAPH_DEPTH = 0 -+GENERATE_LEGEND = YES -+DOT_CLEANUP = YES -+#--------------------------------------------------------------------------- -+# Configuration::addtions related to the search engine -+#--------------------------------------------------------------------------- -+SEARCHENGINE = NO -diff -uNr OSG_OP_OT-1.1.orig/debian/Doxyfile-openthreads OSG_OP_OT-1.1/debian/Doxyfile-openthreads ---- OSG_OP_OT-1.1.orig/debian/Doxyfile-openthreads 1970-01-01 01:00:00.000000000 +0100 -+++ OSG_OP_OT-1.1/debian/Doxyfile-openthreads 2006-08-24 04:55:38.000000000 +0200 -@@ -0,0 +1,205 @@ -+# Doxyfile 1.3.4 -+ -+#--------------------------------------------------------------------------- -+# Project related configuration options -+#--------------------------------------------------------------------------- -+PROJECT_NAME = OpenThreads -+PROJECT_NUMBER = -+OUTPUT_DIRECTORY = . -+OUTPUT_LANGUAGE = English -+USE_WINDOWS_ENCODING = NO -+BRIEF_MEMBER_DESC = YES -+REPEAT_BRIEF = YES -+ALWAYS_DETAILED_SEC = NO -+INLINE_INHERITED_MEMB = NO -+FULL_PATH_NAMES = NO -+STRIP_FROM_PATH = -+SHORT_NAMES = NO -+JAVADOC_AUTOBRIEF = NO -+MULTILINE_CPP_IS_BRIEF = NO -+DETAILS_AT_TOP = NO -+INHERIT_DOCS = YES -+DISTRIBUTE_GROUP_DOC = NO -+TAB_SIZE = 8 -+ALIASES = -+OPTIMIZE_OUTPUT_FOR_C = NO -+OPTIMIZE_OUTPUT_JAVA = NO -+SUBGROUPING = YES -+#--------------------------------------------------------------------------- -+# Build related configuration options -+#--------------------------------------------------------------------------- -+EXTRACT_ALL = YES -+EXTRACT_PRIVATE = NO -+EXTRACT_STATIC = NO -+EXTRACT_LOCAL_CLASSES = YES -+HIDE_UNDOC_MEMBERS = NO -+HIDE_UNDOC_CLASSES = NO -+HIDE_FRIEND_COMPOUNDS = NO -+HIDE_IN_BODY_DOCS = NO -+INTERNAL_DOCS = NO -+CASE_SENSE_NAMES = YES -+HIDE_SCOPE_NAMES = NO -+SHOW_INCLUDE_FILES = YES -+INLINE_INFO = YES -+SORT_MEMBER_DOCS = YES -+GENERATE_TODOLIST = YES -+GENERATE_TESTLIST = YES -+GENERATE_BUGLIST = YES -+GENERATE_DEPRECATEDLIST= YES -+ENABLED_SECTIONS = -+MAX_INITIALIZER_LINES = 30 -+SHOW_USED_FILES = YES -+#--------------------------------------------------------------------------- -+# configuration options related to warning and progress messages -+#--------------------------------------------------------------------------- -+QUIET = YES -+WARNINGS = NO -+WARN_IF_UNDOCUMENTED = NO -+WARN_IF_DOC_ERROR = NO -+WARN_FORMAT = "$file:$line: $text" -+WARN_LOGFILE = -+#--------------------------------------------------------------------------- -+# configuration options related to the input files -+#--------------------------------------------------------------------------- -+INPUT = OpenThreads/include -+FILE_PATTERNS = * -+RECURSIVE = YES -+EXCLUDE = -+EXCLUDE_SYMLINKS = NO -+EXCLUDE_PATTERNS = -+EXAMPLE_PATH = -+EXAMPLE_PATTERNS = -+EXAMPLE_RECURSIVE = NO -+IMAGE_PATH = -+INPUT_FILTER = -+FILTER_SOURCE_FILES = NO -+#--------------------------------------------------------------------------- -+# configuration options related to source browsing -+#--------------------------------------------------------------------------- -+SOURCE_BROWSER = NO -+INLINE_SOURCES = NO -+STRIP_CODE_COMMENTS = YES -+REFERENCED_BY_RELATION = YES -+REFERENCES_RELATION = YES -+VERBATIM_HEADERS = YES -+#--------------------------------------------------------------------------- -+# configuration options related to the alphabetical class index -+#--------------------------------------------------------------------------- -+ALPHABETICAL_INDEX = NO -+COLS_IN_ALPHA_INDEX = 5 -+IGNORE_PREFIX = -+#--------------------------------------------------------------------------- -+# configuration options related to the HTML output -+#--------------------------------------------------------------------------- -+GENERATE_HTML = YES -+HTML_OUTPUT = OpenThreads/html -+HTML_FILE_EXTENSION = .html -+HTML_HEADER = -+HTML_FOOTER = -+HTML_STYLESHEET = -+HTML_ALIGN_MEMBERS = YES -+GENERATE_HTMLHELP = NO -+CHM_FILE = -+HHC_LOCATION = -+GENERATE_CHI = NO -+BINARY_TOC = NO -+TOC_EXPAND = NO -+DISABLE_INDEX = NO -+ENUM_VALUES_PER_LINE = 4 -+GENERATE_TREEVIEW = NO -+TREEVIEW_WIDTH = 250 -+#--------------------------------------------------------------------------- -+# configuration options related to the LaTeX output -+#--------------------------------------------------------------------------- -+GENERATE_LATEX = NO -+LATEX_OUTPUT = latex -+LATEX_CMD_NAME = latex -+MAKEINDEX_CMD_NAME = makeindex -+COMPACT_LATEX = NO -+PAPER_TYPE = a4wide -+EXTRA_PACKAGES = -+LATEX_HEADER = -+PDF_HYPERLINKS = NO -+USE_PDFLATEX = NO -+LATEX_BATCHMODE = NO -+LATEX_HIDE_INDICES = NO -+#--------------------------------------------------------------------------- -+# configuration options related to the RTF output -+#--------------------------------------------------------------------------- -+GENERATE_RTF = NO -+RTF_OUTPUT = rtf -+COMPACT_RTF = NO -+RTF_HYPERLINKS = NO -+RTF_STYLESHEET_FILE = -+RTF_EXTENSIONS_FILE = -+#--------------------------------------------------------------------------- -+# configuration options related to the man page output -+#--------------------------------------------------------------------------- -+GENERATE_MAN = NO -+MAN_OUTPUT = man -+MAN_EXTENSION = .3 -+MAN_LINKS = NO -+#--------------------------------------------------------------------------- -+# configuration options related to the XML output -+#--------------------------------------------------------------------------- -+GENERATE_XML = NO -+XML_OUTPUT = xml -+XML_SCHEMA = -+XML_DTD = -+#--------------------------------------------------------------------------- -+# configuration options for the AutoGen Definitions output -+#--------------------------------------------------------------------------- -+GENERATE_AUTOGEN_DEF = NO -+#--------------------------------------------------------------------------- -+# configuration options related to the Perl module output -+#--------------------------------------------------------------------------- -+GENERATE_PERLMOD = NO -+PERLMOD_LATEX = NO -+PERLMOD_PRETTY = YES -+PERLMOD_MAKEVAR_PREFIX = -+#--------------------------------------------------------------------------- -+# Configuration options related to the preprocessor -+#--------------------------------------------------------------------------- -+ENABLE_PREPROCESSING = YES -+MACRO_EXPANSION = NO -+EXPAND_ONLY_PREDEF = NO -+SEARCH_INCLUDES = YES -+INCLUDE_PATH = -+INCLUDE_FILE_PATTERNS = -+PREDEFINED = -+EXPAND_AS_DEFINED = -+SKIP_FUNCTION_MACROS = YES -+#--------------------------------------------------------------------------- -+# Configuration::addtions related to external references -+#--------------------------------------------------------------------------- -+TAGFILES = -+GENERATE_TAGFILE = -+ALLEXTERNALS = NO -+EXTERNAL_GROUPS = YES -+PERL_PATH = /usr/bin/perl -+#--------------------------------------------------------------------------- -+# Configuration options related to the dot tool -+#--------------------------------------------------------------------------- -+CLASS_DIAGRAMS = YES -+HIDE_UNDOC_RELATIONS = YES -+HAVE_DOT = NO -+CLASS_GRAPH = YES -+COLLABORATION_GRAPH = YES -+UML_LOOK = NO -+TEMPLATE_RELATIONS = NO -+INCLUDE_GRAPH = YES -+INCLUDED_BY_GRAPH = YES -+CALL_GRAPH = NO -+GRAPHICAL_HIERARCHY = YES -+DOT_IMAGE_FORMAT = png -+DOT_PATH = -+DOTFILE_DIRS = -+MAX_DOT_GRAPH_WIDTH = 1024 -+MAX_DOT_GRAPH_HEIGHT = 1024 -+MAX_DOT_GRAPH_DEPTH = 0 -+GENERATE_LEGEND = YES -+DOT_CLEANUP = YES -+#--------------------------------------------------------------------------- -+# Configuration::addtions related to the search engine -+#--------------------------------------------------------------------------- -+SEARCHENGINE = NO -diff -uNr OSG_OP_OT-1.1.orig/debian/Doxyfile-producer OSG_OP_OT-1.1/debian/Doxyfile-producer ---- OSG_OP_OT-1.1.orig/debian/Doxyfile-producer 1970-01-01 01:00:00.000000000 +0100 -+++ OSG_OP_OT-1.1/debian/Doxyfile-producer 2006-08-24 04:55:38.000000000 +0200 -@@ -0,0 +1,205 @@ -+# Doxyfile 1.3.4 -+ -+#--------------------------------------------------------------------------- -+# Project related configuration options -+#--------------------------------------------------------------------------- -+PROJECT_NAME = Producer -+PROJECT_NUMBER = -+OUTPUT_DIRECTORY = . -+OUTPUT_LANGUAGE = English -+USE_WINDOWS_ENCODING = NO -+BRIEF_MEMBER_DESC = YES -+REPEAT_BRIEF = YES -+ALWAYS_DETAILED_SEC = NO -+INLINE_INHERITED_MEMB = NO -+FULL_PATH_NAMES = NO -+STRIP_FROM_PATH = -+SHORT_NAMES = NO -+JAVADOC_AUTOBRIEF = NO -+MULTILINE_CPP_IS_BRIEF = NO -+DETAILS_AT_TOP = NO -+INHERIT_DOCS = YES -+DISTRIBUTE_GROUP_DOC = NO -+TAB_SIZE = 8 -+ALIASES = -+OPTIMIZE_OUTPUT_FOR_C = NO -+OPTIMIZE_OUTPUT_JAVA = NO -+SUBGROUPING = YES -+#--------------------------------------------------------------------------- -+# Build related configuration options -+#--------------------------------------------------------------------------- -+EXTRACT_ALL = YES -+EXTRACT_PRIVATE = NO -+EXTRACT_STATIC = NO -+EXTRACT_LOCAL_CLASSES = YES -+HIDE_UNDOC_MEMBERS = NO -+HIDE_UNDOC_CLASSES = NO -+HIDE_FRIEND_COMPOUNDS = NO -+HIDE_IN_BODY_DOCS = NO -+INTERNAL_DOCS = NO -+CASE_SENSE_NAMES = YES -+HIDE_SCOPE_NAMES = NO -+SHOW_INCLUDE_FILES = YES -+INLINE_INFO = YES -+SORT_MEMBER_DOCS = YES -+GENERATE_TODOLIST = YES -+GENERATE_TESTLIST = YES -+GENERATE_BUGLIST = YES -+GENERATE_DEPRECATEDLIST= YES -+ENABLED_SECTIONS = -+MAX_INITIALIZER_LINES = 30 -+SHOW_USED_FILES = YES -+#--------------------------------------------------------------------------- -+# configuration options related to warning and progress messages -+#--------------------------------------------------------------------------- -+QUIET = YES -+WARNINGS = NO -+WARN_IF_UNDOCUMENTED = NO -+WARN_IF_DOC_ERROR = NO -+WARN_FORMAT = "$file:$line: $text" -+WARN_LOGFILE = -+#--------------------------------------------------------------------------- -+# configuration options related to the input files -+#--------------------------------------------------------------------------- -+INPUT = Producer/include -+FILE_PATTERNS = * -+RECURSIVE = YES -+EXCLUDE = -+EXCLUDE_SYMLINKS = NO -+EXCLUDE_PATTERNS = -+EXAMPLE_PATH = -+EXAMPLE_PATTERNS = -+EXAMPLE_RECURSIVE = NO -+IMAGE_PATH = -+INPUT_FILTER = -+FILTER_SOURCE_FILES = NO -+#--------------------------------------------------------------------------- -+# configuration options related to source browsing -+#--------------------------------------------------------------------------- -+SOURCE_BROWSER = NO -+INLINE_SOURCES = NO -+STRIP_CODE_COMMENTS = YES -+REFERENCED_BY_RELATION = YES -+REFERENCES_RELATION = YES -+VERBATIM_HEADERS = YES -+#--------------------------------------------------------------------------- -+# configuration options related to the alphabetical class index -+#--------------------------------------------------------------------------- -+ALPHABETICAL_INDEX = NO -+COLS_IN_ALPHA_INDEX = 5 -+IGNORE_PREFIX = -+#--------------------------------------------------------------------------- -+# configuration options related to the HTML output -+#--------------------------------------------------------------------------- -+GENERATE_HTML = YES -+HTML_OUTPUT = Producer/html -+HTML_FILE_EXTENSION = .html -+HTML_HEADER = -+HTML_FOOTER = -+HTML_STYLESHEET = -+HTML_ALIGN_MEMBERS = YES -+GENERATE_HTMLHELP = NO -+CHM_FILE = -+HHC_LOCATION = -+GENERATE_CHI = NO -+BINARY_TOC = NO -+TOC_EXPAND = NO -+DISABLE_INDEX = NO -+ENUM_VALUES_PER_LINE = 4 -+GENERATE_TREEVIEW = NO -+TREEVIEW_WIDTH = 250 -+#--------------------------------------------------------------------------- -+# configuration options related to the LaTeX output -+#--------------------------------------------------------------------------- -+GENERATE_LATEX = NO -+LATEX_OUTPUT = latex -+LATEX_CMD_NAME = latex -+MAKEINDEX_CMD_NAME = makeindex -+COMPACT_LATEX = NO -+PAPER_TYPE = a4wide -+EXTRA_PACKAGES = -+LATEX_HEADER = -+PDF_HYPERLINKS = NO -+USE_PDFLATEX = NO -+LATEX_BATCHMODE = NO -+LATEX_HIDE_INDICES = NO -+#--------------------------------------------------------------------------- -+# configuration options related to the RTF output -+#--------------------------------------------------------------------------- -+GENERATE_RTF = NO -+RTF_OUTPUT = rtf -+COMPACT_RTF = NO -+RTF_HYPERLINKS = NO -+RTF_STYLESHEET_FILE = -+RTF_EXTENSIONS_FILE = -+#--------------------------------------------------------------------------- -+# configuration options related to the man page output -+#--------------------------------------------------------------------------- -+GENERATE_MAN = NO -+MAN_OUTPUT = man -+MAN_EXTENSION = .3 -+MAN_LINKS = NO -+#--------------------------------------------------------------------------- -+# configuration options related to the XML output -+#--------------------------------------------------------------------------- -+GENERATE_XML = NO -+XML_OUTPUT = xml -+XML_SCHEMA = -+XML_DTD = -+#--------------------------------------------------------------------------- -+# configuration options for the AutoGen Definitions output -+#--------------------------------------------------------------------------- -+GENERATE_AUTOGEN_DEF = NO -+#--------------------------------------------------------------------------- -+# configuration options related to the Perl module output -+#--------------------------------------------------------------------------- -+GENERATE_PERLMOD = NO -+PERLMOD_LATEX = NO -+PERLMOD_PRETTY = YES -+PERLMOD_MAKEVAR_PREFIX = -+#--------------------------------------------------------------------------- -+# Configuration options related to the preprocessor -+#--------------------------------------------------------------------------- -+ENABLE_PREPROCESSING = YES -+MACRO_EXPANSION = NO -+EXPAND_ONLY_PREDEF = NO -+SEARCH_INCLUDES = YES -+INCLUDE_PATH = -+INCLUDE_FILE_PATTERNS = -+PREDEFINED = -+EXPAND_AS_DEFINED = -+SKIP_FUNCTION_MACROS = YES -+#--------------------------------------------------------------------------- -+# Configuration::addtions related to external references -+#--------------------------------------------------------------------------- -+TAGFILES = -+GENERATE_TAGFILE = -+ALLEXTERNALS = NO -+EXTERNAL_GROUPS = YES -+PERL_PATH = /usr/bin/perl -+#--------------------------------------------------------------------------- -+# Configuration options related to the dot tool -+#--------------------------------------------------------------------------- -+CLASS_DIAGRAMS = YES -+HIDE_UNDOC_RELATIONS = YES -+HAVE_DOT = NO -+CLASS_GRAPH = YES -+COLLABORATION_GRAPH = YES -+UML_LOOK = NO -+TEMPLATE_RELATIONS = NO -+INCLUDE_GRAPH = YES -+INCLUDED_BY_GRAPH = YES -+CALL_GRAPH = NO -+GRAPHICAL_HIERARCHY = YES -+DOT_IMAGE_FORMAT = png -+DOT_PATH = -+DOTFILE_DIRS = -+MAX_DOT_GRAPH_WIDTH = 1024 -+MAX_DOT_GRAPH_HEIGHT = 1024 -+MAX_DOT_GRAPH_DEPTH = 0 -+GENERATE_LEGEND = YES -+DOT_CLEANUP = YES -+#--------------------------------------------------------------------------- -+# Configuration::addtions related to the search engine -+#--------------------------------------------------------------------------- -+SEARCHENGINE = NO -diff -uNr OSG_OP_OT-1.1.orig/debian/osgexamples.1 OSG_OP_OT-1.1/debian/osgexamples.1 ---- OSG_OP_OT-1.1.orig/debian/osgexamples.1 1970-01-01 01:00:00.000000000 +0100 -+++ OSG_OP_OT-1.1/debian/osgexamples.1 2006-08-24 04:55:38.000000000 +0200 -@@ -0,0 +1,28 @@ -+.\" Hey, EMACS: -*- nroff -*- -+.\" First parameter, NAME, should be all caps -+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -+.\" other parameters are allowed: see man(7), man(1) -+.TH OpenSceneGraph 1 "2004" -+.\" Please adjust this date whenever revising the manpage. -+.\" -+.\" Some roff macros, for reference: -+.\" .nh disable hyphenation -+.\" .hy enable hyphenation -+.\" .ad l left justify -+.\" .ad b justify to both left and right margins -+.\" .nf disable filling -+.\" .fi enable filling -+.\" .br insert line break -+.\" .sp insert n+1 empty lines -+.\" for manpage-specific macros, see man(7) -+.SH NAME -+OpenSceneGraph examples \- set of examples program -+.SH SYNOPSIS -+.B program -+.RI --help -+.SH DESCRIPTION -+Use --help to figure out what the example does. -+See http://www.openscenegraph.org/ for more information. -+.SH AUTHOR -+This manual page was written by Loic Dachary -+for the Debian project (but may be used by others). -diff -uNr OSG_OP_OT-1.1.orig/OpenSceneGraph/include/osg/Shader OSG_OP_OT-1.1/OpenSceneGraph/include/osg/Shader ---- OSG_OP_OT-1.1.orig/OpenSceneGraph/include/osg/Shader 2006-07-18 17:21:24.000000000 +0200 -+++ OSG_OP_OT-1.1/OpenSceneGraph/include/osg/Shader 2006-08-24 04:55:38.000000000 +0200 -@@ -39,6 +39,8 @@ - * configuration. - */ - -+class Program; -+ - class OSG_EXPORT Shader : public osg::Object - { - public: -diff -uNr OSG_OP_OT-1.1.orig/OpenSceneGraph/Make/instexamplesrc OSG_OP_OT-1.1/OpenSceneGraph/Make/instexamplesrc ---- OSG_OP_OT-1.1.orig/OpenSceneGraph/Make/instexamplesrc 2003-07-19 19:55:18.000000000 +0200 -+++ OSG_OP_OT-1.1/OpenSceneGraph/Make/instexamplesrc 2006-08-24 04:55:38.000000000 +0200 -@@ -32,7 +32,7 @@ - cd $TOPDIR/examples/$d - [ -d $INST_EXAMPLE_SRC/$d ] || mkdir -m 0755 -p $INST_EXAMPLE_SRC/$d - echo " installing $d" -- for f in `$MAKE __instfiles | grep -v $MAKE` -+ for f in `$MAKE __instfiles | grep -v $MAKE | grep -v Entering | grep -v Leaving` - do - src=`echo $f | cut -f1 -d"="` - dst=`echo $f | cut -f2 -d"="` -diff -uNr OSG_OP_OT-1.1.orig/OpenSceneGraph/Make/libdefs OSG_OP_OT-1.1/OpenSceneGraph/Make/libdefs ---- OSG_OP_OT-1.1.orig/OpenSceneGraph/Make/libdefs 1970-01-01 01:00:00.000000000 +0100 -+++ OSG_OP_OT-1.1/OpenSceneGraph/Make/libdefs 2006-08-24 04:55:38.000000000 +0200 -@@ -0,0 +1,4 @@ -+ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES") -+ LDFLAGS += -Wl,-soname -Wl,$@.$(VERSION_MAJOR) -+endif -+ -diff -uNr OSG_OP_OT-1.1.orig/OpenSceneGraph/Make/makedefs OSG_OP_OT-1.1/OpenSceneGraph/Make/makedefs ---- OSG_OP_OT-1.1.orig/OpenSceneGraph/Make/makedefs 2006-07-18 15:24:00.000000000 +0200 -+++ OSG_OP_OT-1.1/OpenSceneGraph/Make/makedefs 2006-08-24 04:55:38.000000000 +0200 -@@ -352,14 +352,6 @@ - ARCHINST = - endif - else -- --ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES") -- LDFLAGS += -Wl,-soname -Wl,$@.0 --endif -- --# LDFLAGS += `getconf LFS_LDFLAGS` --# DEF += `getconf LFS_CFLAGS` -- - LIBS = -lstdc++ - # DEF += -W -Wall -fPIC -pipe -Woverloaded-virtual - DEF += -W -Wall -fPIC -pipe -diff -uNr OSG_OP_OT-1.1.orig/OpenSceneGraph/Make/makedefs.orig OSG_OP_OT-1.1/OpenSceneGraph/Make/makedefs.orig ---- OSG_OP_OT-1.1.orig/OpenSceneGraph/Make/makedefs.orig 1970-01-01 01:00:00.000000000 +0100 -+++ OSG_OP_OT-1.1/OpenSceneGraph/Make/makedefs.orig 2006-07-18 15:24:00.000000000 +0200 -@@ -0,0 +1,732 @@ -+SHELL = /bin/sh -+OS := $(shell uname) -+ -+## Set up dependencies -+ifneq ("$(OSG_DEPENDENCIES)","") -+ include $(OSG_DEPENDENCIES) -+else -+ include $(TOPDIR)/Make/dependencies -+endif -+ -+## We don't care about architectural distinguishers in the OS -+## such as IRIX64, IRIX32, etc. so we truncate IRIX?? to IRIX -+ifeq ($(findstring IRIX,$(OS)),IRIX) -+OS := IRIX -+endif -+ -+## Make CYGWIN_XXXX CYGWIN so it's "Windows cross platform" :) -+ifeq ($(findstring CYGWIN,$(OS)),CYGWIN) -+OS := CYGWIN -+#OS := MINGW -+endif -+ -+## Make MINGW_XXXX MINGW so it's "Windows cross platform" :) -+ifeq ($(findstring MINGW,$(OS)),MINGW) -+OS := MINGW -+endif -+ -+# TOPDIR needs to be redefined for every GNUmakefile -+TOPDIR ?= ../ -+THISDIR = . -+MAKEDEPEND = ignore -+ -+####################################################################### -+## -+## VERSIONING SEMANTICS -+## -+## Version consistes of . . - -+## Where: -+## major : Production (0 = pre-production) -+## minor : 0-7 = Production minor, 8 = Alpha, 9 = Beta -+## release : Release tag -+## revision: Release revision - 0 = development (cutting edge). -+## -+## Usage: -+## Default - VERSION_REVISION is set to the value defined here -+## Env variable OSG_VERSION_REVISION overrides default -+## e.g.: -+## % setenv OSG_VERSION_REVISION 5 -+## % make version -+## Command line overrides env variable -+## % make VERSION_REVISION= -+####################################################################### -+VERSION_MAJOR = 1 -+VERSION_MINOR = 1 -+VERSION_RELEASE = 0 -+VERSION_REVISION ?= 1 -+ifneq (,$(OSG_VERSION_REVISION)) -+VERSION_REVISION = $(OSG_VERSION_REVISION) -+endif -+VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) -+ -+INC = -I$(TOPDIR)/include -+ -+############################################################################ -+## NOTE - Semantics for the use of ARCH, ARCHARGS, and ARCHINST parameters -+## ARCH - must be defined if the OS supports both 64 and 32 bit -+## architectures may remain undefined if it does not. -+## ARCHARGS - Compiler directives to indicate for which architecture -+## to build for -+## ARCHINST - Installation target directory. Define if the OS supports -+## more than one architecture (32 and 64). -+## for ARCH=32 - define ARCHINST only if the system uses an -+## extension on 'lib' to indicate 32 bit. e.g. -+## IRIX defines /usr/lib32 -+## for ARCH=64 - Always define ARCHINST. Even if the OS -+## doesn't make a distinction, we will. -+############################################################################ -+ -+CXXFLAGS = $(ARCHARGS) $(DOF) $(DEF) $(INC) -+LDFLAGS = $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH) -+OBJS = $(C++FILES:.cpp=.o) \ -+ $(CXXFILES:.cpp=.o) \ -+ $(CFILES:.c=.o) \ -+ -+DOF = $(OPTF) -+DEBUGDIR = $(OS)$(ARCH).Debug -+OPTDIR = $(OS)$(ARCH).Opt -+BININST = bin/$(OS)$(ARCH)/ -+PLUGININST = lib/$(OS)$(ARCH)/osgPlugins -+LIBINST = lib/$(OS)$(ARCH) -+ -+INST_LOCATION ?= /usr/local -+INST_LIBS = $(INST_LOCATION)/lib$(ARCHINST) -+INST_PLUGINS = $(INST_LOCATION)/lib$(ARCHINST)/osgPlugins -+INST_INCLUDE = $(INST_LOCATION)/include -+INST_SHARE = $(INST_LOCATION)/share -+INST_EXAMPLES = $(INST_SHARE)/OpenSceneGraph/bin -+INST_SRC = $(INST_SHARE)/OpenSceneGraph/src -+INST_DOC = $(INST_SHARE)/OpenSceneGraph/doc -+INST_DATA = $(INST_SHARE)/OpenSceneGraph/data -+INST_EXAMPLE_SRC = $(INST_SRC)/examples -+LINK = ln -sf -+INSTBINCMD = install -m 755 -+INSTDEVCMD = install -m 644 -+INSTLINKBINCMD = $(LINK) -+INSTLINKDEVCMD = $(LINK) -+ -+LIB_PREFIX = lib -+LIB_EXT = so -+EXE_EXT = -+ -+PLUGIN_PREFIX = osgdb_ -+WRAPPER_PREFIX = osgwrapper_ -+PLUGIN_EXT = so -+MAKEDIST = echo " === Distribution build is not implemented yet for $(OS)"; printf "\n" -+INSTLOGFILE = /tmp/.osg_inst_log -+ -+ifneq ("$(OPENTHREADS_INC_DIR)","") -+INC += -I$(OPENTHREADS_INC_DIR) -+endif -+ -+ifneq ("$(OPENTHREADS_LIB_DIR)","") -+LDFLAGS += -L$(OPENTHREADS_LIB_DIR) -+endif -+ -+ifneq ("$(PRODUCER_INC_DIR)","") -+INC += -I$(PRODUCER_INC_DIR) -+endif -+ -+ifneq ("$(PRODUCER_LIB_DIR)","") -+LDFLAGS += -L$(PRODUCER_LIB_DIR) -+endif -+ -+ -+RECURSIVE_TARGETS = \ -+ opt \ -+ debug \ -+ static \ -+ staticdebug \ -+ clean \ -+ cleandepend \ -+ cleandependopt \ -+ cleandependdbg \ -+ cleandbg \ -+ cleanopt \ -+ cleantarget \ -+ cleantargetopt \ -+ cleantargetdbg \ -+ clobber \ -+ clobberdbg \ -+ clobberopt \ -+ beautify \ -+ docs \ -+ depend \ -+ -+STATICLIB = $(LIB:.$(LIB_EXT)=.a) -+STATICPLUGIN = $(PLUGIN:.$(PLUGIN_EXT)=.a) -+ -+#### SUN OS Specific definitions -+ifeq ($(OS),SunOS) -+ -+ #### if using g++ on a sun -+ ifeq ($(COMPILER),gnu) -+ C++ = g++ -+ DEPARG = -M -+ INC += -+ DEF += -W -Wall -fPIC -fpermissive -+ OPTF = -O2 -+ DBGF = -g -DOSG_COMPILE_UNIT_TESTS -+ SHARED = -shared -fPIC -+ ARCH = 32 -+ ifeq ($(ARCH),64) -+ ARCHARGS = -m64 -DARCH64 -+ ARCHINST = 64 -+ else -+ ARCHARGS = -+ endif -+ GIF_LIBS = -lgif -+ TIFF_LIB = -ltiff -+ JPEG_LIBS = -ljpeg -+ PNG_LIBS = -lpng -lz -+ OTHER_LIBS = -lOpenThreads -+ -+ #### using forte compilers (default) -+ else -+ C++ = CC -+ DEPARG = -xM1 -+ INC += -+ DEF += -features=extensions -w -mt -KPIC -+ OPTF = -xO4 -+ DBGF = -g -DOSG_COMPILE_UNIT_TESTS -+ SHARED = -G -+ ARCH = 32 -+ ifeq ($(ARCH),64) -+ ARCHARGS = -xarch=v9 -DARCH64 -+ ARCHINST = 64 -+ else -+ ARCHARGS = -+ ARCHINST = -+ endif -+ OTHER_LIBS = -lCstd -lOpenThreads -+ LINKARGS = -mt -+ GIF_LIBS = /usr/local/lib/libgif.a -+ TIFF_LIB = /usr/local/lib/libtiff.a -+ JPEG_INCLUDE = -I/usr/local/include -+ JPEG_LIBS = /usr/local/lib/libjpeg.a -+ PNG_LIBS = /usr/local/lib/libpng.a /usr/local/lib/libz.a -+ endif -+ -+ DYNAMICLIBRARYLIB = -ldl -+ OSG_LIBS = -losgGA -losgDB -losgUtil -losg -+ GL_LIBS = -lGLU -lGL -+ GLUT_LIBS = -lglut -+ X_INC = -I/usr/X11R6/include -+ X_LIBS = -lXext -lXmu -lXi -lX11 -+ SOCKET_LIBS = -lsocket -lnsl -+ INSTBINCMD = cp -+ INSTDEVCMD = cp -+ INST_LOCATION ?= /opt/OpenSceneGraph -+ MAKEDIST = $(TOPDIR)/Make/makepkg -+ OTHER_LIBS = -lOpenThreads -+ -+ FREETYPE_INCLUDE = `freetype-config --cflags` -+ FREETYPE_LIB = `freetype-config --libs` -+ -+ GDAL_INCLUDES = `gdal-config --cflags` -+ GDAL_LIBS = `gdal-config --libs` -+ -+ XINE_INCLUDES = `xine-config --cflags` -+ XINE_LIBS = `xine-config --libs` -+ -+endif -+ -+#### IRIX Specific definitions -+ifeq ($(OS),IRIX) -+ CXX = CC -+ ifeq ($(CXX),CC) -+ LINKARGS = -L${TOPDIR}/$(LIBINST) -LANG:std -OPT:Olimit=0 -+ C++ = CC -+ DEPARG = -M -+ INC += -I${TOPDIR}/include -I/usr/freeware/include -+ LDFLAGS += -L/usr/local/lib -+ DEF += -LANG:std -OPT:Olimit=0 \ -+ -DEBUG:woff=1681 -DEBUG:woff=1682 -DEBUG:woff=3303 \ -+ -MDupdate $(MAKEDEPEND) -+ OPTF = -O2 -+ DBGF = -g -DOSG_COMPILE_UNIT_TESTS -+ SHARED = -shared -+ PFLIBS = \ -+ -lpf3ds -lpfdem -lpfdted -lpfdwb -lpfdxf -lpfevt \ -+ -lpfflt -lpfgds -lpfgfo -lpfim -lpflsa -lpflsb \ -+ -lpfnff -lpfobj -lpfpegg -lpfpfb -lpfphd -lpfpts \ -+ -lpfrot -lpfscale -lpfsgf -lpfsgo -lpfsphere -lpfsv \ -+ -lpftri -lpfunc -lpfvct -lpfdu -lpfutil -lpf -all -limage -+ ARCH = 32 -+ ifeq ($(ARCH),64) -+ ARCHARGS = -64 -DARCH64 -+ ARCHINST = 64 -+ LINKARGS += -L/usr/freeware/lib64 -+ PF_XTRA_LIBS = -L/usr/lib64/libpfdb -rpath /usr/lib64/libpfdb \ -+ $(PFLIBS) -+ else -+ ARCHARGS = -n32 -+ ARCHINST = 32 -+ LINKARGS += -L/usr/freeware/lib32 -+ PF_XTRA_LIBS = -L/usr/lib32/libpfdb -rpath /usr/lib32/libpfdb \ -+ $(PFLIBS) -+ endif -+ else -+ LIBS = -lstdc++ -+ LINKARGS = -L${TOPDIR}/$(LIBINST) -+ C++ = g++ -+ INC += -I${TOPDIR}/include -I/usr/freeware/include -+ DEF += -fPIC -W -Wno-unused -+ OPTF = -O2 -+ DBGF = -g -gstabs+ -DOSG_COMPILE_UNIT_TESTS -+ SHARED = -shared -+ PFLIBS = \ -+ -lpf3ds -lpfdem -lpfdted -lpfdwb -lpfdxf -lpfevt \ -+ -lpfflt -lpfgds -lpfgfo -lpfim -lpflsa -lpflsb \ -+ -lpfnff -lpfobj -lpfpegg -lpfpfb -lpfphd -lpfpts \ -+ -lpfrot -lpfscale -lpfsgf -lpfsgo -lpfsphere -lpfsv \ -+ -lpftri -lpfunc -lpfvct -lpfdu -lpfutil -lpf -all -limage -+ ARCH = 32 -+ ifeq ($(ARCH),64) -+ ARCHARGS = -mabi=64 -mips4 -DARCH64 -+ ARCHINST = 64 -+ LINKARGS += -L/usr/freeware/lib64 -+ PF_XTRA_LIBS = -L/usr/lib64/libpfdb -rpath /usr/lib64/libpfdb \ -+ $(PFLIBS) -+ else -+ ARCHARGS = -mabi=n32 -mips4 -+ ARCHINST = 32 -+ LINKARGS += -L/usr/freeware/lib32 -+ PF_XTRA_LIBS = -L/usr/lib32/libpfdb -rpath /usr/lib32/libpfdb \ -+ $(PFLIBS) -+ endif -+ endif -+ -+ DYNAMICLIBRARYLIB = -+ OSG_LIBS = -losgGA -losgDB -losgUtil -losg -+ GL_LIBS = -lGLU -lGL -+ GLUT_LIBS = -lglut -+ X_INC = -I/usr/X11R6/include -+ X_LIBS = -lXext -lXi -lXmu -lX11 -+ SOCKET_LIBS = -+ OTHER_LIBS = -lm -lOpenThreads -+ PNG_LIBS = -lpng -+ JPEG_LIBS = -ljpeg -+ TIFF_LIB = -ltiff -+ GIF_LIBS = -lungif -+ MAKEDIST = $(TOPDIR)/Make/makeirixdist -+ -+ FREETYPE_INCLUDE = `freetype-config --cflags` -+ FREETYPE_LIB = `freetype-config --libs` -+ -+ GDAL_INCLUDES = `gdal-config --cflags` -+ GDAL_LIBS = `gdal-config --libs` -+ -+ XINE_INCLUDES = `xine-config --cflags` -+ XINE_LIBS = `xine-config --libs` -+ -+endif -+ -+#### Linux specific definitions -+ -+ifeq ($(OS),Linux) -+ -+ ifeq (x$(CXX),x) -+ C++ = g++ -+ else -+ C++ = $(CXX) -+ endif -+ -+ DEPARG = -M -+ INC += -+ -+ ifeq ($(COMPILER),intel) -+ C++ = icpc -+ LIBS = -lgcc_s -+ DEF += -fPIC -x c++ -cxxlib-gcc -gcc-version=323 -+ OPTF = -O2 -+ DBGF = -g -DOSG_COMPILE_UNIT_TESTS -+ LDFLAGS += -L/usr/X11R6/lib64 -+ ifeq ($(SYSARCH),ia64) -+ ARCHARGS = -+ ARCH = IA64 -+ ARCHINST = IA64 -+ else -+ ARCHARGS = -+ ARCH = 32 -+ ARCHINST = -+ endif -+ else -+ -+ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES") -+ LDFLAGS += -Wl,-soname -Wl,$@.0 -+endif -+ -+# LDFLAGS += `getconf LFS_LDFLAGS` -+# DEF += `getconf LFS_CFLAGS` -+ -+ LIBS = -lstdc++ -+# DEF += -W -Wall -fPIC -pipe -Woverloaded-virtual -+ DEF += -W -Wall -fPIC -pipe -+ OPTF = -O2 -+ DBGF = -g -gstabs+ -DOSG_COMPILE_UNIT_TESTS -+ SYSARCH := $(shell arch) -+ ifeq ($(SYSARCH),x86_64) -+ ARCHARGS = -+ ARCH = 64 -+ ARCHINST = 64 -+ else -+ ARCHARGS = -+ ARCH = 32 -+ ARCHINST = -+ endif -+ endif -+ -+ SHARED = -shared -+ ifeq ($(SYSARCH),x86_64) -+ LINKARGS = -L/usr/X11R6/lib64 -+ else -+ LINKARGS = -L/usr/X11R6/lib -+ endif -+ DYNAMICLIBRARYLIB = -ldl -+ OSG_LIBS = -losgGA -losgDB -losgUtil -losg -+ GL_LIBS = -lGLU -lGL -+ GLUT_LIBS = -lglut -+ X_INC = -I/usr/X11R6/include -+ X_LIBS = -lXi -lXmu -lX11 -+ PF_XTRA_LIBS = -L/usr/lib/libpfdb -Xlinker -rpath /usr/lib/libpfdb \ -+ -lpfdu -lpfutil -lpf -+ SOCKET_LIBS = -+ OTHER_LIBS = -lOpenThreads -+ PNG_LIBS = -lpng -+ JPEG_LIBS = -ljpeg -+ TIFF_LIB = -ltiff -+ GIF_LIBS = -lungif -+ MAKEDIST = $(TOPDIR)/Make/makerpms -+ -+ ifeq ("$(PROFILER)","gprof") -+ DEF += -pg -+ endif -+ -+ ifeq ("$(PROFILER)","FunctionCheck") -+ DEF += -finstrument-functions -+ OTHER_LIBS += -lfnccheck -+ endif -+ -+ FREETYPE_INCLUDE = `freetype-config --cflags` -+ FREETYPE_LIB = `freetype-config --libs` -+ -+ GDAL_INCLUDES = `gdal-config --cflags` -+ GDAL_LIBS = `gdal-config --libs` -+ -+ XINE_INCLUDES = `xine-config --cflags` -+ XINE_LIBS = `xine-config --libs` -+ -+endif -+ -+#### FreeBSD specific definitions -+ifeq ($(OS),FreeBSD) -+ SYSARCH := $(shell uname -p) -+ ifeq (x$(CXX),x) -+ C++ = g++ -+ else -+ C++ = $(CXX) -+ endif -+ ifeq (x$(PTHREAD_CFLAGS),x) -+ PTHREAD_CFLAGS = -pthread -+ endif -+ ifeq (x$(PTHREAD_LIBS),x) -+ PTHREAD_LIBS = -pthread -+ endif -+ ifeq (x$(ARCH),x) -+ ARCH = $(SYSARCH) -+ endif -+ DEPARG = -MM -+ INC += -I/usr/local/include -I/usr/X11R6/include -+ DEF += -W -Wall $(PTHREAD_CFLAGS) -+ OPTF = -O2 -+ DBGF = -g -DOSG_COMPILE_UNIT_TESTS -+ SHARED = -shared -+ ifeq ($(SYSARCH),amd64) -+ ARCHARGS = -fPIC -+ ARCHINST = -+ else -+ ARCHARGS = -+ ARCHINST = -+ endif -+ LINKARGS = -L/usr/X11R6/lib -L/usr/local/lib -rpath /usr/local/lib $(PTHREAD_CFLAGS) -+ DYNAMICLIBRARYLIB = -+ OSG_LIBS = -losgGA -losgDB -losgUtil -losg -+ GL_LIBS = -lGLU -lGL -+ GLUT_LIBS = -lglut -+ X_INC = -I/usr/X11R6/include -+ X_LIBS = -lXmu -lX11 -+ SOCKET_LIBS = -+ OTHER_LIBS = -lOpenThreads -+ PNG_LIBS = -lpng -+ JPEG_LIBS = -ljpeg -+ TIFF_LIB = -ltiff -+ GIF_LIBS = -lungif -+ -+ FREETYPE_INCLUDE = `freetype-config --cflags` -+ FREETYPE_LIB = `freetype-config --libs` -+ -+ GDAL_INCLUDES = `gdal-config --cflags` -+ GDAL_LIBS = `gdal-config --libs` -+ -+ XINE_INCLUDES = `xine-config --cflags` -+ XINE_LIBS = `xine-config --libs` -+ -+endif -+ -+#### MacOS X specific definitions -+ifeq ($(OS),Darwin) -+ ifeq (x$(CXX),x) -+ C++ = g++ -+ else -+ C++ = $(CXX) -+ endif -+ -+ #### Default to AGL? Will try it temporary while waiting for feedback -+ USE_AGL ?= yes -+ -+ FINC += -F/System/Library/Frameworks -+ -+ ifeq ($(USE_AGL),yes) -+ -+ DEF += -D__USE_OSX_AGL_IMPLEMENTATION__ -+ INC += $(FINC) -+ LDFLAGS += $(FINC) -+ X_INC = -+ X_LIBS = -+ -+ else -+ ifeq ($(USE_CGL),yes) -+ -+ DEF += -D__USE_OSX_CGL_IMPLEMENTATION__ -+ INC += $(FINC) -+ LDFLAGS += $(FINC) -+ X_INC = -+ X_LIBS = -+ -+ else -+ -+ INC += $(FINC) -I$(SDKPATH)/usr/X11R6/include -+ LDFLAGS += $(FINC) -L$(SDKPATH)/usr/include -L$(SDKPATH)/usr/X11R6/lib -L/sw/lib -+ X_INC = -I$(SDKPATH)/usr/X11R6/include -+ X_LIBS = -lX11 -+ -+ endif -+ endif -+ -+ DEF += -Wall -+ OPTF = -O2 -+ DBGF = -g -DOSG_COMPILE_UNIT_TESTS -+ DEPARG = -M $(DEF) -+ SHARED = -dynamic -+ ARCH = 32 -+ ARCHINST = -+ ARCHARGS = -+ LINKARGS = -+ DYNAMICLIBRARYLIB = -+ OSG_LIBS = -losgGA -losgDB -losgUtil -losg -+ CARBON_LIB = -framework Carbon -+ GL_LIBS = -framework OpenGL $(CARBON_LIB) -+ GLUT_LIBS = -framework GLUT -+ SOCKET_LIBS = -+ OTHER_LIBS = -lm -lstdc++ -lobjc -lOpenThreads -+ LIB_EXT = dylib -+ LIBVERSION = -current_version $(VERSION) \ -+ -compatibility_version \ -+ $(VERSION_MAJOR).$(VERSION_MINOR).0 -+ -+ ifeq ($(DARWIN_QUICKTIME),yes) -+ DEF += -DDARWIN_QUICKTIME -+ endif -+ -+ QUICKTIME = -framework QuickTime $(CARBON_LIB) -+ PNG_LIBS = -lpng -lz -+ JPEG_LIBS = -ljpeg -+ GIF_LIBS = -lungif -+ TIFF_LIB = -ltiff -lz -ljpeg -+ -+# FREETYPE_INCLUDE = `freetype-config --cflags` -+# FREETYPE_LIB = `freetype-config --libs` -+ -+ FREETYPE_INCLUDE = -I$(SDKPATH)/usr/X11R6/include -I$(SDKPATH)/usr/X11R6/include/freetype2 -+ FREETYPE_LIB = -L$(SDKPATH)/usr/X11R6/lib -lfreetype -+ -+ GDAL_INCLUDES = `gdal-config --cflags` -+ GDAL_LIBS = `gdal-config --libs` -+ -+ XINE_INCLUDES = `xine-config --cflags` -+ XINE_LIBS = `xine-config --libs` -+ -+endif -+ -+#### Cygwin specific definitions -+ifeq ($(OS),CYGWIN) -+ C++ = c++ -+ DEPARG = -M -DWIN32 -+ INC += -+ LIB = -+ DEF += -DWIN32 -W -Wall -DNOMINMAX -+ OPTF = -O2 -+ DBGF = -g -DOSG_COMPILE_UNIT_TESTS -+ SHARED = -shared \ -+ -Wl,--out-implib,lib$(TARGET_BASENAME).dll.a \ -+ -Wl,--export-all-symbols -+ -+ EXE_EXT =.exe -+ ARCH = 32 -+ ARCHINST = -+ ARCHARGS = -+ LINKARGS = -W -Wall -+ DYNAMICLIBRARYLIB = -+ OSG_LIBS = -losgGA -losgDB -losgUtil -losg -+ GL_LIBS = -lglu32 -lopengl32 -+ GLUT_LIBS = -lglut -+ X_INC = -+ X_LIBS = -lgdi32 -luser32 -+ SOCKET_LIBS = -+ OTHER_LIBS = -lOpenThreads -+ PNG_LIBS = -lpng -lz -+ JPEG_LIBS = -L/usr/local/lib -ljpeg -+ GIF_LIBS = -lungif -+ TIFF_LIB = -ltiff -lz -ljpeg -+ -+ FREETYPE_INCLUDE = `freetype-config --cflags` -+ FREETYPE_LIB = `freetype-config --libs` -+ -+ GDAL_INCLUDES = `gdal-config --cflags` -+ GDAL_LIBS = `gdal-config --libs` -+ GDAL_LIBS += `gdal-config --dep-libs` -+ -+ XINE_INCLUDES = `xine-config --cflags` -+ XINE_LIBS = `xine-config --libs` -+ -+ LIBINST = bin/$(OS)$(ARCH) -+ IMP_LIBINST = lib/$(OS)$(ARCH) -+ PLUGININST = bin/$(OS)$(ARCH)/osgPlugins -+ IMP_PLUGININST = lib/$(OS)$(ARCH)/osgPlugins -+ -+ LIB_PREFIX = cyg -+ LIB_EXT = dll -+ IMP_LIB_EXT = dll.a -+ PLUGIN_EXT = dll -+ LINK = cp -f -+ INST_LOCATION = /usr/local/OpenSceneGraph -+ INST_INCLUDE = $(INST_LOCATION)/include -+ INST_SHARE_PREFIX = $(INST_LOCATION) -+ INST_SRC = $(INST_SHARE_PREFIX)/src -+ INST_EXAMPLES = $(INST_SHARE_PREFIX)/bin -+ INST_EXAMPLE_SRC = $(INST_SHARE_PREFIX)/src/demos -+ INST_DOC = $(INST_SHARE_PREFIX)/doc -+ INST_DATA = $(INST_SHARE_PREFIX)/data -+ MAKEDIST = $(TOPDIR)/Make/makeinnosetup -+endif -+ -+#### Mingw specific definitions -+ifeq ($(OS),MINGW) -+ C++ = c++ -mthreads -+# -fomit-frame-pointer -march=pentium3 -msse -mmmx -mfpmath=sse -+ DEPARG = -M -+ INC += -+ DEF += -DWIN32 -Wall -+# -W -+ OPTF = -O2 -+ DBGF = -g -DOSG_COMPILE_UNIT_TESTS -+ SHARED = -shared -mthreads \ -+ -Wl,--out-implib,lib$(TARGET_BASENAME).dll.a \ -+ -Wl,--export-all-symbols -+ -+ EXE_EXT =.exe -+ ARCH = -+ ARCHINST = -+ ARCHARGS = -+ LINKARGS = -W -Wall -+ DYNAMICLIBRARYLIB = -+ OSG_LIBS = -losgGA -losgDB -losgUtil -losg -+ GL_LIBS = -lglu32 -lopengl32 -+ GLUT_LIBS = -lglut -+ X_INC = -+ X_LIBS = -lgdi32 -luser32 -+ SOCKET_LIBS = -lws2_32 -+ OTHER_LIBS = -lOpenThreads -+ PNG_LIBS = -lpng -lz -+ JPEG_LIBS = -ljpeg -+ GIF_LIBS = -lungif -+ TIFF_LIB = -ltiff -lz -ljpeg -+ -+ FREETYPE_INCLUDE = `freetype-config --cflags` -+ FREETYPE_LIB = `freetype-config --libs` -+ -+ GDAL_INCLUDES = -+ GDAL_LIBS = -lgdal -ljpeg -lgeotiff -ltiff -lpng -lz -+ -+ XINE_INCLUDES = `xine-config --cflags` -+ XINE_LIBS = `xine-config --libs` -+ -+ LIBINST = bin/$(OS)$(ARCH) -+ IMP_LIBINST = lib/$(OS)$(ARCH) -+ PLUGININST = bin/$(OS)$(ARCH)/osgPlugins -+ IMP_PLUGININST = lib/$(OS)$(ARCH)/osgPlugins -+ -+ LIB_PREFIX = lib -+ LIB_EXT = dll -+ IMP_LIB_EXT = dll.a -+ PLUGIN_EXT = dll -+ LINK = cp -f -+ INST_LOCATION = /usr/local/OpenSceneGraph -+ INST_INCLUDE = $(INST_LOCATION)/include -+ INST_SHARE_PREFIX = $(INST_LOCATION) -+ INST_SRC = $(INST_SHARE_PREFIX)/src -+ INST_EXAMPLES = $(INST_SHARE_PREFIX)/bin -+ INST_EXAMPLE_SRC = $(INST_SHARE_PREFIX)/src/examples -+ INST_DOC = $(INST_SHARE_PREFIX)/doc -+ INST_DATA = $(INST_SHARE_PREFIX)/data -+endif -+ -+#### HP-UX Specific definitions -+# contributed by tino.schwarze@informatik.tu-chemnitz.de -+# replaced by Olaf Flebb for use with aCC compiler -+ -+ifeq ($(OS),HP-UX) -+ CXX = aCC -AA -mt -+ C++ = $(CXX) -+ DEPARG = -w +make -E -+ INC += -I/opt/graphics/OpenGL/include -I/usr/contrib/X11R6/include -D_LARGEFILE64_SOURCE -D_XOPEN_SOURCE_EXTENDED -+ DEF += +Z -z -+ OPTF = +O2 -+ DBGF = -g -+ SHARED = -b +Z -z -Wl,+s -+ ARCH = 32 -+ LDFLAGS += -L/opt/graphics/OpenGL/lib -L/usr/contrib/X11R6/lib/ -+ LINKARGS = -lpthread -+ LIB_EXT = sl -+ PLUGIN_EXT = sl -+ DYNAMICLIBRARYLIB = -ldld -+ -+ -+ OSG_LIBS = -losgGA -losgDB -losgUtil -losg -+ GL_LIBS = -L/opt/graphics/OpenGL/lib -lGLU -lGL -+ GLUT_LIBS = -lglut -+ X_INC = -I/usr/X11R6/include -+ X_LIBS = -L/usr/lib/X11R6 -lXext -lXi -lX11 -+ SOCKET_LIBS = -+ OTHER_LIBS = -lm -lOpenThreads -+ PNG_INCLUDE = -I/usr/local/include/libpng -I/usr/local/include/ -+ PNG_LIBS = -L/usr/local/lib -lpng -lz -+ JPEG_INCLUDE = -I/usr/local/include -+ JPEG_LIBS = -L/usr/local/lib -ljpeg -+ TIFF_INCLUDE = -I/usr/local/include -+ TIFF_LIB = -L/usr/local/lib -ltiff -+ GIF_INCLUDE = -I/opt/libungif/include -+ GIF_LIBS = -L/opt/libungif/lib -lungif -+ -+ FREETYPE_INCLUDE = `freetype-config --cflags` -+ FREETYPE_LIB = `freetype-config --libs` -+ -+ GDAL_INCLUDES = `gdal-config --cflags` -+ GDAL_LIBS = `gdal-config --libs` -+ -+endif -+ -+ -+VPATH=.. -+ -diff -uNr OSG_OP_OT-1.1.orig/OpenSceneGraph/src/osgPlugins/gif/GNUmakefile OSG_OP_OT-1.1/OpenSceneGraph/src/osgPlugins/gif/GNUmakefile ---- OSG_OP_OT-1.1.orig/OpenSceneGraph/src/osgPlugins/gif/GNUmakefile 2003-03-12 11:39:36.000000000 +0100 -+++ OSG_OP_OT-1.1/OpenSceneGraph/src/osgPlugins/gif/GNUmakefile 2006-08-24 04:55:38.000000000 +0200 -@@ -5,15 +5,7 @@ - ReaderWriterGIF.cpp\ - - --ifeq ($(OS),HP-UX) - INC += $(GIF_INCLUDE) --else --INC += -I/usr/local/include\ -- -I/usr/freeware/include\ -- --LINKARGS += -L/usr/freeware/lib$(ARCH) --endif -- - - LIBS += $(OSG_LIBS) $(GIF_LIBS) $(OTHER_LIBS) - -diff -uNr OSG_OP_OT-1.1.orig/OpenSceneGraph/src/osgPlugins/png/GNUmakefile OSG_OP_OT-1.1/OpenSceneGraph/src/osgPlugins/png/GNUmakefile ---- OSG_OP_OT-1.1.orig/OpenSceneGraph/src/osgPlugins/png/GNUmakefile 2003-03-12 11:39:38.000000000 +0100 -+++ OSG_OP_OT-1.1/OpenSceneGraph/src/osgPlugins/png/GNUmakefile 2006-08-24 04:55:38.000000000 +0200 -@@ -5,14 +5,7 @@ - ReaderWriterPNG.cpp\ - - LIBS += $(OSG_LIBS) $(PNG_LIBS) $(OTHER_LIBS) --ifneq ($(OS),HP-UX) --INC += -I/usr/local/include\ -- -I/usr/freeware/include\ -- --LINKARGS += -L/usr/freeware/lib$(ARCH) --else - INC += $(PNG_INCLUDE) --endif - - TARGET_BASENAME = png - include $(TOPDIR)/Make/cygwin_plugin_def -diff -uNr OSG_OP_OT-1.1.orig/OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile OSG_OP_OT-1.1/OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile ---- OSG_OP_OT-1.1.orig/OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile 2003-03-12 11:39:39.000000000 +0100 -+++ OSG_OP_OT-1.1/OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile 2006-08-24 04:55:38.000000000 +0200 -@@ -6,12 +6,7 @@ - - LIBS += $(OSG_LIBS) $(TIFF_LIB) $(OTHER_LIBS) - --ifeq ($(OS),HP-UX) - INC += $(TIFF_INCLUDE) --else --INC += -I/usr/local/include --LDFLAGS += -L/usr/local/lib --endif - - TARGET_BASENAME = tiff - include $(TOPDIR)/Make/cygwin_plugin_def -diff -uNr OSG_OP_OT-1.1.orig/OpenThreads/Make/libdefs OSG_OP_OT-1.1/OpenThreads/Make/libdefs ---- OSG_OP_OT-1.1.orig/OpenThreads/Make/libdefs 1970-01-01 01:00:00.000000000 +0100 -+++ OSG_OP_OT-1.1/OpenThreads/Make/libdefs 2006-08-24 04:55:38.000000000 +0200 -@@ -0,0 +1,3 @@ -+ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES") -+ LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).$(VERSION_MAJOR) -+endif -diff -uNr OSG_OP_OT-1.1.orig/OpenThreads/Make/makedefs OSG_OP_OT-1.1/OpenThreads/Make/makedefs ---- OSG_OP_OT-1.1.orig/OpenThreads/Make/makedefs 2006-07-18 15:25:58.000000000 +0200 -+++ OSG_OP_OT-1.1/OpenThreads/Make/makedefs 2006-08-24 04:55:38.000000000 +0200 -@@ -227,12 +227,6 @@ - ifeq (x$(CXX),x) - CXX = g++ - endif -- --ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES") -- LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).0 --endif -- -- ###DEF += -fPIC - OPTF = -O2 - DBGF = -ggdb -gstabs - ifeq ($(SYSARCH),x86_64) -diff -uNr OSG_OP_OT-1.1.orig/OpenThreads/Make/makedefs.orig OSG_OP_OT-1.1/OpenThreads/Make/makedefs.orig ---- OSG_OP_OT-1.1.orig/OpenThreads/Make/makedefs.orig 1970-01-01 01:00:00.000000000 +0100 -+++ OSG_OP_OT-1.1/OpenThreads/Make/makedefs.orig 2006-07-18 15:25:58.000000000 +0200 -@@ -0,0 +1,423 @@ -+SHELL = /bin/sh -+OS := $(shell uname) -+ -+## We don't care about architectural distinguishers in the OS -+## such as IRIX64, IRIX32, etc. so we truncate IRIX?? to IRIX -+ifeq ($(findstring IRIX,$(OS)),IRIX) -+OS := IRIX -+endif -+ -+## Make CYGWIN_XXXX CYGWIN so it's "Windows cross platform" :) -+ifeq ($(findstring CYGWIN,$(OS)),CYGWIN) -+OS := CYGWIN -+#OS := MINGW -+endif -+ -+## Make MINGW_XXXX MINGW so it's "Windows cross platform" :) -+ifeq ($(findstring MINGW,$(OS)),MINGW) -+OS := MINGW -+endif -+ -+# TOPDIR needs to be redefined for every GNUmakefile -+TOPDIR ?= ../ -+THISDIR = . -+MAKEFILE = GNUmakefile -+MAKEDEPEND = ignore -+ -+####################################################################### -+## -+## VERSIONING SEMANTICS -+## -+## Version consistes of . . - -+## Where: -+## major : Production (0 = pre-production) -+## minor : 0-7 = Production minor, 8 = Alpha, 9 = Beta -+## release : Release tag -+## revision: Release revision - 0 = development (cutting edge). -+## -+## Usage: -+## Default - VERSION_REVISION is set to the value defined here -+## Env variable OPENTHREADS_VERSION_REVISION overrides default -+## e.g.: -+## % setenv OPENTHREADS_VERSION_REVISION 5 -+## % make version -+## Command line overrides env variable -+## % make VERSION_REVISION= -+####################################################################### -+VERSION_MAJOR = 1 -+VERSION_MINOR = 4 -+VERSION_RELEASE = 3 -+VERSION_REVISION ?= 1 -+ifneq (,$(OPENTHREADS_VERSION_REVISION)) -+VERSION_REVISION = $(OPENTHREADS_VERSION_REVISION) -+endif -+VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) -+ -+ -+DEF = -DOPENTHREADS_VERSION=\"$(VERSION)\" \ -+ -DOPENTHREADS_VERSION_REVISION="$(VERSION_REVISION)" -+# -DGLX_GLXEXT_PROTOTYPES -+ -+ALLOW_PRIORITY_SCHEDULING = 0; -+ifeq ($(ALLOW_PRIORITY_SCHEDULING),1) -+ DEF += -DALLOW_PRIORITY_SCHEDULING -+endif -+ -+STATICLIB_EXT = a -+STATICLIB = $(LIB).$(STATICLIB_EXT) -+ -+INC = -I$(TOPDIR)/include -+ -+CXXFLAGS = $(ARCHARGS) $(DOF) $(DEF) $(INC) -+LDFLAGS = $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH) -+OBJS = $(CXXFILES:.cpp=.o) \ -+ $(C++FILES:.c++=.o) \ -+ $(CFILES:.c=.o) \ -+ $(YACCFILES:.y=.o) \ -+ $(LEXFILES:.l=.o) -+ -+EXE_EXT = -+ -+DOF = $(OPTF) -+DEBUGDIR = $(OS)$(ARCH).Debug -+OPTDIR = $(OS)$(ARCH).Opt -+BININST = bin/$(OS)$(ARCH) -+LIBINST = lib/$(OS)$(ARCH) -+IMP_LIBINST = lib/$(OS)$(ARCH) -+ -+INST_LOCATION = /usr/local -+INST_LIBS = $(INST_LOCATION)/lib$(ARCH_EXT) -+INST_INCLUDE = $(INST_LOCATION)/include -+INST_SHARE = $(INST_LOCATION)/share -+INST_DEMOS = $(INST_LOCATION)/OpenThreads/bin -+INST_SRC = $(INST_LOCATION)/OpenThreads/src -+INST_DOC = $(INST_LOCATION)/OpenThreads/doc -+INST_DATA = $(INST_SHARE)/OpenThreads/data -+INST_DEMO_SRC = $(INST_SRC)/demos -+ -+LINK = ln -sf -+INSTXCMD = install -m 755 -+INSTRCMD = install -m 644 -+INSTLINKCMD = $(LINK) -+ -+LIB_PREFIX = lib -+LIB_EXT = so -+ -+MAKEDIST = echo " === Distribution build is not implemented yet for $(OS)"; printf "\n" -+INSTLOGFILE = /tmp/.openThreads_inst_log -+ -+YFLAGS = -d -+ -+RECURSIVE_TARGETS = \ -+ opt \ -+ debug \ -+ static \ -+ staticdebug \ -+ clean \ -+ cleandepend \ -+ cleandependopt \ -+ cleandependdbg \ -+ cleandbg \ -+ cleanopt \ -+ cleantarget \ -+ cleantargetopt \ -+ cleantargetdbg \ -+ clobber \ -+ clobberdbg \ -+ clobberopt \ -+ beautify \ -+ docs \ -+ depend \ -+ -+ -+ifeq ($(USE_OPEN_THREAD),1) -+DEF += -D_USE_OPEN_THREAD -+INC += $(INC_OPEN_THREAD) -+LDFLAGS += $(LIB_OPEN_THREAD) -+OPEN_THREAD_LIB = -lOpenThreads -+else -+PTHREAD_LIB = -lpthread -+endif -+ -+#### SUN OS Specific definitions -+ifeq ($(OS),SunOS) -+ -+ ARCH = 32 -+ -+#### if using g++ on a sun -+ ifeq ($(COMPILER),gnu) -+ ifeq (x$(CXX),x) -+ CXX = g++ -+ endif -+ INC += -+ DEPARG = -M -+ DEF += -W -Wall -fPIC -fpermissive -+ OPTF = -O3 -+ DBGF = -g -+ SHARED = -shared -fPIC -+ ifeq ($(ARCH),64) -+ ARCHARGS = -m64 -+ else -+ ARCHARGS = -+ endif -+#### using forte compilers (default) -+ else -+ CXX = CC -+ INC += -+ DEPARG = -xM1 -+ DEF += -features=extensions -mt -KPIC -+ OPTF = -xO4 -+ DBGF = -g -+ SHARED = -G -+ ifeq ($(ARCH),64) -+ ARCHARGS = -xarch=v9 -+ else -+ ARCHARGS = -+ endif -+ endif -+ LINKARGS = -mt -+ INSTXCMD = cp -+ INSTRCMD = cp -+ INST_LOCATION = /opt/OpenThreads -+ INST_LIBS = $(INST_LOCATION)/lib$(ARCH_EXT) -+ INST_INCLUDE = $(INST_LOCATION)/include -+ MAKEDIST = $(TOPDIR)/Make/makepkg -+endif -+ -+#### IRIX Specific definitions -+ifeq ($(OS),IRIX) -+ -+ CXX = CC -+ DEPARG = -M -+ INC += -I${TOPDIR}/include -+ DEF += -LANG:std -OPT:Olimit=0 \ -+ -DEBUG:woff=1682 -DEBUG:woff=3303 \ -+ -MDupdate $(MAKEDEPEND) \ -+ OPTF = -O2 -+ DBGF = -g -+ SHARED = -shared -+ ARCH = 32 -+ifeq ($(ARCH),64) -+ ARCHARGS = -64 -+else -+ ARCHARGS = -n32 -+endif -+ ARCH_EXT = $(ARCH) -+ LINKARGS = -L${TOPDIR}/lib -LANG:std -OPT:Olimit=0 -+ INSTXCMD = cp -+ INSTRCMD = cp -+endif -+ -+#### Linux specific definitions -+ -+ifeq ($(OS),Linux) -+SYSARCH := $(shell arch) -+ ifeq ($(COMPILER),intel) -+ CXX = icpc -+ CXXFLAGS += -x c++ -cxxlib-gcc -gcc-version=323 -+ DEF += -fPIC -+ OPTF = -O2 -+ DBGF = -g -+ ifeq ($(SYSARCH),ia64) -+ ARCH = IA64 -+ else -+ ARCH = 32 -+ endif -+ else -+ ifeq (x$(CXX),x) -+ CXX = g++ -+ endif -+ -+ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES") -+ LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).0 -+endif -+ -+ ###DEF += -fPIC -+ OPTF = -O2 -+ DBGF = -ggdb -gstabs -+ ifeq ($(SYSARCH),x86_64) -+ ARCH = 64 -+ ifeq (x$(CXX),x) -+ CXX = g++ -+ endif -+ DEF += -fPIC -+ else -+ ARCH = 32 -+ endif -+ endif -+ -+ DEPARG = -M -+ INC += -+ DEF += -+ SHARED = -shared -+ ARCHARGS = -+ifeq ($(SYSARCH),x86_64) -+ LINKARGS = -L/usr/X11R6/lib64 -+else -+ LINKARGS = -L/usr/X11R6/lib -+endif -+ MAKEDIST = $(TOPDIR)/Make/makerpms -+endif -+ -+#### FreeBSD specific definitions -+ifeq ($(OS),FreeBSD) -+ SYSARCH := $(shell uname -p) -+ ifeq (x$(CXX),x) -+ CXX = g++ -+ endif -+ ifeq (x$(PTHREAD_CFLAGS),x) -+ PTHREAD_CFLAGS = -pthread -+ endif -+ ifeq (x$(PTHREAD_LIBS),x) -+ PTHREAD_LIBS = -pthread -+ endif -+ ifeq (x$(ARCH),x) -+ ARCH = $(SYSARCH) -+ endif -+ DEPARG = -MM -+ INC += -I/usr/local/include -I/usr/X11R6/include -+ DEF += -W -Wall $(PTHREAD_CFLAGS) -+ OPTF = -O2 -+ DBGF = -g -+ SHARED = -shared -+ ifeq ($(SYSARCH),amd64) -+ ARCHARGS = -fPIC -+ else -+ ARCHARGS = -+ endif -+ LINKARGS = $(PTHREAD_LIBS) -+endif -+ -+#### MacOS X specific definitions -+ifeq ($(OS),Darwin) -+ ifeq (x$(CXX),x) -+ CXX = g++ -+ endif -+ DEPARG = -M -+ INC += -I/usr/X11R6/include -+ DEF += -Wall -D__DARWIN_OSX__ -+ OPTF = -O2 -+ DBGF = -gstabs+ -ggdb -+ SHARED = -shared -+ ARCH = 32 -+ ARCHARGS = -+ LINKARGS = -L/usr/X11R6/lib -framework Carbon -+ LIB_EXT = dylib -+endif -+ -+#### Cygwin/Mingw specific definitions -+ifeq ($(OS),CYGWIN) -+ CXX = c++ -+ DEPARG = -M -+ INC += -DWIN32 -+ DEF += -DWIN32 -Wall -DOPENTHREADS_EXPORTS -+ OPTF = -O2 -+ DBGF = -g -+ SHARED = -shared \ -+ -Wl,--out-implib,lib$(TARGET_BASENAME).dll.a \ -+ -Wl,--export-all-symbols -+ -+ EXE_EXT =.exe -+ ARCH = 32 -+ ARCHARGS = -+ LINKARGS = -W -Wall -+ DYNAMICLIBRARYLIB = -+ -+ GL_LIBS = -lglu32 -lopengl32 -+ X_LIBS = -lgdi32 -luser32 -+ SOCKET_LIBS = -+ OTHER_LIBS = $(GL_LIBS) -+ -+ PTHREAD_LIB = -lpthread -+ -+ LIBINST = bin/$(OS)$(ARCH) -+ IMP_LIBINST = lib/$(OS)$(ARCH) -+ -+ LIB_PREFIX = cyg -+ LIB_EXT = dll -+ IMP_LIB_EXT = dll.a -+ LINK = cp -f -+ -+ INST_LOCATION = /usr/local/OpenThreads -+ INST_INCLUDE = $(INST_LOCATION)/include -+ INST_SHARE_PREFIX = $(INST_LOCATION) -+ INST_SRC = $(INST_SHARE_PREFIX)/src -+ INST_EXAMPLES = $(INST_SHARE_PREFIX)/bin -+ INST_EXAMPLE_SRC = $(INST_SHARE_PREFIX)/src/demos -+ INST_DOC = $(INST_SHARE_PREFIX)/doc -+ INST_DATA = $(INST_SHARE_PREFIX)/data -+ MAKEDIST = $(TOPDIR)/Make/makeinnosetup -+ -+endif -+ -+#### Cygwin/Mingw specific definitions -+ifeq ($(OS),MINGW) -+ CXX = c++ -mthreads -+ -+ DEPARG = -M -+ INC += -+ DEF += -DWIN32 -Wall -DOPENTHREADS_EXPORTS -+ OPTF = -O2 -+ DBGF = -g -+ SHARED = -shared -mthreads \ -+ -Wl,--export-all-symbols \ -+ -Wl,--output-def,lib$(TARGET_BASENAME).def \ -+ -Wl,--out-implib,lib$(TARGET_BASENAME).dll.a \ -+ -+ EXE_EXT =.exe -+ ARCH = 32 -+ ARCHARGS = -+ LINKARGS = -W -Wall -+ DYNAMICLIBRARYLIB = -+ -+ GL_LIBS = -lglu32 -lopengl32 -+ X_LIBS = -lgdi32 -luser32 -+ SOCKET_LIBS = -+ OTHER_LIBS = $(GL_LIBS) -lwinmm -+ PTHREAD_LIB = -+ OPEN_THREAD_LIB = -lOpenThreadsWin32 -+ -+ LIBINST = bin/$(OS)$(ARCH) -+ IMP_LIBINST = lib/$(OS)$(ARCH) -+ -+ LIB_PREFIX = lib -+ LIB_EXT = dll -+ IMP_LIB_EXT = dll.a -+ PLUGIN_EXT = dll -+ -+ LINK = cp -f -+ -+ INST_LOCATION = /usr/local/OpenThreads -+ INST_LIBS = $(INST_LOCATION)/bin -+ INST_IMP_LIBS = $(INST_LOCATION)/lib -+ INST_INCLUDE = $(INST_LOCATION)/include -+ INST_SHARE = $(INST_LOCATION) -+ INST_DEMOS = $(INST_SHARE)/bin -+ INST_DEMO_SRC = $(INST_SHARE)/src/demos -+ INST_DOC = $(INST_SHARE)/doc -+ INST_DATA = $(INST_SHARE)/data -+ MAKEDIST = $(TOPDIR)/Make/makeinnosetup -+endif -+ -+#### HP-UX Specific definitions -+ -+ifeq ($(OS),HP-UX) -+ CXX = aCC -AA -mt -+ DEPARG = -w +make -E -+ INC += -+ DEF += +Z -z -+ OPTF = +O2 -+ DBGF = -g -+ SHARED = +Z -b -z -Wl,+s -+ ARCH = 32 -+ LDFLAGS = -+ LINKARGS = -lpthread -+ LIB_EXT = sl -+ PLUGIN_EXT = sl -+ DYNAMICLIBRARYLIB = -ldld -+ OTHER_LIBS = -lm -+endif -+ -+ -+VPATH=.. -+ -diff -uNr OSG_OP_OT-1.1.orig/OpenThreads/pthread_src/PThread.c++ OSG_OP_OT-1.1/OpenThreads/pthread_src/PThread.c++ ---- OSG_OP_OT-1.1.orig/OpenThreads/pthread_src/PThread.c++ 2005-05-20 23:11:42.000000000 +0200 -+++ OSG_OP_OT-1.1/OpenThreads/pthread_src/PThread.c++ 2006-08-24 04:55:38.000000000 +0200 -@@ -529,27 +529,18 @@ - - PThreadPrivateData *pd = static_cast (_prvData); - -- size_t defaultStackSize; -+ size_t defaultStackSize = 0; - pthread_attr_getstacksize( &thread_attr, &defaultStackSize); -- if(status != 0) { -- return status; -- } - - if(defaultStackSize < pd->stackSize) { - - pthread_attr_setstacksize( &thread_attr, pd->stackSize); -- if(status != 0) { -- return status; -- } - } - - //------------------------------------------------------------------------- - // Now get what we actually have... - // - pthread_attr_getstacksize( &thread_attr, &defaultStackSize); -- if(status != 0) { -- return status; -- } - - pd->stackSize = defaultStackSize; - -diff -uNr OSG_OP_OT-1.1.orig/OpenThreads/pthread_src/PThreadPrivateData.h OSG_OP_OT-1.1/OpenThreads/pthread_src/PThreadPrivateData.h ---- OSG_OP_OT-1.1.orig/OpenThreads/pthread_src/PThreadPrivateData.h 2004-08-27 18:45:14.000000000 +0200 -+++ OSG_OP_OT-1.1/OpenThreads/pthread_src/PThreadPrivateData.h 2006-08-24 04:55:38.000000000 +0200 -@@ -43,7 +43,7 @@ - - private: - -- PThreadPrivateData() {}; -+ PThreadPrivateData() : stackSize(0), stackSizeLocked(false), isRunning(false), isCanceled(false), idSet(false), tid(0), uniqueId(0), cpunum(0) {}; - - virtual ~PThreadPrivateData() {}; - -diff -uNr OSG_OP_OT-1.1.orig/Producer/include/Producer/Keyboard OSG_OP_OT-1.1/Producer/include/Producer/Keyboard ---- OSG_OP_OT-1.1.orig/Producer/include/Producer/Keyboard 2005-10-28 22:53:43.000000000 +0200 -+++ OSG_OP_OT-1.1/Producer/include/Producer/Keyboard 2006-08-24 04:55:38.000000000 +0200 -@@ -539,6 +539,7 @@ - KeyboardKey _key; - }; - -+class KeyboardMouseImplementation; - - class PR_EXPORT Keyboard : public Producer::Referenced - { -diff -uNr OSG_OP_OT-1.1.orig/Producer/Make/libdefs OSG_OP_OT-1.1/Producer/Make/libdefs ---- OSG_OP_OT-1.1.orig/Producer/Make/libdefs 1970-01-01 01:00:00.000000000 +0100 -+++ OSG_OP_OT-1.1/Producer/Make/libdefs 2006-08-24 04:55:38.000000000 +0200 -@@ -0,0 +1,4 @@ -+ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES") -+ LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).$(VERSION_MAJOR) -+endif -+ -diff -uNr OSG_OP_OT-1.1.orig/Producer/Make/makedefs OSG_OP_OT-1.1/Producer/Make/makedefs ---- OSG_OP_OT-1.1.orig/Producer/Make/makedefs 2006-07-18 15:26:22.000000000 +0200 -+++ OSG_OP_OT-1.1/Producer/Make/makedefs 2006-08-24 04:55:38.000000000 +0200 -@@ -248,11 +248,6 @@ - ifeq (x$(CXX),x) - CXX = g++ - endif -- --ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES") -- LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).0 --endif -- - DEF += -fPIC -pthread - OPTF = -O2 - DBGF = -ggdb -gstabs