Text archives Help

---

Author: abe
Date: Tue Sep 20 12:58:16 2005
New Revision: 558

Modified:
   branches/AFR/Core/Geometry/PointVector.h
   branches/AFR/Engine/Display/CMakeLists.txt
   branches/AFR/Model/CMakeLists.txt
   branches/AFR/StandAlone/CMakeLists.txt
   branches/AFR/scenes/CMakeLists.txt
Log:

Changes so code will build on gcc (tested with 4.0 on a G5).

Previously I had tested only with icc on SGI which didn't seem to mind these 
problems.

M    scenes/CMakeLists.txt
M    StandAlone/CMakeLists.txt
M    Core/Geometry/PointVector.h
M    Model/CMakeLists.txt
M    Engine/Display/CMakeLists.txt


Modified: branches/AFR/Core/Geometry/PointVector.h
==============================================================================
--- branches/AFR/Core/Geometry/PointVector.h    (original)
+++ branches/AFR/Core/Geometry/PointVector.h    Tue Sep 20 12:58:16 2005
@@ -77,13 +77,6 @@
         return self->operator[](i);
       }
     }
-
-#else
-    %extend {
-      T& __getitem__( int i ) {
-        return self->operator[](i);
-      }
-    }
 #endif
 
     VectorT<T, Dim> operator+(const VectorT<T, Dim>& v) const {

Modified: branches/AFR/Engine/Display/CMakeLists.txt
==============================================================================
--- branches/AFR/Engine/Display/CMakeLists.txt  (original)
+++ branches/AFR/Engine/Display/CMakeLists.txt  Tue Sep 20 12:58:16 2005
@@ -8,10 +8,6 @@
      Display/FileDisplay.cc
      Display/GLXImageDisplay.h
      Display/GLXImageDisplay.cc
-     Display/FileDisplay.h
-     Display/FileDisplay.cc
-     Display/GLXImageDisplay.h
-     Display/GLXImageDisplay.cc
 #     Display/GLXMultipipeImageDisplay.h
 #     Display/GLXMultipipeImageDisplay.cc
 

Modified: branches/AFR/Model/CMakeLists.txt
==============================================================================
--- branches/AFR/Model/CMakeLists.txt   (original)
+++ branches/AFR/Model/CMakeLists.txt   Tue Sep 20 12:58:16 2005
@@ -13,11 +13,6 @@
 INCLUDE (Intersections/CMakeLists.txt)
 INCLUDE (Textures/CMakeLists.txt)
 
-SET(BUILD_SCALAR_VOLUME CACHE BOOL false)
-IF(BUILD_SCALAR_VOLUME)
-  INCLUDE (Primitives/Volume/CMakeLists.txt)
-ENDIF(BUILD_SCALAR_VOLUME)
-
 ADD_LIBRARY (Manta_Model
              ${Manta_AmbientLights_SRCS}
              ${Manta_Backgrounds_SRCS}

Modified: branches/AFR/StandAlone/CMakeLists.txt
==============================================================================
--- branches/AFR/StandAlone/CMakeLists.txt      (original)
+++ branches/AFR/StandAlone/CMakeLists.txt      Tue Sep 20 12:58:16 2005
@@ -32,16 +32,21 @@
 ## AFR Helper Programs.
 INCLUDE (${CMAKE_ROOT}/Modules/FindGLUT.cmake)
 
-INCLUDE_DIRECTORIES(${GLUT_INCLUDE_DIR})
+SET(BUILD_AFR_TOOLS FALSE CACHE BOOL "Build combinestreams and streamtest.")
+IF(${BUILD_AFR_TOOLS})
 
-ADD_EXECUTABLE(combinestreams combinestreams.cpp)
-TARGET_LINK_LIBRARIES(combinestreams ${GLUT_LIBRARIES}
+  INCLUDE_DIRECTORIES(${GLUT_INCLUDE_DIR})
+
+  ADD_EXECUTABLE(combinestreams combinestreams.cpp)
+  TARGET_LINK_LIBRARIES(combinestreams ${GLUT_LIBRARIES}
                                      ${OPENGL_LIBRARIES} 
                                      ${X11_LIBRARIES} 
                                      -lm)
 
-ADD_EXECUTABLE(streamtest     streamtest.cpp)
-TARGET_LINK_LIBRARIES(streamtest ${GLUT_LIBRARIES}
+  ADD_EXECUTABLE(streamtest     streamtest.cpp)
+  TARGET_LINK_LIBRARIES(streamtest ${GLUT_LIBRARIES}
                                  ${OPENGL_LIBRARIES} 
                                  ${X11_LIBRARIES} 
-                                 -lm)
\ No newline at end of file
+                                 -lm)
+ENDIF(${BUILD_AFR_TOOLS})
+

Modified: branches/AFR/scenes/CMakeLists.txt
==============================================================================
--- branches/AFR/scenes/CMakeLists.txt  (original)
+++ branches/AFR/scenes/CMakeLists.txt  Tue Sep 20 12:58:16 2005
@@ -51,7 +51,7 @@
 ENDIF(SCENE_BOEING777)
 
 # volume
-SET(SCENE_VOLUME 1 CACHE BOOL "volume rendering")
+SET(SCENE_VOLUME 0 CACHE BOOL "volume rendering")
 IF(SCENE_VOLUME)
    ADD_LIBRARY(scene_volume volume.cc)
    TARGET_LINK_LIBRARIES(scene_volume ${manta_scene_link})

---

• [MANTA] r558 - in branches/AFR: Core/Geometry Engine/Display Model StandAlone scenes, abe, 09/20/2005

---

Archive powered by MHonArc 2.6.16.