Revision: 75932
http://sourceforge.net/p/brlcad/code/75932
Author: starseeker
Date: 2020-05-26 01:17:10 +0000 (Tue, 26 May 2020)
Log Message:
-----------
Merged changes from trunk through r75931
Modified Paths:
--------------
brlcad/branches/bioh/CMakeLists.txt
brlcad/branches/bioh/src/libbg/CMakeLists.txt
brlcad/branches/bioh/src/libdm/CMakeLists.txt
brlcad/branches/bioh/src/libicv/CMakeLists.txt
brlcad/branches/bioh/src/librt/CMakeLists.txt
brlcad/branches/bioh/src/other/libgdiam/gdiam.hpp
brlcad/branches/bioh/src/other/libnetpbm/pm.h
brlcad/branches/bioh/src/other/libnetpbm/ppm.h
brlcad/branches/bioh/src/other/libspsr/Src/SPSR.h
brlcad/branches/bioh/src/other/libvds/vds.h
brlcad/branches/bioh/src/other/lz4/lz4.h
brlcad/branches/bioh/src/other/poly2tri/poly2tri/common/shapes.h
brlcad/branches/bioh/src/other/poly2tri/poly2tri/sweep/cdt.h
brlcad/branches/bioh/src/other/stepcode/include/sc_export.h
Property Changed:
----------------
brlcad/branches/bioh/
brlcad/branches/bioh/src/other/
brlcad/branches/bioh/src/other/libgdiam/
brlcad/branches/bioh/src/other/libnetpbm/
brlcad/branches/bioh/src/other/libspsr/
brlcad/branches/bioh/src/other/libvds/
brlcad/branches/bioh/src/other/poly2tri/
brlcad/branches/bioh/src/other/stepcode/
Index: brlcad/branches/bioh
===================================================================
--- brlcad/branches/bioh 2020-05-26 00:09:53 UTC (rev 75931)
+++ brlcad/branches/bioh 2020-05-26 01:17:10 UTC (rev 75932)
Property changes on: brlcad/branches/bioh
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
/brlcad/branches/tcltk86:68300-75257
-/brlcad/trunk:75720-75926
\ No newline at end of property
+/brlcad/trunk:75720-75931
\ No newline at end of property
Modified: brlcad/branches/bioh/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/CMakeLists.txt 2020-05-26 00:09:53 UTC (rev 75931)
+++ brlcad/branches/bioh/CMakeLists.txt 2020-05-26 01:17:10 UTC (rev 75932)
@@ -1730,15 +1730,22 @@
CHECK_C_FLAG(pipe)
CHECK_CXX_FLAG(pipe)
-# Enable visibility restrictions. We have to deal with this on
-# Windows, so enable it wherever we can to keep the code working
-# across all platforms.
+# Enable visibility restrictions. We have to deal with this on Windows, so
+# enable it wherever we can to keep the code working across all platforms.
CHECK_C_FLAG(fvisibility=hidden)
CHECK_CXX_FLAG(fvisibility=hidden)
# If we can, hide internal library symbols
-if(MSVC OR FVISIBILITY_HIDDEN_CXX_FLAG_FOUND)
+if(FVISIBILITY_HIDDEN_CXX_FLAG_FOUND)
set(HIDE_INTERNAL_SYMBOLS 1)
-endif(MSVC OR FVISIBILITY_HIDDEN_CXX_FLAG_FOUND)
+endif(FVISIBILITY_HIDDEN_CXX_FLAG_FOUND)
+if(MSVC)
+ # On platforms other than MSVC, the hidden symbols are a convenience and may
+ # not be supported by system lib headers. With Visual Studio, they are a
+ # necessity - define an extra flag so we know to always set them in that
+ # case in order to properly link against the system libs.
+ set(HIDE_INTERNAL_SYMBOLS 1)
+ set(HIDE_INTERNAL_SYMBOLS_EXT 1)
+endif(MSVC)
# check for -fno-strict-aliasing
# XXX - THIS FLAG IS REQUIRED if any level of optimization is
Modified: brlcad/branches/bioh/src/libbg/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/src/libbg/CMakeLists.txt 2020-05-26 00:09:53 UTC
(rev 75931)
+++ brlcad/branches/bioh/src/libbg/CMakeLists.txt 2020-05-26 01:17:10 UTC
(rev 75932)
@@ -32,10 +32,18 @@
BRLCAD_ADDLIB(libbg "${LIBBG_SOURCES}" "libbn;libbu;SPSR;${P2T_LIBRARY}")
set_target_properties(libbg PROPERTIES VERSION 20.0.1 SOVERSION 20)
-if(HIDE_INTERNAL_SYMBOLS)
+if (HIDE_INTERNAL_SYMBOLS)
set_property(TARGET libbg APPEND PROPERTY COMPILE_DEFINITIONS
"SPSR_DLL_IMPORTS")
- set_property(TARGET libbg APPEND PROPERTY COMPILE_DEFINITIONS
"P2T_DLL_IMPORTS")
-endif(HIDE_INTERNAL_SYMBOLS)
+ if (TARGET poly2tri OR HIDE_INTERNAL_SYMBOLS_EXT)
+ set_property(TARGET libbg APPEND PROPERTY COMPILE_DEFINITIONS
"P2T_DLL_IMPORTS")
+ endif (TARGET poly2tri OR HIDE_INTERNAL_SYMBOLS_EXT)
+ if (TARGET libbg-obj)
+ set_property(TARGET libbg-obj APPEND PROPERTY COMPILE_DEFINITIONS
"SPSR_DLL_IMPORTS")
+ if (TARGET poly2tri OR HIDE_INTERNAL_SYMBOLS_EXT)
+ set_property(TARGET libbg-obj APPEND PROPERTY COMPILE_DEFINITIONS
"P2T_DLL_IMPORTS")
+ endif (TARGET poly2tri OR HIDE_INTERNAL_SYMBOLS_EXT)
+ endif (TARGET libbg-obj)
+endif (HIDE_INTERNAL_SYMBOLS)
add_subdirectory(tests)
Modified: brlcad/branches/bioh/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/src/libdm/CMakeLists.txt 2020-05-26 00:09:53 UTC
(rev 75931)
+++ brlcad/branches/bioh/src/libdm/CMakeLists.txt 2020-05-26 01:17:10 UTC
(rev 75932)
@@ -119,7 +119,14 @@
if(BRLCAD_ENABLE_OSG)
BRLCAD_ADDEXEC(osg-test osg-test.cpp "librt;libbu;${OSG_LIBRARIES}"
NO_STRICT NO_INSTALL)
if(HIDE_INTERNAL_SYMBOLS)
- set_property(TARGET libdm APPEND PROPERTY COMPILE_DEFINITIONS
"FREETYPE_DLL_IMPORTS")
+ if (TARGET osg OR HIDE_INTERNAL_SYMBOLS_EXT)
+ set_property(TARGET libdm APPEND PROPERTY COMPILE_DEFINITIONS
"FREETYPE_DLL_IMPORTS")
+ endif (TARGET osg OR HIDE_INTERNAL_SYMBOLS_EXT)
+ if(TARGET libdm-obj)
+ if (TARGET osg OR HIDE_INTERNAL_SYMBOLS_EXT)
+ set_property(TARGET libdm-obj APPEND PROPERTY COMPILE_DEFINITIONS
"FREETYPE_DLL_IMPORTS")
+ endif (TARGET osg OR HIDE_INTERNAL_SYMBOLS_EXT)
+ endif(TARGET libdm-obj)
endif(HIDE_INTERNAL_SYMBOLS)
endif(BRLCAD_ENABLE_OSG)
Modified: brlcad/branches/bioh/src/libicv/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/src/libicv/CMakeLists.txt 2020-05-26 00:09:53 UTC
(rev 75931)
+++ brlcad/branches/bioh/src/libicv/CMakeLists.txt 2020-05-26 01:17:10 UTC
(rev 75932)
@@ -26,9 +26,16 @@
BRLCAD_ADDLIB(libicv "${LIBICV_SOURCES}"
"libbu;libbn;${PNG_LIBRARIES};${NETPBM_LIBRARY}")
set_target_properties(libicv PROPERTIES VERSION 20.0.1 SOVERSION 20)
-if(HIDE_INTERNAL_SYMBOLS)
- set_property(TARGET libicv APPEND PROPERTY COMPILE_DEFINITIONS
"NETPBM_DLL_IMPORTS")
-endif(HIDE_INTERNAL_SYMBOLS)
+if (HIDE_INTERNAL_SYMBOLS)
+ if (TARGET netpbm OR HIDE_INTERNAL_SYMBOLS_EXT)
+ set_property(TARGET libicv APPEND PROPERTY COMPILE_DEFINITIONS
"NETPBM_DLL_IMPORTS")
+ endif (TARGET netpbm OR HIDE_INTERNAL_SYMBOLS_EXT)
+ if (TARGET libicv-obj)
+ if (TARGET netpbm OR HIDE_INTERNAL_SYMBOLS_EXT)
+ set_property(TARGET libicv-obj APPEND PROPERTY COMPILE_DEFINITIONS
"NETPBM_DLL_IMPORTS")
+ endif (TARGET netpbm OR HIDE_INTERNAL_SYMBOLS_EXT)
+ endif (TARGET libicv-obj)
+endif (HIDE_INTERNAL_SYMBOLS)
add_subdirectory(tests)
Modified: brlcad/branches/bioh/src/librt/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/src/librt/CMakeLists.txt 2020-05-26 00:09:53 UTC
(rev 75931)
+++ brlcad/branches/bioh/src/librt/CMakeLists.txt 2020-05-26 01:17:10 UTC
(rev 75932)
@@ -367,9 +367,28 @@
if(HIDE_INTERNAL_SYMBOLS)
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")
- set_property(TARGET librt APPEND PROPERTY COMPILE_DEFINITIONS
"LZ4_DLL_IMPORT=1")
+ if(TARGET vds OR HIDE_INTERNAL_SYMBOLS_EXT)
+ set_property(TARGET librt APPEND PROPERTY COMPILE_DEFINITIONS
"VDS_DLL_IMPORTS")
+ endif(TARGET vds OR HIDE_INTERNAL_SYMBOLS_EXT)
+ if(TARGET gdiam OR HIDE_INTERNAL_SYMBOLS_EXT)
+ set_property(TARGET librt APPEND PROPERTY COMPILE_DEFINITIONS
"GDIAM_DLL_IMPORTS")
+ endif(TARGET gdiam OR HIDE_INTERNAL_SYMBOLS_EXT)
+ if(TARGET lz4 OR HIDE_INTERNAL_SYMBOLS_EXT)
+ set_property(TARGET librt APPEND PROPERTY COMPILE_DEFINITIONS
"LZ4_DLL_IMPORT=1")
+ endif(TARGET lz4 OR HIDE_INTERNAL_SYMBOLS_EXT)
+ if (TARGET librt-obj)
+ set_property(TARGET librt-obj APPEND PROPERTY COMPILE_DEFINITIONS
"TIE_DLL_EXPORTS")
+ set_property(TARGET librt-obj APPEND PROPERTY COMPILE_DEFINITIONS
"DB5_DLL_EXPORTS")
+ if(TARGET vds OR HIDE_INTERNAL_SYMBOLS_EXT)
+ set_property(TARGET librt-obj APPEND PROPERTY COMPILE_DEFINITIONS
"VDS_DLL_IMPORTS")
+ endif(TARGET vds OR HIDE_INTERNAL_SYMBOLS_EXT)
+ if(TARGET gdiam OR HIDE_INTERNAL_SYMBOLS_EXT)
+ set_property(TARGET librt-obj APPEND PROPERTY COMPILE_DEFINITIONS
"GDIAM_DLL_IMPORTS")
+ endif(TARGET gdiam OR HIDE_INTERNAL_SYMBOLS_EXT)
+ if(TARGET lz4 OR HIDE_INTERNAL_SYMBOLS_EXT)
+ set_property(TARGET librt-obj APPEND PROPERTY COMPILE_DEFINITIONS
"LZ4_DLL_IMPORT=1")
+ endif(TARGET lz4 OR HIDE_INTERNAL_SYMBOLS_EXT)
+ endif (TARGET librt-obj)
endif(HIDE_INTERNAL_SYMBOLS)
# The following is build code for test applications used during
Index: brlcad/branches/bioh/src/other
===================================================================
--- brlcad/branches/bioh/src/other 2020-05-26 00:09:53 UTC (rev 75931)
+++ brlcad/branches/bioh/src/other 2020-05-26 01:17:10 UTC (rev 75932)
Property changes on: brlcad/branches/bioh/src/other
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/osg/src/other:62110-62113
/brlcad/branches/prep-cache/src/other:68236-68933
/brlcad/branches/tcltk86/src/other:68300-75257
-/brlcad/trunk/src/other:75720-75834,75891-75926
\ No newline at end of property
+/brlcad/trunk/src/other:75720-75834,75891-75931
\ No newline at end of property
Index: brlcad/branches/bioh/src/other/libgdiam
===================================================================
--- brlcad/branches/bioh/src/other/libgdiam 2020-05-26 00:09:53 UTC (rev
75931)
+++ brlcad/branches/bioh/src/other/libgdiam 2020-05-26 01:17:10 UTC (rev
75932)
Property changes on: brlcad/branches/bioh/src/other/libgdiam
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,5 ##
/brlcad/branches/osg/src/other/libgdiam:62110-62113
/brlcad/branches/prep-cache/src/other/libgdiam:68236-68933
/brlcad/branches/tcltk86/src/other/libgdiam:68300-75257
-/brlcad/branches/thirdparty_rework/src/other/libgdiam:75098-75134
\ No newline at end of property
+/brlcad/branches/thirdparty_rework/src/other/libgdiam:75098-75134
+/brlcad/trunk/src/other/libgdiam:75927-75931
\ No newline at end of property
Modified: brlcad/branches/bioh/src/other/libgdiam/gdiam.hpp
===================================================================
--- brlcad/branches/bioh/src/other/libgdiam/gdiam.hpp 2020-05-26 00:09:53 UTC
(rev 75931)
+++ brlcad/branches/bioh/src/other/libgdiam/gdiam.hpp 2020-05-26 01:17:10 UTC
(rev 75932)
@@ -32,13 +32,21 @@
# pragma clang diagnostic ignored "-Wfloat-equal"
#endif
+#if defined(_WIN32)
+# define COMPILER_DLLEXPORT __declspec(dllexport)
+# define COMPILER_DLLIMPORT __declspec(dllimport)
+#else
+# define COMPILER_DLLEXPORT __attribute__ ((visibility ("default")))
+# define COMPILER_DLLIMPORT __attribute__ ((visibility ("default")))
+#endif
+
#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)
+# define GDIAM_EXPORT COMPILER_DLLEXPORT
# elif defined(GDIAM_DLL_IMPORTS)
-# define GDIAM_EXPORT __declspec(dllimport)
+# define GDIAM_EXPORT COMPILER_DLLIMPORT
# else
# define GDIAM_EXPORT
# endif
Index: brlcad/branches/bioh/src/other/libnetpbm
===================================================================
--- brlcad/branches/bioh/src/other/libnetpbm 2020-05-26 00:09:53 UTC (rev
75931)
+++ brlcad/branches/bioh/src/other/libnetpbm 2020-05-26 01:17:10 UTC (rev
75932)
Property changes on: brlcad/branches/bioh/src/other/libnetpbm
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,5 ##
/brlcad/branches/osg/src/other/libnetpbm:62110-62113
/brlcad/branches/prep-cache/src/other/libnetpbm:68236-68933
/brlcad/branches/tcltk86/src/other/libnetpbm:68300-75257
-/brlcad/branches/thirdparty_rework/src/other/libnetpbm:75119
\ No newline at end of property
+/brlcad/branches/thirdparty_rework/src/other/libnetpbm:75119
+/brlcad/trunk/src/other/libnetpbm:75927-75931
\ No newline at end of property
Modified: brlcad/branches/bioh/src/other/libnetpbm/pm.h
===================================================================
--- brlcad/branches/bioh/src/other/libnetpbm/pm.h 2020-05-26 00:09:53 UTC
(rev 75931)
+++ brlcad/branches/bioh/src/other/libnetpbm/pm.h 2020-05-26 01:17:10 UTC
(rev 75932)
@@ -35,13 +35,21 @@
} /* to fake out automatic code indenters */
#endif
+#if defined(_WIN32)
+# define COMPILER_DLLEXPORT __declspec(dllexport)
+# define COMPILER_DLLIMPORT __declspec(dllimport)
+#else
+# define COMPILER_DLLEXPORT __attribute__ ((visibility ("default")))
+# define COMPILER_DLLIMPORT __attribute__ ((visibility ("default")))
+#endif
+
#ifndef NETPBM_EXPORT
# if defined(NETPBM_DLL_EXPORTS) && defined(NETPBM_DLL_IMPORTS)
# error "Only NETPBM_DLL_EXPORTS or NETPBM_DLL_IMPORTS can be defined, not
both."
# elif defined(NETPBM_DLL_EXPORTS)
-# define NETPBM_EXPORT __declspec(dllexport)
+# define NETPBM_EXPORT COMPILER_DLLEXPORT
# elif defined(NETPBM_DLL_IMPORTS)
-# define NETPBM_EXPORT __declspec(dllimport)
+# define NETPBM_EXPORT COMPILER_DLLIMPORT
# else
# define NETPBM_EXPORT
# endif
Modified: brlcad/branches/bioh/src/other/libnetpbm/ppm.h
===================================================================
--- brlcad/branches/bioh/src/other/libnetpbm/ppm.h 2020-05-26 00:09:53 UTC
(rev 75931)
+++ brlcad/branches/bioh/src/other/libnetpbm/ppm.h 2020-05-26 01:17:10 UTC
(rev 75932)
@@ -3,13 +3,21 @@
#ifndef _PPM_H_
#define _PPM_H_
+#if defined(_WIN32)
+# define COMPILER_DLLEXPORT __declspec(dllexport)
+# define COMPILER_DLLIMPORT __declspec(dllimport)
+#else
+# define COMPILER_DLLEXPORT __attribute__ ((visibility ("default")))
+# define COMPILER_DLLIMPORT __attribute__ ((visibility ("default")))
+#endif
+
#ifndef NETPBM_EXPORT
# if defined(NETPBM_DLL_EXPORTS) && defined(NETPBM_DLL_IMPORTS)
# error "Only NETPBM_DLL_EXPORTS or NETPBM_DLL_IMPORTS can be defined, not
both."
# elif defined(NETPBM_DLL_EXPORTS)
-# define NETPBM_EXPORT __declspec(dllexport)
+# define NETPBM_EXPORT COMPILER_DLLEXPORT
# elif defined(NETPBM_DLL_IMPORTS)
-# define NETPBM_EXPORT __declspec(dllimport)
+# define NETPBM_EXPORT COMPILER_DLLIMPORT
# else
# define NETPBM_EXPORT
# endif
Index: brlcad/branches/bioh/src/other/libspsr
===================================================================
--- brlcad/branches/bioh/src/other/libspsr 2020-05-26 00:09:53 UTC (rev
75931)
+++ brlcad/branches/bioh/src/other/libspsr 2020-05-26 01:17:10 UTC (rev
75932)
Property changes on: brlcad/branches/bioh/src/other/libspsr
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
/brlcad/branches/RELEASE/src/other/libspsr:71917-72242,72826-72858,74376-74454
/brlcad/branches/tcltk86/src/other/libspsr:71985-75257
-/brlcad/branches/thirdparty_rework/src/other/libspsr:75098-75129
\ No newline at end of property
+/brlcad/branches/thirdparty_rework/src/other/libspsr:75098-75129
+/brlcad/trunk/src/other/libspsr:75927-75931
\ No newline at end of property
Modified: brlcad/branches/bioh/src/other/libspsr/Src/SPSR.h
===================================================================
--- brlcad/branches/bioh/src/other/libspsr/Src/SPSR.h 2020-05-26 00:09:53 UTC
(rev 75931)
+++ brlcad/branches/bioh/src/other/libspsr/Src/SPSR.h 2020-05-26 01:17:10 UTC
(rev 75932)
@@ -31,13 +31,21 @@
#include "cvertex.h"
+#if defined(_WIN32)
+# define COMPILER_DLLEXPORT __declspec(dllexport)
+# define COMPILER_DLLIMPORT __declspec(dllimport)
+#else
+# define COMPILER_DLLEXPORT __attribute__ ((visibility ("default")))
+# define COMPILER_DLLIMPORT __attribute__ ((visibility ("default")))
+#endif
+
#ifndef SPSR_EXPORT
# if defined(SPSR_DLL_EXPORTS) && defined(SPSR_DLL_IMPORTS)
# error "Only SPSR_DLL_EXPORTS or SPSR_DLL_IMPORTS can be defined, not
both."
# elif defined(SPSR_DLL_EXPORTS)
-# define SPSR_EXPORT __declspec(dllexport)
+# define SPSR_EXPORT COMPILER_DLLEXPORT
# elif defined(SPSR_DLL_IMPORTS)
-# define SPSR_EXPORT __declspec(dllimport)
+# define SPSR_EXPORT COMPILER_DLLIMPORT
# else
# define SPSR_EXPORT
# endif
Index: brlcad/branches/bioh/src/other/libvds
===================================================================
--- brlcad/branches/bioh/src/other/libvds 2020-05-26 00:09:53 UTC (rev
75931)
+++ brlcad/branches/bioh/src/other/libvds 2020-05-26 01:17:10 UTC (rev
75932)
Property changes on: brlcad/branches/bioh/src/other/libvds
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,5 ##
/brlcad/branches/osg/src/other/libvds:62110-62113
/brlcad/branches/prep-cache/src/other/libvds:68236-68933
/brlcad/branches/tcltk86/src/other/libvds:68300-75257
-/brlcad/branches/thirdparty_rework/src/other/libvds:75131-75137
\ No newline at end of property
+/brlcad/branches/thirdparty_rework/src/other/libvds:75131-75137
+/brlcad/trunk/src/other/libvds:75927-75931
\ No newline at end of property
Modified: brlcad/branches/bioh/src/other/libvds/vds.h
===================================================================
--- brlcad/branches/bioh/src/other/libvds/vds.h 2020-05-26 00:09:53 UTC (rev
75931)
+++ brlcad/branches/bioh/src/other/libvds/vds.h 2020-05-26 01:17:10 UTC (rev
75932)
@@ -76,13 +76,21 @@
extern "C" {
#endif
+#if defined(_WIN32)
+# define COMPILER_DLLEXPORT __declspec(dllexport)
+# define COMPILER_DLLIMPORT __declspec(dllimport)
+#else
+# define COMPILER_DLLEXPORT __attribute__ ((visibility ("default")))
+# define COMPILER_DLLIMPORT __attribute__ ((visibility ("default")))
+#endif
+
#ifndef VDS_EXPORT
# if defined(VDS_DLL_EXPORTS) && defined(VDS_DLL_IMPORTS)
# error "Only VDS_DLL_EXPORTS or VDS_DLL_IMPORTS can be defined, not both."
# elif defined(VDS_DLL_EXPORTS)
-# define VDS_EXPORT __declspec(dllexport)
+# define VDS_EXPORT COMPILER_DLLEXPORT
# elif defined(VDS_DLL_IMPORTS)
-# define VDS_EXPORT __declspec(dllimport)
+# define VDS_EXPORT COMPILER_DLLIMPORT
# else
# define VDS_EXPORT
# endif
Modified: brlcad/branches/bioh/src/other/lz4/lz4.h
===================================================================
--- brlcad/branches/bioh/src/other/lz4/lz4.h 2020-05-26 00:09:53 UTC (rev
75931)
+++ brlcad/branches/bioh/src/other/lz4/lz4.h 2020-05-26 01:17:10 UTC (rev
75932)
@@ -73,10 +73,19 @@
* LZ4_DLL_EXPORT :
* Enable exporting of functions when building a Windows DLL
*/
+
+#if defined(_WIN32)
+# define COMPILER_DLLEXPORT __declspec(dllexport)
+# define COMPILER_DLLIMPORT __declspec(dllimport)
+#else
+# define COMPILER_DLLEXPORT __attribute__ ((visibility ("default")))
+# define COMPILER_DLLIMPORT __attribute__ ((visibility ("default")))
+#endif
+
#if defined(LZ4_DLL_EXPORT) && (LZ4_DLL_EXPORT==1)
-# define LZ4LIB_API __declspec(dllexport)
+# define LZ4LIB_API COMPILER_DLLEXPORT
#elif defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1)
-# define LZ4LIB_API __declspec(dllimport) /* It isn't required but allows to
generate better code, saving a function pointer load from the IAT and an
indirect jump.*/
+# define LZ4LIB_API COMPILER_DLLIMPORT /* It isn't required but allows to
generate better code, saving a function pointer load from the IAT and an
indirect jump.*/
#else
# define LZ4LIB_API
#endif
Index: brlcad/branches/bioh/src/other/poly2tri
===================================================================
--- brlcad/branches/bioh/src/other/poly2tri 2020-05-26 00:09:53 UTC (rev
75931)
+++ brlcad/branches/bioh/src/other/poly2tri 2020-05-26 01:17:10 UTC (rev
75932)
Property changes on: brlcad/branches/bioh/src/other/poly2tri
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,5 ##
/brlcad/branches/osg/src/other/poly2tri:62110-62113
/brlcad/branches/prep-cache/src/other/poly2tri:68236-68933
/brlcad/branches/tcltk86/src/other/poly2tri:68300-75257
-/brlcad/branches/thirdparty_rework/src/other/poly2tri:75098-75135
\ No newline at end of property
+/brlcad/branches/thirdparty_rework/src/other/poly2tri:75098-75135
+/brlcad/trunk/src/other/poly2tri:75927-75931
\ No newline at end of property
Modified: brlcad/branches/bioh/src/other/poly2tri/poly2tri/common/shapes.h
===================================================================
--- brlcad/branches/bioh/src/other/poly2tri/poly2tri/common/shapes.h
2020-05-26 00:09:53 UTC (rev 75931)
+++ brlcad/branches/bioh/src/other/poly2tri/poly2tri/common/shapes.h
2020-05-26 01:17:10 UTC (rev 75932)
@@ -33,13 +33,21 @@
#ifndef SHAPES_H
#define SHAPES_H
+#if defined(_WIN32)
+# define COMPILER_DLLEXPORT __declspec(dllexport)
+# define COMPILER_DLLIMPORT __declspec(dllimport)
+#else
+# define COMPILER_DLLEXPORT __attribute__ ((visibility ("default")))
+# define COMPILER_DLLIMPORT __attribute__ ((visibility ("default")))
+#endif
+
#ifndef P2T_EXPORT
# if defined(P2T_DLL_EXPORTS) && defined(P2T_DLL_IMPORTS)
# error "Only P2T_DLL_EXPORTS or P2T_DLL_IMPORTS can be defined, not both."
# elif defined(P2T_DLL_EXPORTS)
-# define P2T_EXPORT __declspec(dllexport)
+# define P2T_EXPORT COMPILER_DLLEXPORT
# elif defined(P2T_DLL_IMPORTS)
-# define P2T_EXPORT __declspec(dllimport)
+# define P2T_EXPORT COMPILER_DLLIMPORT
# else
# define P2T_EXPORT
# endif
Modified: brlcad/branches/bioh/src/other/poly2tri/poly2tri/sweep/cdt.h
===================================================================
--- brlcad/branches/bioh/src/other/poly2tri/poly2tri/sweep/cdt.h
2020-05-26 00:09:53 UTC (rev 75931)
+++ brlcad/branches/bioh/src/other/poly2tri/poly2tri/sweep/cdt.h
2020-05-26 01:17:10 UTC (rev 75932)
@@ -32,13 +32,21 @@
#ifndef CDT_H
#define CDT_H
+#if defined(_WIN32)
+# define COMPILER_DLLEXPORT __declspec(dllexport)
+# define COMPILER_DLLIMPORT __declspec(dllimport)
+#else
+# define COMPILER_DLLEXPORT __attribute__ ((visibility ("default")))
+# define COMPILER_DLLIMPORT __attribute__ ((visibility ("default")))
+#endif
+
#ifndef P2T_EXPORT
# if defined(P2T_DLL_EXPORTS) && defined(P2T_DLL_IMPORTS)
# error "Only P2T_DLL_EXPORTS or P2T_DLL_IMPORTS can be defined, not both."
# elif defined(P2T_DLL_EXPORTS)
-# define P2T_EXPORT __declspec(dllexport)
+# define P2T_EXPORT COMPILER_DLLEXPORT
# elif defined(P2T_DLL_IMPORTS)
-# define P2T_EXPORT __declspec(dllimport)
+# define P2T_EXPORT COMPILER_DLLIMPORT
# else
# define P2T_EXPORT
# endif
Index: brlcad/branches/bioh/src/other/stepcode
===================================================================
--- brlcad/branches/bioh/src/other/stepcode 2020-05-26 00:09:53 UTC (rev
75931)
+++ brlcad/branches/bioh/src/other/stepcode 2020-05-26 01:17:10 UTC (rev
75932)
Property changes on: brlcad/branches/bioh/src/other/stepcode
___________________________________________________________________
Modified: svn:mergeinfo
## -8,4 +8,4 ##
/brlcad/branches/prep-cache/src/other/stepcode:68236-68933
/brlcad/branches/tcltk86/src/other/stepcode:68300-75257
/brlcad/branches/thirdparty_rework/src/other/stepcode:75098-75163
-/brlcad/trunk/src/other/stepcode:75728-75834,75891-75926
\ No newline at end of property
+/brlcad/trunk/src/other/stepcode:75728-75834,75891-75931
\ No newline at end of property
Modified: brlcad/branches/bioh/src/other/stepcode/include/sc_export.h
===================================================================
--- brlcad/branches/bioh/src/other/stepcode/include/sc_export.h 2020-05-26
00:09:53 UTC (rev 75931)
+++ brlcad/branches/bioh/src/other/stepcode/include/sc_export.h 2020-05-26
01:17:10 UTC (rev 75932)
@@ -16,7 +16,7 @@
# elif defined(SC_BASE_DLL_EXPORTS)
# define SC_BASE_EXPORT COMPILER_DLLEXPORT
# elif defined(SC_BASE_DLL_IMPORTS)
-# define SC_BASE_EXPORT __declspec(dllimport)
+# define SC_BASE_EXPORT COMPILER_DLLIMPORT
# else
# define SC_BASE_EXPORT
# endif
@@ -29,7 +29,7 @@
# elif defined(SC_EXPRESS_DLL_EXPORTS)
# define SC_EXPRESS_EXPORT COMPILER_DLLEXPORT
# elif defined(SC_EXPRESS_DLL_IMPORTS)
-# define SC_EXPRESS_EXPORT __declspec(dllimport)
+# define SC_EXPRESS_EXPORT COMPILER_DLLIMPORT
# else
# define SC_EXPRESS_EXPORT
# endif
@@ -42,7 +42,7 @@
# elif defined(SC_EXPPP_DLL_EXPORTS)
# define SC_EXPPP_EXPORT COMPILER_DLLEXPORT
# elif defined(SC_EXPPP_DLL_IMPORTS)
-# define SC_EXPPP_EXPORT __declspec(dllimport)
+# define SC_EXPPP_EXPORT COMPILER_DLLIMPORT
# else
# define SC_EXPPP_EXPORT
# endif
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
