Revision: 56598
http://sourceforge.net/p/brlcad/code/56598
Author: starseeker
Date: 2013-08-05 20:13:21 +0000 (Mon, 05 Aug 2013)
Log Message:
-----------
Untested, and almost certainly not right yet, but start working on the Windows
DLL logic for gdiam.
Modified Paths:
--------------
brlcad/trunk/src/librt/CMakeLists.txt
brlcad/trunk/src/other/libgdiam/CMakeLists.txt
brlcad/trunk/src/other/libgdiam/gdiam.hpp
Modified: brlcad/trunk/src/librt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/librt/CMakeLists.txt 2013-08-05 20:09:16 UTC (rev
56597)
+++ brlcad/trunk/src/librt/CMakeLists.txt 2013-08-05 20:13:21 UTC (rev
56598)
@@ -296,6 +296,7 @@
SET_PROPERTY(TARGET librt APPEND PROPERTY COMPILE_DEFINITIONS
"TIE_DLL_EXPORTS")
SET_PROPERTY(TARGET librt APPEND PROPERTY COMPILE_DEFINITIONS
"DB5_DLL_EXPORTS")
SET_PROPERTY(TARGET librt APPEND PROPERTY COMPILE_DEFINITIONS
"VDS_DLL_IMPORTS")
+ SET_PROPERTY(TARGET librt APPEND PROPERTY COMPILE_DEFINITIONS
"GDIAM_DLL_IMPORTS")
endif(CPP_DLL_DEFINES)
Modified: brlcad/trunk/src/other/libgdiam/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/libgdiam/CMakeLists.txt 2013-08-05 20:09:16 UTC
(rev 56597)
+++ brlcad/trunk/src/other/libgdiam/CMakeLists.txt 2013-08-05 20:13:21 UTC
(rev 56598)
@@ -24,6 +24,18 @@
LIBRARY DESTINATION ${LIB_DIR}
ARCHIVE DESTINATION ${LIB_DIR})
+if(MSVC)
+ set_property(TARGET libgdiam APPEND PROPERTY COMPILE_DEFINITIONS
"VDS_DLL_EXPORTS")
+endif(MSVC)
+
+if(BUILD_STATIC_LIBS)
+ add_library(libgdiam-static STATIC ${CORE_SRCS})
+ if(CMAKE_CL_64)
+ set_target_properties(libgdiam-static PROPERTIES STATIC_LIBRARY_FLAGS
"/machine:x64")
+ endif(CMAKE_CL_64)
+endif(BUILD_STATIC_LIBS)
+
+
if(ENABLE_GDIAM_TESTING)
# Enable ctest
ENABLE_TESTING()
Modified: brlcad/trunk/src/other/libgdiam/gdiam.hpp
===================================================================
--- brlcad/trunk/src/other/libgdiam/gdiam.hpp 2013-08-05 20:09:16 UTC (rev
56597)
+++ brlcad/trunk/src/other/libgdiam/gdiam.hpp 2013-08-05 20:13:21 UTC (rev
56598)
@@ -23,6 +23,18 @@
#ifndef __GDIAM__H
#define __GDIAM__H
+#ifndef GDIAM_EXPORT
+# if defined(GDIAM_DLL_EXPORTS) && defined(GDIAM_DLL_IMPORTS)
+# error "Only GDIAM_DLL_EXPORTS or GDIAM_DLL_IMPORTS can be defined, not
both."
+# elif defined(GDIAM_DLL_EXPORTS)
+# define GDIAM_EXPORT __declspec(dllexport)
+# elif defined(GDIAM_DLL_IMPORTS)
+# define GDIAM_EXPORT __declspec(dllimport)
+# else
+# define GDIAM_EXPORT
+# endif
+#endif
+
#define GDIAM_DIM 3
typedef double gdiam_real;
typedef gdiam_real gdiam_point_t[ GDIAM_DIM ];
@@ -691,7 +703,7 @@
gdiam_real eps ) ;
gdiam_bbox gdiam_approx_mvbb_grid( gdiam_point * start, int size,
int grid_size );
-gdiam_bbox gdiam_approx_mvbb_grid_sample( gdiam_point * start, int size,
+GDIAM_EXPORT gdiam_bbox gdiam_approx_mvbb_grid_sample( gdiam_point * start,
int size,
int grid_size, int sample_size );
gdiam_bbox gdiam_approx_mvbb_grid_sample( gdiam_real * start, int size,
int grid_size, int sample_size );
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
