Revision: 41994
http://brlcad.svn.sourceforge.net/brlcad/?rev=41994&view=rev
Author: starseeker
Date: 2011-01-06 21:35:37 +0000 (Thu, 06 Jan 2011)
Log Message:
-----------
Update cmake branch to trunk r41993
Modified Paths:
--------------
brlcad/branches/cmake/include/opennurbs_ext.h
brlcad/branches/cmake/misc/win32-msvc8/libtie/libtie.vcproj
brlcad/branches/cmake/src/libfft/fft.h
Modified: brlcad/branches/cmake/include/opennurbs_ext.h
===================================================================
--- brlcad/branches/cmake/include/opennurbs_ext.h 2011-01-06 21:33:31 UTC
(rev 41993)
+++ brlcad/branches/cmake/include/opennurbs_ext.h 2011-01-06 21:35:37 UTC
(rev 41994)
@@ -32,6 +32,18 @@
#include <iostream>
#include "vmath.h"
+#ifndef RT_EXPORT
+# if defined(_WIN32) && !defined(__CYGWIN__) && defined(BRLCAD_DLL)
+# ifdef RT_EXPORT_DLL
+# define RT_EXPORT __declspec(dllexport)
+# else
+# define RT_EXPORT __declspec(dllimport)
+# endif
+# else
+# define RT_EXPORT
+# endif
+#endif
+
/* These definitions were added to opennurbs_curve.h - they are
* extensions of openNURBS, so add them here instead. At some
* point a more coherent structure should probably be set up for
@@ -1485,11 +1497,11 @@
* 3. If the curve is a line or an arc (determined with openNURBS routines),
* return the appropriate ON_Curve subclass (otherwise, return an
ON_NurbsCurve).
*/
-extern ON_Curve* pullback_curve(ON_BrepFace* face,
+RT_EXPORT BU_EXTERN(ON_Curve* pullback_curve, (ON_BrepFace* face,
const ON_Curve* curve,
SurfaceTree* tree = NULL,
double tolerance = BREP_FCP_ROOT_EPSILON,
- double flatness = 1.0e-3);
+ double flatness = 1.0e-3));
}
Modified: brlcad/branches/cmake/misc/win32-msvc8/libtie/libtie.vcproj
===================================================================
--- brlcad/branches/cmake/misc/win32-msvc8/libtie/libtie.vcproj 2011-01-06
21:33:31 UTC (rev 41993)
+++ brlcad/branches/cmake/misc/win32-msvc8/libtie/libtie.vcproj 2011-01-06
21:35:37 UTC (rev 41994)
@@ -53,7 +53,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../src/other/tcl/win;../../../src/other/tcl/generic;../../../include;../../../src/adrt/libtie/libtie;../../../src/adrt/libtie;../../../src/other/libz"
-
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BU_EXPORT_DLL;TIEBUILD;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;_CRT_SECURE_NO_WARNINGS"
+
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TIE_EXPORT_DLL;TIEBUILD;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
Modified: brlcad/branches/cmake/src/libfft/fft.h
===================================================================
--- brlcad/branches/cmake/src/libfft/fft.h 2011-01-06 21:33:31 UTC (rev
41993)
+++ brlcad/branches/cmake/src/libfft/fft.h 2011-01-06 21:35:37 UTC (rev
41994)
@@ -47,8 +47,8 @@
# endif
#endif
-FFT_EXPORT extern void splitdit(int N, int M);
-FFT_EXPORT extern void ditsplit(int n /* length */, int m /* n = 2^m */);
+FFT_EXPORT BU_EXTERN(void splitdit, (int N, int M));
+FFT_EXPORT BU_EXTERN(void ditsplit, (int n /* length */, int m /* n = 2^m */));
/*
* Local Variables:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
