[brlcad-commits] SF.net SVN: brlcad:[54580] brlcad/trunk/src/other/openNURBS

[<br...@us...>]

Revision: 54580
          http://brlcad.svn.sourceforge.net/brlcad/?rev=54580&view=rev
Author:   brlcad
Date:     2013-03-08 19:59:08 +0000 (Fri, 08 Mar 2013)
Log Message:
-----------
document the files that we intentionally retained for reference but do not compile (along with others)

Modified Paths:
--------------
    brlcad/trunk/src/other/openNURBS/CMakeLists.txt
    brlcad/trunk/src/other/openNURBS/Makefile.am

Modified: brlcad/trunk/src/other/openNURBS/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/openNURBS/CMakeLists.txt	2013-03-08 19:32:06 UTC (rev 54579)
+++ brlcad/trunk/src/other/openNURBS/CMakeLists.txt	2013-03-08 19:59:08 UTC (rev 54580)
@@ -8,6 +8,22 @@
   set(BUILD_STATIC_LIBS ON)
 ENDIF(NOT DEFINED BUILD_STATIC_LIBS)
 
+# these are files no longer in opennurbs but retained for reference
+set(OPENNURBS_REF
+opennurbs_basic.cpp
+opennurbs_brep_changesrf.cpp
+opennurbs_brep_kinky.cpp
+)
+
+# these are files we turn off because we don't use them and they incur
+# some cost to enable (e.g., they require OpenGL)
+set(OPENNURBS_OFF
+opennurbs_gl.cpp
+opennurbs_gl.h
+opennurbs_precompiledheader.cpp
+opennurbs_zlib_memory.cpp
+)
+
 set(OPENNURBS_SOURCES
 opennurbs_3dm_attributes.cpp
 opennurbs_3dm_properties.cpp
@@ -161,7 +177,6 @@
 opennurbs_fsp.h
 opennurbs_fsp_defs.h
 opennurbs_geometry.h
-opennurbs_gl.h
 opennurbs_group.h
 opennurbs_hatch.h
 opennurbs_hsort_template.h
@@ -225,9 +240,6 @@
 opennurbs_zlib.h
   )
 
-SET(ON_DLL_HEADERS
-  opennurbs_dll_resource.h
-  )
 
 INCLUDE(CheckIncludeFiles)
 CHECK_INCLUDE_FILE(emmintrin.h HAVE_EMMINTRIN_H)
@@ -264,7 +276,6 @@
     -DON_COMPILING_OPENNURBS
     -DON_DLL_EXPORTS
     )
-  SET(OPENNURBS_HEADERS "${OPENNURBS_HEADERS};${ON_DLL_HEADERS}")
 else (MSVC)
   add_definitions(
     -DON_COMPILING_OPENNURBS

Modified: brlcad/trunk/src/other/openNURBS/Makefile.am
===================================================================
--- brlcad/trunk/src/other/openNURBS/Makefile.am	2013-03-08 19:32:06 UTC (rev 54579)
+++ brlcad/trunk/src/other/openNURBS/Makefile.am	2013-03-08 19:59:08 UTC (rev 54580)
@@ -44,7 +44,6 @@
 	opennurbs_fsp.h \
 	opennurbs_fsp_defs.h \
 	opennurbs_geometry.h \
-	opennurbs_gl.h \
 	opennurbs_group.h \
 	opennurbs_hatch.h \
 	opennurbs_hsort_template.h \
@@ -62,7 +61,6 @@
 	opennurbs_material.h \
 	opennurbs_math.h \
 	opennurbs_matrix.h \
-	opennurbs_memory.h \
 	opennurbs_mesh.h \
 	opennurbs_nurbscurve.h \
 	opennurbs_nurbssurface.h \
@@ -145,6 +143,7 @@
 	opennurbs_defines.cpp \
 	opennurbs_detail.cpp \
 	opennurbs_dimstyle.cpp \
+	opennurbs_dll.cpp \
 	opennurbs_ellipse.cpp \
 	opennurbs_embedded_file.cpp \
 	opennurbs_error.cpp \
@@ -213,8 +212,7 @@
 	opennurbs_wstring.cpp \
 	opennurbs_x.cpp \
 	opennurbs_xform.cpp \
-	opennurbs_zlib.cpp \
-	opennurbs_zlib_memory.cpp
+	opennurbs_zlib.cpp
 
 nurbincludedir = $(includedir)/openNURBS
 nurbinclude_HEADERS = $(ON_INC)
@@ -229,10 +227,12 @@
 
 ON_EXTRA = \
 	opennurbs.rc \
-	opennurbs_dll.cpp \
-	opennurbs_dll_resource.h \
+	opennurbs_basic.cpp \
+	opennurbs_brep_changesrf.cpp \
+	opennurbs_brep_kinky.cpp \
 	opennurbs_gl.cpp \
-	opennurbs_precompiledheader.cpp
+	opennurbs_precompiledheader.cpp \
+	opennurbs_zlib_memory.cpp
 
 EXTRA_DIST = \
 	${ON_EXTRA} \
@@ -247,6 +247,8 @@
 	BRL-CAD_changes.txt \
 	faq.txt \
 	license.txt \
+	opennurbs_dll_resource.h \
+	opennurbs_gl.h \
 	readme.txt \
         CMakeLists.txt
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.