[brlcad-commits] SF.net SVN: brlcad:[31869] brlcad/trunk

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

Revision: 31869
          http://brlcad.svn.sourceforge.net/brlcad/?rev=31869&view=rev
Author:   brlcad
Date:     2008-07-17 21:13:10 +0000 (Thu, 17 Jul 2008)

Log Message:
-----------
if we're going to always define USE_FBSERV then why does it even exist?  push it out of configure up into dm.h, make it non-conditional for libtclcad but keep libdm's just in case.

Modified Paths:
--------------
    brlcad/trunk/configure.ac
    brlcad/trunk/include/dm.h
    brlcad/trunk/include/tclcad.h
    brlcad/trunk/misc/win32-msvc8/libdm/libdm.vcproj
    brlcad/trunk/misc/win32-msvc8/libtclcad/libtclcad.vcproj
    brlcad/trunk/misc/win32-msvc8/mged/mged.vcproj
    brlcad/trunk/misc/win32-msvc9/libdm/libdm.vcproj
    brlcad/trunk/misc/win32-msvc9/mged/mged.vcproj

Modified: brlcad/trunk/configure.ac
===================================================================
--- brlcad/trunk/configure.ac	2008-07-17 21:00:53 UTC (rev 31868)
+++ brlcad/trunk/configure.ac	2008-07-17 21:13:10 UTC (rev 31869)
@@ -3599,9 +3599,7 @@
 	AC_DEFINE(PARALLEL, 1, [Define to enable SMP architecture parallel computation support ])
 fi
 
-AC_DEFINE_UNQUOTED([USE_FBSERV], [1], [Required for libdm/mged to allow direct fbserv render connections])
 
-
 #
 # set up the BRL-CAD libraries
 #

Modified: brlcad/trunk/include/dm.h
===================================================================
--- brlcad/trunk/include/dm.h	2008-07-17 21:00:53 UTC (rev 31868)
+++ brlcad/trunk/include/dm.h	2008-07-17 21:13:10 UTC (rev 31869)
@@ -30,6 +30,9 @@
 
 #include "bu.h"
 #include "vmath.h"
+
+#define USE_FBSERV 1
+
 #ifdef USE_FBSERV
 #  include "fbserv_obj.h"
 #endif

Modified: brlcad/trunk/include/tclcad.h
===================================================================
--- brlcad/trunk/include/tclcad.h	2008-07-17 21:00:53 UTC (rev 31868)
+++ brlcad/trunk/include/tclcad.h	2008-07-17 21:13:10 UTC (rev 31869)
@@ -36,9 +36,7 @@
 #include "tcl.h"
 #include "ged.h"
 
-#ifdef USE_FBSERV
-#  include "fbserv_obj.h"
-#endif
+#include "fbserv_obj.h"
 
 __BEGIN_DECLS
 
@@ -79,9 +77,7 @@
     struct bu_vls	gdv_name;
     struct ged_view	*gdv_view;
     struct dm		*gdv_dmp;
-#ifdef USE_FBSERV
     struct fbserv_obj	gdv_fbs;
-#endif
     struct ged_obj	*gdv_gop; /* Pointer back to its ged object */
 };
 

Modified: brlcad/trunk/misc/win32-msvc8/libdm/libdm.vcproj
===================================================================
--- brlcad/trunk/misc/win32-msvc8/libdm/libdm.vcproj	2008-07-17 21:00:53 UTC (rev 31868)
+++ brlcad/trunk/misc/win32-msvc8/libdm/libdm.vcproj	2008-07-17 21:13:10 UTC (rev 31869)
@@ -52,7 +52,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../../include;../../../src/other/libz;../../../src/other/libpng;../../../src/other/tcl/generic;../../../src/other/tcl/win;../../../src/other/tk/generic;../../../src/other/tk/win;../../../src/other/tk/xlib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DM_EXPORT_DLL;DM_WGL;IF_WGL;IF_REMOTE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;USE_FBSERV;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DM_EXPORT_DLL;DM_WGL;IF_WGL;IF_REMOTE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="2"
@@ -154,7 +154,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../../include;../../../src/other/libz;../../../src/other/libpng;../../../src/other/tcl/generic;../../../src/other/tcl/win;../../../src/other/tk/generic;../../../src/other/tk/win;../../../src/other/tk/xlib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DM_EXPORT_DLL;DM_WGL;IF_WGL;IF_REMOTE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;USE_FBSERV;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DM_EXPORT_DLL;DM_WGL;IF_WGL;IF_REMOTE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="2"

Modified: brlcad/trunk/misc/win32-msvc8/libtclcad/libtclcad.vcproj
===================================================================
--- brlcad/trunk/misc/win32-msvc8/libtclcad/libtclcad.vcproj	2008-07-17 21:00:53 UTC (rev 31868)
+++ brlcad/trunk/misc/win32-msvc8/libtclcad/libtclcad.vcproj	2008-07-17 21:13:10 UTC (rev 31869)
@@ -53,7 +53,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../../include;../../../src/other/tcl/generic;../../../src/other/tcl/win;../../../src/other/tk/generic;../../../src/other/tk/win;../../../src/other/tk/bitmaps;../../../src/other/tk/xlib;../../../src/other/incrTcl/itcl/generic;../../../src/other/incrTcl/itk/generic;../../../src/other/blt/src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TCLCAD_EXPORT_DLL;DM_WGL;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;USE_FBSERV;IF_WGL;IF_REMOTE;_CRT_SECURE_NO_WARNINGS;inline=__inline"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TCLCAD_EXPORT_DLL;DM_WGL;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;IF_WGL;IF_REMOTE;_CRT_SECURE_NO_WARNINGS;inline=__inline"
 				StringPooling="true"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="2"

Modified: brlcad/trunk/misc/win32-msvc8/mged/mged.vcproj
===================================================================
--- brlcad/trunk/misc/win32-msvc8/mged/mged.vcproj	2008-07-17 21:00:53 UTC (rev 31868)
+++ brlcad/trunk/misc/win32-msvc8/mged/mged.vcproj	2008-07-17 21:13:10 UTC (rev 31869)
@@ -48,7 +48,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../../include;../../../src/mged;../../../src/other/tcl/generic;../../../src/other/tcl/win;../../../src/other/tk/generic;../../../src/other/tk/xlib;../../../src/other/incrTcl/itcl/generic;../../../src/other/incrTcl/itk/generic"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;DM_WGL;IF_WGL;USE_FBSERV;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;DM_WGL;IF_WGL;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="2"
@@ -147,7 +147,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../../include;../../../src/mged;../../../src/other/tcl/generic;../../../src/other/tcl/win;../../../src/other/tk/generic;../../../src/other/tk/xlib;../../../src/other/incrTcl/itcl/generic;../../../src/other/incrTcl/itk/generic"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;DM_WGL;IF_WGL;USE_FBSERV;_CRT_SECURE_NO_WARNINGS;TCL_CFG_DO64BIT;STDC_HEADERS;_stati64=_stat64"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;DM_WGL;IF_WGL;_CRT_SECURE_NO_WARNINGS;TCL_CFG_DO64BIT;STDC_HEADERS;_stati64=_stat64"
 				StringPooling="true"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="2"

Modified: brlcad/trunk/misc/win32-msvc9/libdm/libdm.vcproj
===================================================================
--- brlcad/trunk/misc/win32-msvc9/libdm/libdm.vcproj	2008-07-17 21:00:53 UTC (rev 31868)
+++ brlcad/trunk/misc/win32-msvc9/libdm/libdm.vcproj	2008-07-17 21:13:10 UTC (rev 31869)
@@ -53,7 +53,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../../include;../../../src/other/libz;../../../src/other/libpng;../../../src/other/tcl/generic;../../../src/other/tcl/win;../../../src/other/tk/generic;../../../src/other/tk/win;../../../src/other/tk/xlib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DM_EXPORT_DLL;DM_WGL;IF_WGL;IF_REMOTE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;USE_FBSERV;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DM_EXPORT_DLL;DM_WGL;IF_WGL;IF_REMOTE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="2"
@@ -154,7 +154,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../../include;../../../src/other/libz;../../../src/other/libpng;../../../src/other/tcl/generic;../../../src/other/tcl/win;../../../src/other/tk/generic;../../../src/other/tk/win;../../../src/other/tk/xlib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DM_EXPORT_DLL;DM_WGL;IF_WGL;IF_REMOTE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;USE_FBSERV;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DM_EXPORT_DLL;DM_WGL;IF_WGL;IF_REMOTE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="2"

Modified: brlcad/trunk/misc/win32-msvc9/mged/mged.vcproj
===================================================================
--- brlcad/trunk/misc/win32-msvc9/mged/mged.vcproj	2008-07-17 21:00:53 UTC (rev 31868)
+++ brlcad/trunk/misc/win32-msvc9/mged/mged.vcproj	2008-07-17 21:13:10 UTC (rev 31869)
@@ -49,7 +49,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../../include;../../../src/mged;../../../src/other/tcl/generic;../../../src/other/tcl/win;../../../src/other/tk/generic;../../../src/other/tk/xlib;../../../src/other/incrTcl/itcl/generic;../../../src/other/incrTcl/itk/generic"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;DM_WGL;IF_WGL;USE_FBSERV;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;DM_WGL;IF_WGL;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="2"
@@ -147,7 +147,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../../include;../../../src/mged;../../../src/other/tcl/generic;../../../src/other/tcl/win;../../../src/other/tk/generic;../../../src/other/tk/xlib;../../../src/other/incrTcl/itcl/generic;../../../src/other/incrTcl/itk/generic"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;DM_WGL;IF_WGL;USE_FBSERV;_CRT_SECURE_NO_WARNINGS;TCL_CFG_DO64BIT;STDC_HEADERS;_stati64=_stat64"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;DM_WGL;IF_WGL;_CRT_SECURE_NO_WARNINGS;TCL_CFG_DO64BIT;STDC_HEADERS;_stati64=_stat64"
 				StringPooling="true"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="2"


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