Merge branch 'develop' of code.sat.qc.ca:spinframework into develop

mikewoz · Jun 14, 2013 · c162257 · c162257
2 parents ccf1018 + 2ed20e1
commit c162257
Show file tree

Hide file tree

Showing 60 changed files with 15 additions and 7,681 deletions.
diff --git a/.gitignore b/.gitignore
@@ -62,6 +62,8 @@ src/osgWrappers/introspection/motionblurppu.cpp
 src/osgWrappers/introspection/osgParticleUtil.cpp
 src/osgWrappers/introspection/spinservercontext.cpp
 src/osgWrappers/introspection/spinapp.cpp
+src/osgWrappers/introspection/shaderppu.cpp
+src/osgWrappers/introspection/shmpointcloud.cpp
 spinframework-*.*.*
 doxyfile
 doxyfile.stamp

diff --git a/buildWrappers.sh b/buildWrappers.sh
@@ -21,7 +21,7 @@ type -P genwrapper &>/dev/null || { echo "genwrapper is not installed; please in
 doxygen ./doxygen_config
 
 rm include/*.h~
-genwrapper -d . doxygen | doxygen -
+#genwrapper -d . doxygen | doxygen -
 genwrapper -v QUIET -c genwrapper.conf doxygen .
 #genwrapper -v DEBUG -c genwrapper.conf doxygen .
 rm -rf src/osgWrappers/introspection/home
diff --git a/configure.ac b/configure.ac
@@ -318,6 +318,7 @@ AC_CONFIG_FILES([
         doxyfile
         src/Makefile 
         src/osgPPU/Makefile 
+        src/osgWrappers/generator/Makefile 
         src/osgWrappers/introspection/Makefile 
         src/spin/Makefile
         src/Resources/Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,5 +1,6 @@
 # Order of compilation really matters:
 SUBDIRS = \
+    osgWrappers/generator \
     osgWrappers/introspection \
     osgPPU \
     spin \

diff --git a/src/osgWrappers/generator/Makefile.am b/src/osgWrappers/generator/Makefile.am
@@ -0,0 +1,5 @@
+# Need to have a makefile in a subdir just to ensure that the wrappers
+# are built before we try to compile them
+all-local:
+	@echo "******** Generating wrappers"
+	cd ../../.. && ./buildWrappers.sh
diff --git a/src/osgWrappers/introspection/animationnode.cpp b/src/osgWrappers/introspection/animationnode.cpp
diff --git a/src/osgWrappers/introspection/attractornode.cpp b/src/osgWrappers/introspection/attractornode.cpp