Text archives Help

---

Author: abe
Date: Fri Feb 17 16:59:16 2006
New Revision: 943

Modified:
   trunk/CMakeLists.txt
   trunk/StandAlone/v3c1_tools.cc
Log:

Updated code to compile with new Vector type.
M    StandAlone/v3c1_tools.cc

Removed -ipo option from icc compiler flags.
M    CMakeLists.txt


Modified: trunk/CMakeLists.txt
==============================================================================
--- trunk/CMakeLists.txt        (original)
+++ trunk/CMakeLists.txt        Fri Feb 17 16:59:16 2006
@@ -91,7 +91,7 @@
 
   # Warn if the compiler is not icc
   IF   (CMAKE_C_COMPILER MATCHES "icc$")
-    FIRST_TIME_SET(CMAKE_C_FLAGS_RELEASE "-tpp2 -O3 -ipo -g 
-DSCI_ASSERTION_LEVEL=0" CACHE STRING "Release  Flags" FORCE)
+    FIRST_TIME_SET(CMAKE_C_FLAGS_RELEASE "-tpp2 -O3 -g 
-DSCI_ASSERTION_LEVEL=0" CACHE STRING "Release  Flags" FORCE)
     FIRST_TIME_SET(CMAKE_C_FLAGS_DEBUG   "-O0 -g" CACHE STRING "Debug Flags" 
FORCE)
   ELSE (CMAKE_C_COMPILER MATCHES "icc$")
          FIRST_TIME_MESSAGE("Intel Compilers recommended on ia64. setenv CC 
icc before running cmake.")
@@ -100,7 +100,7 @@
   ENDIF(CMAKE_C_COMPILER MATCHES "icc$")
 
   IF   (CMAKE_CXX_COMPILER MATCHES "icpc$")
-         FIRST_TIME_SET(CMAKE_CXX_FLAGS_RELEASE "-tpp2 -O3 -ipo -g 
-DSCI_ASSERTION_LEVEL=0" CACHE STRING "Release Flags" FORCE)
+         FIRST_TIME_SET(CMAKE_CXX_FLAGS_RELEASE "-tpp2 -O3 -g 
-DSCI_ASSERTION_LEVEL=0" CACHE STRING "Release Flags" FORCE)
          FIRST_TIME_SET(CMAKE_CXX_FLAGS_DEBUG   "-O0 -g" CACHE STRING "Debug 
Flags" FORCE)
   ELSE (CMAKE_CXX_COMPILER MATCHES "icpc$")
          FIRST_TIME_MESSAGE("Intel Compilers recommended on ia64.  setenv 
CXX icpc before running cmake.")
@@ -117,12 +117,12 @@
   ####################################################################
   # Check for Intel Compilers.
   IF   (CMAKE_C_COMPILER MATCHES "icc$")
-    FIRST_TIME_SET(CMAKE_C_FLAGS_RELEASE "-tpp7 -O3 -ipo -g 
-DSCI_ASSERTION_LEVEL=0" CACHE STRING "Release  Flags" FORCE)
+    FIRST_TIME_SET(CMAKE_C_FLAGS_RELEASE "-tpp7 -O3 -g 
-DSCI_ASSERTION_LEVEL=0" CACHE STRING "Release  Flags" FORCE)
     FIRST_TIME_SET(CMAKE_C_FLAGS_DEBUG   "-O0 -g" CACHE STRING "Debug Flags" 
FORCE)
   ENDIF(CMAKE_C_COMPILER MATCHES "icc$")
 
   IF   (CMAKE_CXX_COMPILER MATCHES "icpc$")
-         FIRST_TIME_SET(CMAKE_CXX_FLAGS_RELEASE "-tpp7 -O3 -ipo -g 
-DSCI_ASSERTION_LEVEL=0" CACHE STRING "Release Flags" FORCE)
+         FIRST_TIME_SET(CMAKE_CXX_FLAGS_RELEASE "-tpp7 -O3 -g 
-DSCI_ASSERTION_LEVEL=0" CACHE STRING "Release Flags" FORCE)
          FIRST_TIME_SET(CMAKE_CXX_FLAGS_DEBUG   "-O0 -g" CACHE STRING "Debug 
Flags" FORCE)
   ENDIF(CMAKE_CXX_COMPILER MATCHES "icpc$")
 

Modified: trunk/StandAlone/v3c1_tools.cc
==============================================================================
--- trunk/StandAlone/v3c1_tools.cc      (original)
+++ trunk/StandAlone/v3c1_tools.cc      Fri Feb 17 16:59:16 2006
@@ -113,7 +113,7 @@
        }
 };
 
-typedef VectorT<float, 3> Vectorf; 
+typedef Vector Vectorf; 
 struct vertex_normals {
   Vectorf normal[3];
 };
@@ -595,7 +595,7 @@
 
   // Output structures
   v3c1_face out_face;
-  VectorT<float,3> normal[3];
+  Vector normal[3];
   float texcoord[3][2] = { {0, 0}, {1, 1}, {2, 2} };
   
        // Iterate over the groups.

---

• [MANTA] r943 - in trunk: . StandAlone, abe, 02/17/2006

---

Archive powered by MHonArc 2.6.16.