Revision: 41983
http://brlcad.svn.sourceforge.net/brlcad/?rev=41983&view=rev
Author: starseeker
Date: 2011-01-06 20:16:54 +0000 (Thu, 06 Jan 2011)
Log Message:
-----------
Update cmake branch to r41982
Modified Paths:
--------------
brlcad/branches/cmake/src/adrt/libtie/tie.h
brlcad/branches/cmake/src/adrt/libtie/tie_kdtree.c
brlcad/branches/cmake/src/libfft/fft.h
Modified: brlcad/branches/cmake/src/adrt/libtie/tie.h
===================================================================
--- brlcad/branches/cmake/src/adrt/libtie/tie.h 2011-01-06 20:11:34 UTC (rev
41982)
+++ brlcad/branches/cmake/src/adrt/libtie/tie.h 2011-01-06 20:16:54 UTC (rev
41983)
@@ -47,6 +47,19 @@
#define TIE_SINGLE_PRECISION 0
#define TIE_DOUBLE_PRECISION 1
+#ifndef TIE_EXPORT
+# if defined(_WIN32) && !defined(__CYGWIN__) && defined(BRLCAD_DLL)
+# ifdef TIE_EXPORT_DLL
+# define TIE_EXPORT __declspec(dllexport)
+# else
+# define TIE_EXPORT __declspec(dllimport)
+# endif
+# else
+# define TIE_EXPORT
+# endif
+#endif
+
+
/*
* define which precision to use, 0 is 'float' and 1 is 'double'.
* Default to double precision to protect those not familiar.
@@ -83,19 +96,6 @@
# error "Unknown precision"
#endif
-/*
- * The BU_EXPORT macro is unable to cope with building a windows DLL that uses
- * exported global variables from another DLL, so we punt.
- */
-#if WIN32
-# ifdef TIEBUILD
-# define WINHACK __declspec(dllexport)
-# else
-# define WINHACK __declspec(dllimport)
-# endif
-#else
-# define WINHACK
-#endif
/* TCOPY(type, source base, source offset, dest base, dest offset) */
#define TCOPY(_t, _fv, _fi, _tv, _ti) { \
@@ -160,11 +160,11 @@
#endif
} tie_t;
-BU_EXPORT BU_EXTERN(void TIE_VAL(tie_kdtree_free), (tie_t *tie));
-BU_EXPORT BU_EXTERN(uint32_t TIE_VAL(tie_kdtree_cache_free), (tie_t *tie, void
**cache));
-BU_EXPORT BU_EXTERN(void TIE_VAL(tie_kdtree_cache_load), (tie_t *tie, void
*cache, uint32_t size));
-BU_EXPORT BU_EXTERN(void TIE_VAL(tie_kdtree_prep), (tie_t *tie));
-WINHACK extern tfloat TIE_VAL(TIE_PREC);
+TIE_EXPORT BU_EXTERN(void TIE_VAL(tie_kdtree_free), (tie_t *tie));
+TIE_EXPORT BU_EXTERN(uint32_t TIE_VAL(tie_kdtree_cache_free), (tie_t *tie,
void **cache));
+TIE_EXPORT BU_EXTERN(void TIE_VAL(tie_kdtree_cache_load), (tie_t *tie, void
*cache, uint32_t size));
+TIE_EXPORT BU_EXTERN(void TIE_VAL(tie_kdtree_prep), (tie_t *tie));
+TIE_EXPORT extern tfloat TIE_VAL(TIE_PREC);
/* compatability macros */
#define tie_kdtree_free TIE_VAL(tie_kdtree_free)
@@ -173,13 +173,13 @@
#define tie_kdtree_prep TIE_VAL(tie_kdtree_prep)
#define TIE_PREC TIE_VAL(TIE_PREC)
-WINHACK extern int tie_check_degenerate;
+TIE_EXPORT extern int tie_check_degenerate;
-BU_EXPORT BU_EXTERN(void TIE_VAL(tie_init), (tie_t *tie, unsigned int tri_num,
unsigned int kdmethod));
-BU_EXPORT BU_EXTERN(void TIE_VAL(tie_free), (tie_t *tie));
-BU_EXPORT BU_EXTERN(void TIE_VAL(tie_prep), (tie_t *tie));
-BU_EXPORT BU_EXTERN(void* TIE_VAL(tie_work), (tie_t *tie, tie_ray_t *ray,
tie_id_t *id, void *(*hitfunc)(tie_ray_t*, tie_id_t*, tie_tri_t*, void *ptr),
void *ptr));
-BU_EXPORT BU_EXTERN(void TIE_VAL(tie_push), (tie_t *tie, TIE_3 **tlist,
unsigned int tnum, void *plist, unsigned int pstride));
+TIE_EXPORT BU_EXTERN(void TIE_VAL(tie_init), (tie_t *tie, unsigned int
tri_num, unsigned int kdmethod));
+TIE_EXPORT BU_EXTERN(void TIE_VAL(tie_free), (tie_t *tie));
+TIE_EXPORT BU_EXTERN(void TIE_VAL(tie_prep), (tie_t *tie));
+TIE_EXPORT BU_EXTERN(void* TIE_VAL(tie_work), (tie_t *tie, tie_ray_t *ray,
tie_id_t *id, void *(*hitfunc)(tie_ray_t*, tie_id_t*, tie_tri_t*, void *ptr),
void *ptr));
+TIE_EXPORT BU_EXTERN(void TIE_VAL(tie_push), (tie_t *tie, TIE_3 **tlist,
unsigned int tnum, void *plist, unsigned int pstride));
/* backwards compatible macros */
#define tie_init TIE_VAL(tie_init)
Modified: brlcad/branches/cmake/src/adrt/libtie/tie_kdtree.c
===================================================================
--- brlcad/branches/cmake/src/adrt/libtie/tie_kdtree.c 2011-01-06 20:11:34 UTC
(rev 41982)
+++ brlcad/branches/cmake/src/adrt/libtie/tie_kdtree.c 2011-01-06 20:16:54 UTC
(rev 41983)
@@ -98,7 +98,7 @@
if (min > rad || max < -rad) return 0;
-BU_EXPORT tfloat TIE_VAL(TIE_PREC);
+TIE_EXPORT tfloat TIE_VAL(TIE_PREC);
/*************************************************************
**************** PRIVATE FUNCTIONS **************************
Modified: brlcad/branches/cmake/src/libfft/fft.h
===================================================================
--- brlcad/branches/cmake/src/libfft/fft.h 2011-01-06 20:11:34 UTC (rev
41982)
+++ brlcad/branches/cmake/src/libfft/fft.h 2011-01-06 20:16:54 UTC (rev
41983)
@@ -35,9 +35,21 @@
# define M_SQRT2 1.41421356237309504880168872421
#endif
-extern void splitdit(int N, int M);
-extern void ditsplit(int n /* length */, int m /* n = 2^m */);
+#ifndef FFT_EXPORT
+# if defined(_WIN32) && !defined(__CYGWIN__) && defined(BRLCAD_DLL)
+# ifdef FFT_EXPORT_DLL
+# define FFT_EXPORT __declspec(dllexport)
+# else
+# define FFT_EXPORT __declspec(dllimport)
+# endif
+# else
+# define FFT_EXPORT
+# endif
+#endif
+FFT_EXPORT extern void splitdit(int N, int M);
+FFT_EXPORT extern void ditsplit(int n /* length */, int m /* n = 2^m */);
+
/*
* Local Variables:
* mode: C
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
