Changeset 51

Timestamp:

9.1.2008 00:09:26 (12 months ago)

Author:

blackhex

Message:

• Headers added to installation. simage dependency is now optional.

Location:

SoTerrain

Files:

• Makefile.am (modified) (4 diffs)
• configure.ac (modified) (2 diffs)
• include/Makefile.am (added)
• include/chunkedlod/Makefile.am (added)
• include/geomipmapping/Makefile.am (added)
• include/profiler/Makefile.am (added)
• include/profiler/PrProfiler.h (modified) (1 diff)
• include/roam/Makefile.am (added)

SoTerrain/Makefile.am

@@ -1 @@
-bin_PROGRAMS = SoTerrainTest
-
-SoTerrainTest_SOURCES = src/SoTerrainTest.cpp \
-                        src/SoQtFreeViewer.cpp include/SoQtFreeViewer.h \
-                        src/utils.cpp include/utils.h \
-                        include/debug.h
-SoTerrainTest_CPPFLAGS = $(AM_CPPFLAGS)
 LDADD = libSoTerrain.la libPrProfiler.la
 
@@ -19 +12 @@
                           src/chunkedlod/SoSimpleChunkedLoDTerrain.cpp include/chunkedlod/SoSimpleChunkedLoDTerrain.h \
                           src/utils.cpp include/utils.h \
+                          src/SoQtFreeViewer.cpp include/SoQtFreeViewer.h \
                           include/debug.h
 libSoTerrain_la_LDFLAGS=-release @SO_TERRAIN_VERSION@
@@ -28 +22 @@
                            include/debug.h
 libPrProfiler_la_LDFLAGS=-release @PR_PROFILER_VERSION@
+
+SUBDIRS = include \
+          include/roam \
+          include/profiler \
+          include/chunkedlod \
+          include/geomipmapping
 
 EXTRA_DIST = COPYING \
@@ -45 +45 @@
         rm -rf doc/html/*
 
+if HAVE_SIMAGE
+
+bin_PROGRAMS = SoTerrainTest
+
+SoTerrainTest_SOURCES = src/SoTerrainTest.cpp \
+                        src/utils.cpp include/utils.h \
+                        include/debug.h
+SoTerrainTest_CPPFLAGS = $(AM_CPPFLAGS)
+
 run : SoTerrainTest
         LD_LIBRARY_PATH="@SOQT_PATH@/lib:@SIMAGE_PATH@/lib" ./SoTerrainTest -a chunkedlod -h images/heightmaps/ps_height_1k.png -t images/textures/ps_texture_1k.jpg
+
+endif

SoTerrain/configure.ac

@@ -36 +36 @@
 
 # Set compiler flags accordingly to specified libraries
-AC_ARG_WITH([coin], [AS_HELP_STRING([--with-coin],
- [set location of Coin library (default=/usr)])], [COIN_PATH=$withval],
- [COIN_PATH=/usr])
+AC_ARG_WITH([coin],
+  [AS_HELP_STRING([--with-coin], [set location of Coin library (default=/usr)])],
+  [COIN_PATH=$withval],
+  [COIN_PATH=/usr])
 AC_SUBST([COIN_PATH])
-AC_ARG_WITH([soqt], [AS_HELP_STRING([--with-soqt],
- [set location of SoQt library (default=/usr)])], [SOQT_PATH=$withval],
- [SOQT_PATH=/usr])
+
+AC_ARG_WITH([soqt],
+  [AS_HELP_STRING([--with-soqt], [set location of SoQt library (default=/usr)])],
+  [SOQT_PATH=$withval],
+  [SOQT_PATH=/usr])
 AC_SUBST([SOQT_PATH])
-AC_ARG_WITH([simage], [AS_HELP_STRING([--with-simage],
- [set location of simage library (default=/usr)])], [SIMAGE_PATH=$withval],
- [SIMAGE_PATH=/usr])
+
+AC_ARG_WITH([simage],
+  [AS_HELP_STRING([--with-simage], [set location of simage library (default=/usr)])],
+  [ac_with_simage=yes; SIMAGE_PATH=$withval],
+  [ac_with_simage=no; SIMAGE_PATH=/usr])
 AC_SUBST([SIMAGE_PATH])
 
-# Check for simage-config and soqt-config files
-AC_CHECK_FILE([$SIMAGE_PATH/bin/simage-config], [],
-  [AC_MSG_FAILURE([simage-config not found. Try to specify correct path to simage libary using --with-simage=<simage_path> option.])])
-AC_CHECK_FILE([$SOQT_PATH/bin/soqt-config], [], 
+# Check for simage-config.
+if test x"$ac_with_simage" = "xyes";
+then
+  AC_CHECK_FILE([$SIMAGE_PATH/bin/simage-config],
+    [ac_have_simage=yes],
+    [AC_MSG_FAILURE([simage-config not found. Try to specify correct path to simage libary using --with-simage=<simage_path> option.])])
+else
+  AC_CHECK_FILE([$SIMAGE_PATH/bin/simage-config],
+    [ac_have_simage=yes],
+    [ac_have_simage=no])
+  AM_CONDITIONAL([HAVE_SIMAGE], [test x"$ac_have_python" = "xyes"])
+fi
+
+# Check for soqt-config.
+AC_CHECK_FILE([$SOQT_PATH/bin/soqt-config],
+  [],
   [AC_MSG_FAILURE([soqt-config not found. Try to specify correct path to SoQt libary using --with-soqt=<soqt_path> option.])])
 
 # Set building variables.
-CXXFLAGS="`$SOQT_PATH/bin/soqt-config --cppflags` -I./include/ -Wall \
-  -Wno-long-long -ansi"
-LDFLAGS="`$SOQT_PATH/bin/soqt-config --ldflags` \
- `$SOQT_PATH/bin/soqt-config --libs` `$SIMAGE_PATH/bin/simage-config --libs`"
+CXXFLAGS="`$SOQT_PATH/bin/soqt-config --cppflags` -I./include/ -Wall -Wno-long-long -ansi"
+LDFLAGS="`$SOQT_PATH/bin/soqt-config --ldflags` `$SOQT_PATH/bin/soqt-config --libs`"
+
+if test x"$ac_have_simage" = "xyes";
+then
+  LDFLAGS="$LDFLAGS `$SIMAGE_PATH/bin/simage-config --libs`"
+  AC_DEFINE(HAVE_SIMAGE)
+fi
 
 # Compilation with debugging informations.
@@ -89 +110 @@
 
 # Checks for libraries.
-AC_CHECK_LIB([simage], [printf], [],
-  [AC_MSG_FAILURE([Can't link against simage library. Try to specify correct path to simage libary using --with-simage=<simage_path> option.])])
+if test x"$ac_have_simage" = "xyes";
+then
+  AC_CHECK_LIB([simage], [printf], [],
+    [AC_MSG_FAILURE([Can't link against simage library. Try to specify correct path to simage libary using --with-simage=<simage_path> option.])])
+fi
+
 AC_CHECK_LIB([Coin], [printf], [],
   [AC_MSG_FAILURE([Can't link against Coin library. Try to specify correct path to Coin libary using --with-coin=<coin_path> option.])])
+
 AC_CHECK_LIB([SoQt], [printf], [],
   [AC_MSG_FAILURE([Can't link against SoQt library. Try to specify correct path to SoQt libary using --with-soqt=<soqt_path> option.])])
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile
+                 include/Makefile
+                 include/roam/Makefile
+                 include/profiler/Makefile
+                 include/chunkedlod/Makefile
+                 include/geomipmapping/Makefile])
 
 AC_OUTPUT

SoTerrain/include/profiler/PrProfiler.h

@@ -6 +6 @@
 ///////////////////////////////////////////////////////////////////////////////
 /// Tï¿œa profileru algoritm.
-/// file PrProfiler.h
+/// \file PrProfiler.h
 /// \author Radek Bartoￜ- xbarto33
 /// \date 26.06.2005