This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/CMakeModules/FindSpidermonkey.cmake b/CMakeModules/FindSpidermonkey.cmake | |
index 2959614..9cf9a84 100644 | |
--- a/CMakeModules/FindSpidermonkey.cmake | |
+++ b/CMakeModules/FindSpidermonkey.cmake | |
@@ -50,13 +50,13 @@ endif() | |
if(SPIDERMONKEY_ROOT) | |
find_library( | |
SPIDERMONKEY_LIBRARY | |
- NAMES mozjs-1.9.2 mozjs js js32 js3250 | |
+ NAMES mozjs185 mozjs-1.9.2 mozjs js js32 js3250 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?xml version="1.0" encoding="Windows-1252"?> | |
<VisualStudioPropertySheet | |
ProjectType="Visual C++" | |
Version="8.00" | |
Name="juan_vc9_props" | |
> | |
<UserMacro | |
Name="PROJECT_ROOT" | |
Value="..\.." | |
/> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains any messages produced by compilers while | |
running configure, to aid debugging if configure makes a mistake. | |
It was created by gnome-doc-utils configure 0.20.6, which was | |
generated by GNU Autoconf 2.66. Invocation command line was | |
$ ./configure --disable-scrollkeeper | |
## --------- ## | |
## Platform. ## |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains any messages produced by compilers while | |
running configure, to aid debugging if configure makes a mistake. | |
It was created by gnome-doc-utils configure 0.20.6, which was | |
generated by GNU Autoconf 2.66. Invocation command line was | |
$ ./configure --disable-scrollkeeper | |
## --------- ## | |
## Platform. ## |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/qvrpn/vrpn_QTrackerRemote.h b/qvrpn/vrpn_QTrackerRemote.h | |
index 0c641d4..5aade82 100644 | |
--- a/qvrpn/vrpn_QTrackerRemote.h | |
+++ b/qvrpn/vrpn_QTrackerRemote.h | |
@@ -22,8 +22,8 @@ | |
#include <QObject> | |
#include <QString> | |
#include <QSharedPointer> | |
-#include <qt4/QtGui/QQuaternion> | |
-#include <qt4/QtGui/QVector3D> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/QGLViewer/QGLViewer.pro b/QGLViewer.pro | |
index 4c59357..1298d3a 100644 | |
--- a/QGLViewer/QGLViewer.pro | |
+++ b/QGLViewer/QGLViewer.pro | |
@@ -135,11 +135,7 @@ unix { | |
} | |
isEmpty( DOC_DIR ) { | |
- macx|darwin-g++ { | |
- DOC_DIR = /Developer/Documentation/QGLViewer |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: include/osgwTools/TransparencyUtils.h | |
=================================================================== | |
--- include/osgwTools/TransparencyUtils.h (revision 390) | |
+++ include/osgwTools/TransparencyUtils.h (working copy) | |
@@ -112,6 +112,15 @@ | |
return( true ); | |
} | |
+ | |
+/** \brief Returns True if the given StateSet is configured like one of our transparent StateSets. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/include/osgwTools/TransparencyUtils.h b/Users/juan/dev/osgw2/include/osgwTools/TransparencyUtils.h | |
index 3808db6..e7216de 100644 | |
--- a/include/osgwTools/TransparencyUtils.h | |
+++ b/Users/juan/dev/osgw2/include/osgwTools/TransparencyUtils.h | |
@@ -112,6 +112,16 @@ bool transparentEnable( T* nodeOrDrawable, float alpha ) | |
return( true ); | |
} | |
+ | |
+/** \brief Returns True if the given StateSet is configured like one of our transparent StateSets. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains any messages produced by compilers while | |
running configure, to aid debugging if configure makes a mistake. | |
It was created by gnome-doc-utils configure 0.20.6, which was | |
generated by GNU Autoconf 2.66. Invocation command line was | |
$ ./configure --disable-scrollkeeper --enable-build-utils=yes | |
## --------- ## | |
## Platform. ## |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains any messages produced by compilers while | |
running configure, to aid debugging if configure makes a mistake. | |
It was created by gnome-doc-utils configure 0.20.6, which was | |
generated by GNU Autoconf 2.66. Invocation command line was | |
$ ./configure --disable-scrollkeeper --enable-build-utils=yes | |
## --------- ## | |
## Platform. ## |
OlderNewer