Revision: 75892
http://sourceforge.net/p/brlcad/code/75892
Author: starseeker
Date: 2020-05-23 13:42:39 +0000 (Sat, 23 May 2020)
Log Message:
-----------
Merge bioh branch addition of fvisibility=hidden back into trunk. This will
exercise what had previously been Windows-only logic for hiding library
internal symbols during compilation, and eliminate one of the common sources of
Windows build problems introduced by development on other platforms. The
practical consequence visible to developers will be that *_EXPORT labeling of
public functions in headers will now be necessary for all platforms, not just
Windows.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/include/analyze/defines.h
brlcad/trunk/include/bg/defines.h
brlcad/trunk/include/bn/defines.h
brlcad/trunk/include/brep/defines.h
brlcad/trunk/include/bu/defines.h
brlcad/trunk/include/common.h
brlcad/trunk/include/dm/defines.h
brlcad/trunk/include/fb.h
brlcad/trunk/include/fft.h
brlcad/trunk/include/gcv/defines.h
brlcad/trunk/include/ged/defines.h
brlcad/trunk/include/icv/defines.h
brlcad/trunk/include/libtermio.h
brlcad/trunk/include/nmg.h
brlcad/trunk/include/optical/defines.h
brlcad/trunk/include/pc.h
brlcad/trunk/include/pkg.h
brlcad/trunk/include/rt/db5.h
brlcad/trunk/include/rt/defines.h
brlcad/trunk/include/rt/tie.h
brlcad/trunk/include/tclcad.h
brlcad/trunk/include/wdb.h
brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
brlcad/trunk/misc/win32-msvc/CMakeLists.txt
brlcad/trunk/regress/pkg/CMakeLists.txt
brlcad/trunk/regress/pkg/regress_pkg.cpp
brlcad/trunk/src/CMakeLists.txt
brlcad/trunk/src/adrt/CMakeLists.txt
brlcad/trunk/src/adrt/librender/render_internal.h
brlcad/trunk/src/archer/CMakeLists.txt
brlcad/trunk/src/brlman/CMakeLists.txt
brlcad/trunk/src/bwish/CMakeLists.txt
brlcad/trunk/src/conv/iges/CMakeLists.txt
brlcad/trunk/src/conv/ply/CMakeLists.txt
brlcad/trunk/src/conv/ply/rply.h
brlcad/trunk/src/conv/step/ap203e2-g/CMakeLists.txt
brlcad/trunk/src/conv/step/ap214-g/CMakeLists.txt
brlcad/trunk/src/conv/step/ap242-g/CMakeLists.txt
brlcad/trunk/src/conv/step/g-ap203e2/CMakeLists.txt
brlcad/trunk/src/conv/step/g-ap214/CMakeLists.txt
brlcad/trunk/src/conv/step/g-ap242/CMakeLists.txt
brlcad/trunk/src/conv/step/g-step/CMakeLists.txt
brlcad/trunk/src/conv/step/ifc-g/CMakeLists.txt
brlcad/trunk/src/conv/step/step-g/CMakeLists.txt
brlcad/trunk/src/conv/step/util/CMakeLists.txt
brlcad/trunk/src/external/Creo/CMakeLists.txt
brlcad/trunk/src/external/Cubit/CMakeLists.txt
brlcad/trunk/src/external/Unigraphics/CMakeLists.txt
brlcad/trunk/src/libbg/CMakeLists.txt
brlcad/trunk/src/libbrep/CMakeLists.txt
brlcad/trunk/src/libbu/tests/dylib/CMakeLists.txt
brlcad/trunk/src/libbu/tests/dylib/dylib.h
brlcad/trunk/src/libdm/CMakeLists.txt
brlcad/trunk/src/libfb/CMakeLists.txt
brlcad/trunk/src/libgcv/CMakeLists.txt
brlcad/trunk/src/libgcv/plugins/CMakeLists.txt
brlcad/trunk/src/libgcv/plugins/obj/wfobj/CMakeLists.txt
brlcad/trunk/src/libgcv/plugins/obj/wfobj/obj_util.h
brlcad/trunk/src/libicv/CMakeLists.txt
brlcad/trunk/src/librt/CMakeLists.txt
brlcad/trunk/src/libtclcad/tkImgFmtPIX.c
brlcad/trunk/src/mged/CMakeLists.txt
brlcad/trunk/src/other/openNURBS/CMakeLists.txt
brlcad/trunk/src/other/openNURBS/opennurbs_defines.h
brlcad/trunk/src/other/stepcode/include/sc_export.h
brlcad/trunk/src/other/stepcode/src/base/judy/src/judy.h
brlcad/trunk/src/other/stepcode/src/exp2cxx/classes_wrapper.cc
Property Changed:
----------------
brlcad/trunk/
brlcad/trunk/include/
brlcad/trunk/regress/
brlcad/trunk/src/libbu/
brlcad/trunk/src/other/
brlcad/trunk/src/other/stepcode/
Index: brlcad/trunk
===================================================================
--- brlcad/trunk 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk 2020-05-23 13:42:39 UTC (rev 75892)
Property changes on: brlcad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
/brlcad/branches/RELEASE:57439,57447-57860,69901-69913,70323-70333,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140,75682-75685
-/brlcad/branches/bioh:75720-75736,75740-75742
+/brlcad/branches/bioh:75720-75736,75740-75742,75860-75891
/brlcad/branches/brep-debug:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69168,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100
/brlcad/branches/bullet:62518
/brlcad/branches/cmake:43219
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/CMakeLists.txt 2020-05-23 13:42:39 UTC (rev 75892)
@@ -114,14 +114,9 @@
include(CMakeDependentOption)
#---------------------------------------------------------------------
-# Check whether we need to add import/export lines to libraries
-if(MSVC)
- set(CPP_DLL_DEFINES 1)
-endif(MSVC)
-
# Define an option to use OBJECT libraries - when we build this
# way, we also need position independent code.
-cmake_dependent_option(USE_OBJECT_LIBS "Use OBJECT libraries" ON "NOT
CPP_DLL_DEFINES" OFF)
+cmake_dependent_option(USE_OBJECT_LIBS "Use OBJECT libraries" ON "NOT MSVC"
OFF)
mark_as_advanced(USE_OBJECT_LIBS)
if(USE_OBJECT_LIBS)
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
@@ -1735,6 +1730,16 @@
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.
+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)
+ set(HIDE_INTERNAL_SYMBOLS 1)
+endif(MSVC OR FVISIBILITY_HIDDEN_CXX_FLAG_FOUND)
+
# check for -fno-strict-aliasing
# XXX - THIS FLAG IS REQUIRED if any level of optimization is
# enabled with GCC as we do use aliasing and type-punning.
@@ -1954,7 +1959,20 @@
CONFIG_H_APPEND(BRLCAD "#define HAVE_WARN_UNUSED_RESULT_ATTRIBUTE 1\n")
endif(HAVE_WARN_UNUSED_RESULT_ATTRIBUTE)
+# Check whether the compiler supports __attribute__((visibility ("default")))
+check_c_source_compiles(" __attribute__((visibility (\"default\"))) int
*func(int *); int *func(int *v){(*v)-=1; return v;} int main(int argc, char
*argv[]) {int v = 1; int *vp = func(&v); return *vp;}"
HAVE_VISIBILITY_DEFAULT_ATTRIBUTE)
+if(HAVE_VISIBILITY_DEFAULT_ATTRIBUTE)
+ CONFIG_H_APPEND(BRLCAD "#define COMPILER_DLLEXPORT __attribute__
((visibility (\"default\")))\n")
+ CONFIG_H_APPEND(BRLCAD "#define COMPILER_DLLIMPORT __attribute__
((visibility (\"default\")))\n")
+endif(HAVE_VISIBILITY_DEFAULT_ATTRIBUTE)
+# Check whether the compiler supports __declspec(dllexport)
+check_c_source_compiles(" __declspec(dllexport) int *func(int *); int
*func(int *v){(*v)-=1; return v;} int main(int argc, char *argv[]) {int v = 1;
int *vp = func(&v); return *vp;}" HAVE_DECLSPEC_EXPORT_ATTRIBUTE)
+if(HAVE_DECLSPEC_EXPORT_ATTRIBUTE)
+ CONFIG_H_APPEND(BRLCAD "#define COMPILER_DLLEXPORT __declspec(dllexport)\n")
+ CONFIG_H_APPEND(BRLCAD "#define COMPILER_DLLIMPORT __declspec(dllimport)\n")
+endif(HAVE_DECLSPEC_EXPORT_ATTRIBUTE)
+
# Silence check for unused arguments (used to silence clang warnings about
# unused options on the command line). By default clang generates a lot of
# warnings about such arguments, and we don't really care.
@@ -2478,6 +2496,27 @@
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_BAK})
endif("${HAVE_TIMESETEVENT}" MATCHES "^${HAVE_TIMESETEVENT}$")
+# Grumble... find_library doesn't find ws2_32. Until we come up with
+# working tests for these, set them by hand
+if(MSVC)
+ set(COMCTL32_LIBRARY comctl32.lib)
+ set(IMM32_LIBRARY imm32.lib)
+ # TODO - mged and adrt call this specific OpenGL library out - why doesn't
+ # OPENGL_LIBRARIES do the trick?
+ set(OPENGL32_LIBRARY opengl32.lib)
+ set(PSAPI_LIB psapi.lib)
+ set(RPCRT_LIB rpcrt4.lib)
+ set(WINSOCK_LIB ws2_32.lib)
+ set(WS2_32_LIBRARY ws2_32)
+else(MSVC)
+ set(COMCTL32_LIBRARY "")
+ set(IMM32_LIBRARY "")
+ set(OPENGL32_LIBRARY "")
+ set(PSAPI_LIB "")
+ set(RPCRT_LIB "")
+ set(WINSOCK_LIB "")
+ set(WS2_32_LIBRARY "")
+endif(MSVC)
# *******************************************************************
if(BRLCAD_PRINT_MSGS)
@@ -3055,12 +3094,7 @@
return 0;
}
")
-# Grumble... find_library doesn't find ws2_32, so set it by hand.
-if(CPP_DLL_DEFINES)
- set(WS2_32_LIBRARY ws2_32)
-else(CPP_DLL_DEFINES)
- set(WS2_32_LIBRARY "")
-endif(CPP_DLL_DEFINES)
+
file(WRITE "${CMAKE_BINARY_DIR}/CMakeTmp/report_hostname.c"
"${report_hostname_src}")
try_run(RH_RESULT RH_COMPILED "${CMAKE_BINARY_DIR}/CMakeTmp"
"${CMAKE_BINARY_DIR}/CMakeTmp/report_hostname.c"
Index: brlcad/trunk/include
===================================================================
--- brlcad/trunk/include 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/include 2020-05-23 13:42:39 UTC (rev 75892)
Property changes on: brlcad/trunk/include
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
/brlcad/branches/RELEASE/include:57439,57447-57860,69901-69913,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140
-/brlcad/branches/bioh/include:75720-75736,75740-75742
+/brlcad/branches/bioh/include:75720-75736,75740-75742,75860-75891
/brlcad/branches/brep-debug/include:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927
/brlcad/branches/bullet/include:62518
/brlcad/branches/cmake/include:43219
Modified: brlcad/trunk/include/analyze/defines.h
===================================================================
--- brlcad/trunk/include/analyze/defines.h 2020-05-23 13:35:38 UTC (rev
75891)
+++ brlcad/trunk/include/analyze/defines.h 2020-05-23 13:42:39 UTC (rev
75892)
@@ -35,9 +35,9 @@
# if defined(ANALYZE_DLL_EXPORTS) && defined(ANALYZE_DLL_IMPORTS)
# error "Only ANALYZE_DLL_EXPORTS or ANALYZE_DLL_IMPORTS can be defined,
not both."
# elif defined(ANALYZE_DLL_EXPORTS)
-# define ANALYZE_EXPORT __declspec(dllexport)
+# define ANALYZE_EXPORT COMPILER_DLLEXPORT
# elif defined(ANALYZE_DLL_IMPORTS)
-# define ANALYZE_EXPORT __declspec(dllimport)
+# define ANALYZE_EXPORT COMPILER_DLLIMPORT
# else
# define ANALYZE_EXPORT
# endif
Modified: brlcad/trunk/include/bg/defines.h
===================================================================
--- brlcad/trunk/include/bg/defines.h 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/include/bg/defines.h 2020-05-23 13:42:39 UTC (rev 75892)
@@ -35,9 +35,9 @@
# if defined(BG_DLL_EXPORTS) && defined(BG_DLL_IMPORTS)
# error "Only BG_DLL_EXPORTS or BG_DLL_IMPORTS can be defined, not both."
# elif defined(BG_DLL_EXPORTS)
-# define BG_EXPORT __declspec(dllexport)
+# define BG_EXPORT COMPILER_DLLEXPORT
# elif defined(BG_DLL_IMPORTS)
-# define BG_EXPORT __declspec(dllimport)
+# define BG_EXPORT COMPILER_DLLIMPORT
# else
# define BG_EXPORT
# endif
Modified: brlcad/trunk/include/bn/defines.h
===================================================================
--- brlcad/trunk/include/bn/defines.h 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/include/bn/defines.h 2020-05-23 13:42:39 UTC (rev 75892)
@@ -34,9 +34,9 @@
# if defined(BN_DLL_EXPORTS) && defined(BN_DLL_IMPORTS)
# error "Only BN_DLL_EXPORTS or BN_DLL_IMPORTS can be defined, not both."
# elif defined(BN_DLL_EXPORTS)
-# define BN_EXPORT __declspec(dllexport)
+# define BN_EXPORT COMPILER_DLLEXPORT
# elif defined(BN_DLL_IMPORTS)
-# define BN_EXPORT __declspec(dllimport)
+# define BN_EXPORT COMPILER_DLLIMPORT
# else
# define BN_EXPORT
# endif
Modified: brlcad/trunk/include/brep/defines.h
===================================================================
--- brlcad/trunk/include/brep/defines.h 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/include/brep/defines.h 2020-05-23 13:42:39 UTC (rev 75892)
@@ -67,9 +67,9 @@
# if defined(BREP_DLL_EXPORTS) && defined(BREP_DLL_IMPORTS)
# error "Only BREP_DLL_EXPORTS or BREP_DLL_IMPORTS can be defined, not
both."
# elif defined(BREP_DLL_EXPORTS)
-# define BREP_EXPORT __declspec(dllexport)
+# define BREP_EXPORT COMPILER_DLLEXPORT
# elif defined(BREP_DLL_IMPORTS)
-# define BREP_EXPORT __declspec(dllimport)
+# define BREP_EXPORT COMPILER_DLLIMPORT
# else
# define BREP_EXPORT
# endif
Modified: brlcad/trunk/include/bu/defines.h
===================================================================
--- brlcad/trunk/include/bu/defines.h 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/include/bu/defines.h 2020-05-23 13:42:39 UTC (rev 75892)
@@ -38,9 +38,9 @@
# if defined(BU_DLL_EXPORTS) && defined(BU_DLL_IMPORTS)
# error "Only BU_DLL_EXPORTS or BU_DLL_IMPORTS can be defined, not both."
# elif defined(BU_DLL_EXPORTS)
-# define BU_EXPORT __declspec(dllexport)
+# define BU_EXPORT COMPILER_DLLEXPORT
# elif defined(BU_DLL_IMPORTS)
-# define BU_EXPORT __declspec(dllimport)
+# define BU_EXPORT COMPILER_DLLIMPORT
# else
# define BU_EXPORT
# endif
Modified: brlcad/trunk/include/common.h
===================================================================
--- brlcad/trunk/include/common.h 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/include/common.h 2020-05-23 13:42:39 UTC (rev 75892)
@@ -524,7 +524,6 @@
# define CPP_FILELINE __FILE__ ":" CPP_XSTR(__LINE__)
#endif
-
#endif /* COMMON_H */
/** @} */
Modified: brlcad/trunk/include/dm/defines.h
===================================================================
--- brlcad/trunk/include/dm/defines.h 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/include/dm/defines.h 2020-05-23 13:42:39 UTC (rev 75892)
@@ -26,9 +26,9 @@
# if defined(DM_DLL_EXPORTS) && defined(DM_DLL_IMPORTS)
# error "Only DM_DLL_EXPORTS or DM_DLL_IMPORTS can be defined, not both."
# elif defined(DM_DLL_EXPORTS)
-# define DM_EXPORT __declspec(dllexport)
+# define DM_EXPORT COMPILER_DLLEXPORT
# elif defined(DM_DLL_IMPORTS)
-# define DM_EXPORT __declspec(dllimport)
+# define DM_EXPORT COMPILER_DLLIMPORT
# else
# define DM_EXPORT
# endif
Modified: brlcad/trunk/include/fb.h
===================================================================
--- brlcad/trunk/include/fb.h 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/include/fb.h 2020-05-23 13:42:39 UTC (rev 75892)
@@ -32,9 +32,9 @@
# if defined(FB_DLL_EXPORTS) && defined(FB_DLL_IMPORTS)
# error "Only FB_DLL_EXPORTS or FB_DLL_IMPORTS can be defined, not both."
# elif defined(FB_DLL_EXPORTS)
-# define FB_EXPORT __declspec(dllexport)
+# define FB_EXPORT COMPILER_DLLEXPORT
# elif defined(FB_DLL_IMPORTS)
-# define FB_EXPORT __declspec(dllimport)
+# define FB_EXPORT COMPILER_DLLIMPORT
# else
# define FB_EXPORT
# endif
Modified: brlcad/trunk/include/fft.h
===================================================================
--- brlcad/trunk/include/fft.h 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/include/fft.h 2020-05-23 13:42:39 UTC (rev 75892)
@@ -44,9 +44,9 @@
# if defined(FFT_DLL_EXPORTS) && defined(FFT_DLL_IMPORTS)
# error "Only FFT_DLL_EXPORTS or FFT_DLL_IMPORTS can be defined, not both."
# elif defined(FFT_DLL_EXPORTS)
-# define FFT_EXPORT __declspec(dllexport)
+# define FFT_EXPORT COMPILER_DLLEXPORT
# elif defined(FFT_DLL_IMPORTS)
-# define FFT_EXPORT __declspec(dllimport)
+# define FFT_EXPORT COMPILER_DLLIMPORT
# else
# define FFT_EXPORT
# endif
Modified: brlcad/trunk/include/gcv/defines.h
===================================================================
--- brlcad/trunk/include/gcv/defines.h 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/include/gcv/defines.h 2020-05-23 13:42:39 UTC (rev 75892)
@@ -34,9 +34,9 @@
# if defined(GCV_DLL_EXPORTS) && defined(GCV_DLL_IMPORTS)
# error "Only GCV_DLL_EXPORTS or GCV_DLL_IMPORTS can be defined, not both."
# elif defined(GCV_DLL_EXPORTS)
-# define GCV_EXPORT __declspec(dllexport)
+# define GCV_EXPORT COMPILER_DLLEXPORT
# elif defined(GCV_DLL_IMPORTS)
-# define GCV_EXPORT __declspec(dllimport)
+# define GCV_EXPORT COMPILER_DLLIMPORT
# else
# define GCV_EXPORT
# endif
Modified: brlcad/trunk/include/ged/defines.h
===================================================================
--- brlcad/trunk/include/ged/defines.h 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/include/ged/defines.h 2020-05-23 13:42:39 UTC (rev 75892)
@@ -42,9 +42,9 @@
# if defined(GED_DLL_EXPORTS) && defined(GED_DLL_IMPORTS)
# error "Only GED_DLL_EXPORTS or GED_DLL_IMPORTS can be defined, not both."
# elif defined(GED_DLL_EXPORTS)
-# define GED_EXPORT __declspec(dllexport)
+# define GED_EXPORT COMPILER_DLLEXPORT
# elif defined(GED_DLL_IMPORTS)
-# define GED_EXPORT __declspec(dllimport)
+# define GED_EXPORT COMPILER_DLLIMPORT
# else
# define GED_EXPORT
# endif
Modified: brlcad/trunk/include/icv/defines.h
===================================================================
--- brlcad/trunk/include/icv/defines.h 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/include/icv/defines.h 2020-05-23 13:42:39 UTC (rev 75892)
@@ -39,9 +39,9 @@
# if defined(ICV_DLL_EXPORTS) && defined(ICV_DLL_IMPORTS)
# error "Only ICV_DLL_EXPORTS or ICV_DLL_IMPORTS can be defined, not both."
# elif defined(ICV_DLL_EXPORTS)
-# define ICV_EXPORT __declspec(dllexport)
+# define ICV_EXPORT COMPILER_DLLEXPORT
# elif defined(ICV_DLL_IMPORTS)
-# define ICV_EXPORT __declspec(dllimport)
+# define ICV_EXPORT COMPILER_DLLIMPORT
# else
# define ICV_EXPORT
# endif
Modified: brlcad/trunk/include/libtermio.h
===================================================================
--- brlcad/trunk/include/libtermio.h 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/include/libtermio.h 2020-05-23 13:42:39 UTC (rev 75892)
@@ -47,22 +47,33 @@
# endif /* BSD */
#endif /* HAVE_TERMIOS_H */
+#ifndef TERMIO_EXPORT
+# if defined(TERMIO_DLL_EXPORTS) && defined(TERMIO_DLL_IMPORTS)
+# error "Only TERMIO_DLL_EXPORTS or TERMIO_DLL_IMPORTS can be defined, not
both."
+# elif defined(TERMIO_DLL_EXPORTS)
+# define TERMIO_EXPORT COMPILER_DLLEXPORT
+# elif defined(TERMIO_DLL_IMPORTS)
+# define TERMIO_EXPORT COMPILER_DLLIMPORT
+# else
+# define TERMIO_EXPORT
+# endif
+#endif
__BEGIN_DECLS
void clr_Cbreak(int fd);
-void set_Cbreak(int fd);
+TERMIO_EXPORT void set_Cbreak(int fd);
void clr_Raw(int fd);
-void set_Raw(int fd);
+TERMIO_EXPORT void set_Raw(int fd);
void set_Echo(int fd);
-void clr_Echo(int fd);
+TERMIO_EXPORT void clr_Echo(int fd);
void set_Tabs(int fd);
void clr_Tabs(int fd);
void set_HUPCL(int fd);
void clr_CRNL(int fd);
unsigned short get_O_Speed(int fd);
-void save_Tty(int fd);
-void reset_Tty(int fd);
+TERMIO_EXPORT void save_Tty(int fd);
+TERMIO_EXPORT void reset_Tty(int fd);
int save_Fil_Stat(int fd);
int reset_Fil_Stat(int fd);
int set_O_NDELAY(int fd);
Modified: brlcad/trunk/include/nmg.h
===================================================================
--- brlcad/trunk/include/nmg.h 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/include/nmg.h 2020-05-23 13:42:39 UTC (rev 75892)
@@ -86,9 +86,9 @@
# if defined(NMG_DLL_EXPORTS) && defined(NMG_DLL_IMPORTS)
# error "Only NMG_DLL_EXPORTS or NMG_DLL_IMPORTS can be defined, not both."
# elif defined(NMG_DLL_EXPORTS)
-# define NMG_EXPORT __declspec(dllexport)
+# define NMG_EXPORT COMPILER_DLLEXPORT
# elif defined(NMG_DLL_IMPORTS)
-# define NMG_EXPORT __declspec(dllimport)
+# define NMG_EXPORT COMPILER_DLLIMPORT
# else
# define NMG_EXPORT
# endif
Modified: brlcad/trunk/include/optical/defines.h
===================================================================
--- brlcad/trunk/include/optical/defines.h 2020-05-23 13:35:38 UTC (rev
75891)
+++ brlcad/trunk/include/optical/defines.h 2020-05-23 13:42:39 UTC (rev
75892)
@@ -42,9 +42,9 @@
# if defined(OPTICAL_DLL_EXPORTS) && defined(OPTICAL_DLL_IMPORTS)
# error "Only OPTICAL_DLL_EXPORTS or OPTICAL_DLL_IMPORTS can be defined,
not both."
# elif defined(OPTICAL_DLL_EXPORTS)
-# define OPTICAL_EXPORT __declspec(dllexport)
+# define OPTICAL_EXPORT COMPILER_DLLEXPORT
# elif defined(OPTICAL_DLL_IMPORTS)
-# define OPTICAL_EXPORT __declspec(dllimport)
+# define OPTICAL_EXPORT COMPILER_DLLIMPORT
# else
# define OPTICAL_EXPORT
# endif
Modified: brlcad/trunk/include/pc.h
===================================================================
--- brlcad/trunk/include/pc.h 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/include/pc.h 2020-05-23 13:42:39 UTC (rev 75892)
@@ -39,9 +39,9 @@
# if defined(PC_DLL_EXPORTS) && defined(PC_DLL_IMPORTS)
# error "Only PC_DLL_EXPORTS or PC_DLL_IMPORTS can be defined, not both."
# elif defined(PC_DLL_EXPORTS)
-# define PC_EXPORT __declspec(dllexport)
+# define PC_EXPORT COMPILER_DLLEXPORT
# elif defined(PC_DLL_IMPORTS)
-# define PC_EXPORT __declspec(dllimport)
+# define PC_EXPORT COMPILER_DLLIMPORT
# else
# define PC_EXPORT
# endif
Modified: brlcad/trunk/include/pkg.h
===================================================================
--- brlcad/trunk/include/pkg.h 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/include/pkg.h 2020-05-23 13:42:39 UTC (rev 75892)
@@ -38,9 +38,9 @@
# if defined(PKG_DLL_EXPORTS) && defined(PKG_DLL_IMPORTS)
# error "Only PKG_DLL_EXPORTS or PKG_DLL_IMPORTS can be defined, not both."
# elif defined(PKG_DLL_EXPORTS)
-# define PKG_EXPORT __declspec(dllexport)
+# define PKG_EXPORT COMPILER_DLLEXPORT
# elif defined(PKG_DLL_IMPORTS)
-# define PKG_EXPORT __declspec(dllimport)
+# define PKG_EXPORT COMPILER_DLLIMPORT
# else
# define PKG_EXPORT
# endif
@@ -51,6 +51,9 @@
extern "C" {
#endif
+/* ?? used in remrt */
+PKG_EXPORT extern int pkg_permport;
+
struct pkg_conn;
typedef void (*pkg_callback)(struct pkg_conn*, char*);
Modified: brlcad/trunk/include/rt/db5.h
===================================================================
--- brlcad/trunk/include/rt/db5.h 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/include/rt/db5.h 2020-05-23 13:42:39 UTC (rev 75892)
@@ -41,9 +41,9 @@
# if defined(RT_DLL_EXPORTS) && defined(RT_DLL_IMPORTS)
# error "Only RT_DLL_EXPORTS or RT_DLL_IMPORTS can be defined, not both."
# elif defined(RT_DLL_EXPORTS)
-# define RT_EXPORT __declspec(dllexport)
+# define RT_EXPORT COMPILER_DLLEXPORT
# elif defined(RT_DLL_IMPORTS)
-# define RT_EXPORT __declspec(dllimport)
+# define RT_EXPORT COMPILER_DLLIMPORT
# else
# define RT_EXPORT
# endif
Modified: brlcad/trunk/include/rt/defines.h
===================================================================
--- brlcad/trunk/include/rt/defines.h 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/include/rt/defines.h 2020-05-23 13:42:39 UTC (rev 75892)
@@ -33,9 +33,9 @@
# if defined(RT_DLL_EXPORTS) && defined(RT_DLL_IMPORTS)
# error "Only RT_DLL_EXPORTS or RT_DLL_IMPORTS can be defined, not both."
# elif defined(RT_DLL_EXPORTS)
-# define RT_EXPORT __declspec(dllexport)
+# define RT_EXPORT COMPILER_DLLEXPORT
# elif defined(RT_DLL_IMPORTS)
-# define RT_EXPORT __declspec(dllimport)
+# define RT_EXPORT COMPILER_DLLIMPORT
# else
# define RT_EXPORT
# endif
Modified: brlcad/trunk/include/rt/tie.h
===================================================================
--- brlcad/trunk/include/rt/tie.h 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/include/rt/tie.h 2020-05-23 13:42:39 UTC (rev 75892)
@@ -35,9 +35,9 @@
# if defined(RT_DLL_EXPORTS) && defined(RT_DLL_IMPORTS)
# error "Only RT_DLL_EXPORTS or RT_DLL_IMPORTS can be defined, not both."
# elif defined(RT_DLL_EXPORTS)
-# define RT_EXPORT __declspec(dllexport)
+# define RT_EXPORT COMPILER_DLLEXPORT
# elif defined(RT_DLL_IMPORTS)
-# define RT_EXPORT __declspec(dllimport)
+# define RT_EXPORT COMPILER_DLLIMPORT
# else
# define RT_EXPORT
# endif
Modified: brlcad/trunk/include/tclcad.h
===================================================================
--- brlcad/trunk/include/tclcad.h 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/include/tclcad.h 2020-05-23 13:42:39 UTC (rev 75892)
@@ -46,9 +46,9 @@
# if defined(TCLCAD_DLL_EXPORTS) && defined(TCLCAD_DLL_IMPORTS)
# error "Only TCLCAD_DLL_EXPORTS or TCLCAD_DLL_IMPORTS can be defined, not
both."
# elif defined(TCLCAD_DLL_EXPORTS)
-# define TCLCAD_EXPORT __declspec(dllexport)
+# define TCLCAD_EXPORT COMPILER_DLLEXPORT
# elif defined(TCLCAD_DLL_IMPORTS)
-# define TCLCAD_EXPORT __declspec(dllimport)
+# define TCLCAD_EXPORT COMPILER_DLLIMPORT
# else
# define TCLCAD_EXPORT
# endif
Modified: brlcad/trunk/include/wdb.h
===================================================================
--- brlcad/trunk/include/wdb.h 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/include/wdb.h 2020-05-23 13:42:39 UTC (rev 75892)
@@ -59,9 +59,9 @@
# if defined(WDB_DLL_EXPORTS) && defined(WDB_DLL_IMPORTS)
# error "Only WDB_DLL_EXPORTS or WDB_DLL_IMPORTS can be defined, not both."
# elif defined(WDB_DLL_EXPORTS)
-# define WDB_EXPORT __declspec(dllexport)
+# define WDB_EXPORT COMPILER_DLLEXPORT
# elif defined(WDB_DLL_IMPORTS)
-# define WDB_EXPORT __declspec(dllimport)
+# define WDB_EXPORT COMPILER_DLLIMPORT
# else
# define WDB_EXPORT
# endif
Modified: brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2020-05-23 13:35:38 UTC
(rev 75891)
+++ brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2020-05-23 13:42:39 UTC
(rev 75892)
@@ -465,11 +465,11 @@
set(lsrcslist $<TARGET_OBJECTS:${libname}-obj>)
set_target_properties(${libname}-obj PROPERTIES FOLDER "BRL-CAD OBJECT
Libraries${SUBFOLDER}")
- if(CPP_DLL_DEFINES)
+ if(HIDE_INTERNAL_SYMBOLS)
string(REPLACE "lib" "" LOWERCORE "${libname}")
string(TOUPPER ${LOWERCORE} UPPER_CORE)
set_property(TARGET ${libname}-obj APPEND PROPERTY COMPILE_DEFINITIONS
"${UPPER_CORE}_DLL_EXPORTS")
- endif(CPP_DLL_DEFINES)
+ endif(HIDE_INTERNAL_SYMBOLS)
if(NOT "${libslist}" STREQUAL "" AND NOT "${libslist}" STREQUAL "NONE")
foreach(ll ${libslist})
@@ -486,12 +486,12 @@
add_library(${libname} SHARED ${lsrcslist} ${L_SHARED_SRCS})
- if(CPP_DLL_DEFINES)
+ if(HIDE_INTERNAL_SYMBOLS)
string(REPLACE "lib" "" LOWERCORE "${libname}")
string(TOUPPER ${LOWERCORE} UPPER_CORE)
set_property(TARGET ${libname} APPEND PROPERTY COMPILE_DEFINITIONS
"${UPPER_CORE}_DLL_EXPORTS")
set_property(GLOBAL APPEND PROPERTY ${libname}_DLL_DEFINES
"${UPPER_CORE}_DLL_IMPORTS")
- endif(CPP_DLL_DEFINES)
+ endif(HIDE_INTERNAL_SYMBOLS)
endif(L_SHARED OR (BUILD_SHARED_LIBS AND NOT L_STATIC))
@@ -502,9 +502,9 @@
set(libstatic ${libname}-static)
endif(L_STATIC)
add_library(${libstatic} STATIC ${lsrcslist} ${L_STATIC_SRCS})
- if(NOT CPP_DLL_DEFINES)
+ if(NOT MSVC)
set_target_properties(${libstatic} PROPERTIES OUTPUT_NAME "${libname}")
- endif(NOT CPP_DLL_DEFINES)
+ endif(NOT MSVC)
endif(L_STATIC OR (BUILD_STATIC_LIBS AND NOT L_SHARED))
# Make sure we don't end up with outputs named liblib...
Modified: brlcad/trunk/misc/win32-msvc/CMakeLists.txt
===================================================================
--- brlcad/trunk/misc/win32-msvc/CMakeLists.txt 2020-05-23 13:35:38 UTC (rev
75891)
+++ brlcad/trunk/misc/win32-msvc/CMakeLists.txt 2020-05-23 13:42:39 UTC (rev
75892)
@@ -1,9 +1,9 @@
# build DLL
add_subdirectory(Dll)
-if(CPP_DLL_DEFINES)
+if(MSVC)
add_library(bs SHARED bootstrap.cpp)
-endif(CPP_DLL_DEFINES)
+endif(MSVC)
CMAKEFILES(CMakeLists.txt)
Index: brlcad/trunk/regress
===================================================================
--- brlcad/trunk/regress 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/regress 2020-05-23 13:42:39 UTC (rev 75892)
Property changes on: brlcad/trunk/regress
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,5 ##
/brlcad/branches/RELEASE/regress:57439,57447-57860,69901-69913,71917-72242,72525-72534,72826-72858,74376-74454
+/brlcad/branches/bioh/regress:75860-75891
/brlcad/branches/brep-debug/regress:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927
/brlcad/branches/bullet/regress:62518
/brlcad/branches/cmake/regress:43219
Modified: brlcad/trunk/regress/pkg/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/pkg/CMakeLists.txt 2020-05-23 13:35:38 UTC (rev
75891)
+++ brlcad/trunk/regress/pkg/CMakeLists.txt 2020-05-23 13:42:39 UTC (rev
75892)
@@ -6,6 +6,7 @@
)
BRLCAD_ADDEXEC(regress_pkg regress_pkg.cpp
"libpkg;libbu;${CMAKE_THREAD_LIBS_INIT}" NO_INSTALL)
+target_compile_definitions(regress_pkg PUBLIC BRLCADBUILD HAVE_CONFIG_H)
set_target_properties(regress_pkg PROPERTIES FOLDER "BRL-CAD Regression
Tests/libpkg")
add_test(NAME regress-pkg
Modified: brlcad/trunk/regress/pkg/regress_pkg.cpp
===================================================================
--- brlcad/trunk/regress/pkg/regress_pkg.cpp 2020-05-23 13:35:38 UTC (rev
75891)
+++ brlcad/trunk/regress/pkg/regress_pkg.cpp 2020-05-23 13:42:39 UTC (rev
75892)
@@ -131,7 +131,7 @@
} else if (client == PKC_ERROR) {
pkg_close(client);
client = PKC_NULL;
- bu_log("ERROR: no clients connected to server after %d seconds
waiting\n");
+ bu_log("ERROR: client == PKC_ERROR\n");
bu_exit(-1, "Server exiting\n");
continue;
}
Modified: brlcad/trunk/src/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/CMakeLists.txt 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/src/CMakeLists.txt 2020-05-23 13:42:39 UTC (rev 75892)
@@ -17,13 +17,8 @@
add_definitions(
-D_CRT_SECURE_NO_WARNINGS
)
- # FIXME: these should be proper library checks, not based on MSVC "platform"
- set(WINSOCK_LIB ws2_32.lib)
- set(PSAPI_LIB psapi.lib)
- set(RPCRT_LIB rpcrt4.lib)
endif(MSVC)
-
# We need to define a number of "components" to allow for easy building of
# subsets of BRL-CAD. We will control this process with an advanced
# variable named BRLCAD_ENABLE_TARGETS - if set to 0 (default) everything
Modified: brlcad/trunk/src/adrt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/adrt/CMakeLists.txt 2020-05-23 13:35:38 UTC (rev
75891)
+++ brlcad/trunk/src/adrt/CMakeLists.txt 2020-05-23 13:42:39 UTC (rev
75892)
@@ -69,12 +69,8 @@
)
BRLCAD_INCLUDE_DIRS(isst_dirs)
- set(isst_libs libtclcad librender libdm ${TCL_LIBRARY} ${OPENGL_LIBRARIES})
+ set(isst_libs libtclcad librender libdm ${TCL_LIBRARY} ${OPENGL_LIBRARIES}
${IMM32_LIBRARY} ${COMCTL32_LIBRARY} ${OPENGL32_LIBRARY})
- if(CPP_DLL_DEFINES)
- set(isst_libs ${isst_libs} imm32.lib comctl32.lib opengl32.lib)
- endif(CPP_DLL_DEFINES)
-
BRLCAD_ADDDATA(isst.tcl tclscripts/isst)
BRLCAD_ADDEXEC(isst isst.c "${isst_libs}" GUI)
add_dependencies(isst isst_tcl_cp)
Modified: brlcad/trunk/src/adrt/librender/render_internal.h
===================================================================
--- brlcad/trunk/src/adrt/librender/render_internal.h 2020-05-23 13:35:38 UTC
(rev 75891)
+++ brlcad/trunk/src/adrt/librender/render_internal.h 2020-05-23 13:42:39 UTC
(rev 75892)
@@ -24,6 +24,7 @@
#ifndef ADRT_LIBRENDER_RENDER_INTERNAL_H
#define ADRT_LIBRENDER_RENDER_INTERNAL_H
+#include "common.h"
#include "rt/tie.h"
#ifndef RENDER_EXPORT
@@ -32,9 +33,9 @@
# elif defined(STATIC_BUILD)
# define RENDER_EXPORT
# elif defined(RENDER_DLL_EXPORTS)
-# define RENDER_EXPORT __declspec(dllexport)
+# define RENDER_EXPORT COMPILER_DLLEXPORT
# elif defined(RENDER_DLL_IMPORTS)
-# define RENDER_EXPORT __declspec(dllimport)
+# define RENDER_EXPORT COMPILER_DLLIMPORT
# else
# define RENDER_EXPORT
# endif
Modified: brlcad/trunk/src/archer/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/archer/CMakeLists.txt 2020-05-23 13:35:38 UTC (rev
75891)
+++ brlcad/trunk/src/archer/CMakeLists.txt 2020-05-23 13:42:39 UTC (rev
75892)
@@ -9,12 +9,8 @@
BRLCAD_ADDDATA(archer_launch.tcl tclscripts/archer)
-set(archer_libs libtclcad libbu ${ITCL_LIBRARY} ${ITK_LIBRARY} ${TCL_LIBRARY})
+set(archer_libs libtclcad libbu ${ITCL_LIBRARY} ${ITK_LIBRARY} ${TCL_LIBRARY}
${IMM32_LIBRARY} ${COMCTL32_LIBRARY})
-if(CPP_DLL_DEFINES)
- set(archer_libs ${archer_libs} imm32.lib comctl32.lib)
-endif(CPP_DLL_DEFINES)
-
# NOTE: Building "GUI" doesn't matter except on Windows, but on Windows archer
# currently works only in graphical mode - might as well behave "nicely" there.
# If/when we add MGED's ability to work in "classic" mode, Archer will have
Modified: brlcad/trunk/src/brlman/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/brlman/CMakeLists.txt 2020-05-23 13:35:38 UTC (rev
75891)
+++ brlcad/trunk/src/brlman/CMakeLists.txt 2020-05-23 13:42:39 UTC (rev
75892)
@@ -9,16 +9,12 @@
BRLCAD_ADDDATA(brlman.tcl tclscripts/brlman)
-set(brlman_libs libtclcad libbu ${TCL_LIBRARY})
+set(brlman_libs libtclcad libbu ${TCL_LIBRARY} ${IMM32_LIBRARY}
${COMCTL32_LIBRARY})
if(TARGET Tkhtml)
set(brlman_libs ${brlman_libs} Tkhtml)
endif(TARGET Tkhtml)
-if(CPP_DLL_DEFINES)
- set(brlman_libs ${brlman_libs} imm32.lib comctl32.lib)
-endif(CPP_DLL_DEFINES)
-
# Building "GUI" doesn't matter except on Windows, but
# on Windows brlman works only in graphical mode - might
# as well behave "nicely" there.
Modified: brlcad/trunk/src/bwish/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/bwish/CMakeLists.txt 2020-05-23 13:35:38 UTC (rev
75891)
+++ brlcad/trunk/src/bwish/CMakeLists.txt 2020-05-23 13:42:39 UTC (rev
75892)
@@ -25,16 +25,12 @@
# If we have Tk enabled, we want bwish too
if(BRLCAD_ENABLE_TK)
- set(bwish_libs libtclcad libbu ${TCL_LIBRARY} ${ITCL_LIBRARY} ${TK_LIBRARY}
${ITK_LIBRARY})
+ set(bwish_libs libtclcad libbu ${TCL_LIBRARY} ${ITCL_LIBRARY} ${TK_LIBRARY}
${ITK_LIBRARY} ${IMM32_LIBRARY} ${COMCTL32_LIBRARY})
if(TARGET libtermio)
set(bwish_libs ${bwish_libs} libtermio)
endif(TARGET libtermio)
- if(CPP_DLL_DEFINES)
- set(bwish_libs ${bwish_libs} imm32.lib comctl32.lib )
- endif(CPP_DLL_DEFINES)
-
BRLCAD_ADDEXEC(bwish "main.c;cmd.c;input.c" "${bwish_libs}" GUI)
set_target_properties(bwish PROPERTIES COMPILE_DEFINITIONS "BWISH=1")
set_target_properties(bwish PROPERTIES FOLDER "BRL-CAD Executables")
Modified: brlcad/trunk/src/conv/iges/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/iges/CMakeLists.txt 2020-05-23 13:35:38 UTC (rev
75891)
+++ brlcad/trunk/src/conv/iges/CMakeLists.txt 2020-05-23 13:42:39 UTC (rev
75892)
@@ -7,10 +7,6 @@
list(REMOVE_DUPLICATES IGES_INCLUDE_DIRS)
include_directories(${IGES_INCLUDE_DIRS})
-#if(MSVC)
-# set(WIN32LIBS ${WINSOCK_LIB} Rpcrt4.lib)
-#endif(MSVC)
-
#add_executable(iges
# BrepHandler.cpp
# brlcad_brep.cpp
@@ -17,7 +13,7 @@
# n_iges.cpp
# n_main.cpp
#)
-#target_link_libraries(iges libwdb librt libbu ${OPENNURBS_LIBRARIES}
${WIN32LIBS} ${M_LIBRARY})
+#target_link_libraries(iges libwdb librt libbu ${OPENNURBS_LIBRARIES}
${WIN32LIBS} ${M_LIBRARY} ${WINSOCK_LIB} ${RPCRT_LIB})
#install(TARGETS iges RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
set(iges-g_SRCS
Modified: brlcad/trunk/src/conv/ply/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/ply/CMakeLists.txt 2020-05-23 13:35:38 UTC (rev
75891)
+++ brlcad/trunk/src/conv/ply/CMakeLists.txt 2020-05-23 13:42:39 UTC (rev
75892)
@@ -8,10 +8,10 @@
BRLCAD_ADDEXEC(ply-g "ply-g.c;rply.c" "librt;libnmg;libbu;libwdb")
BRLCAD_ADDEXEC(g-ply "g-ply.c;rply.c" "librt;libnmg;libbu")
-if (CPP_DLL_DEFINES)
+if (HIDE_INTERNAL_SYMBOLS)
set_property(TARGET ply-g APPEND PROPERTY COMPILE_DEFINITIONS
"RPLY_DLL_IMPORTS")
set_property(TARGET g-ply APPEND PROPERTY COMPILE_DEFINITIONS
"RPLY_DLL_IMPORTS")
-endif (CPP_DLL_DEFINES)
+endif (HIDE_INTERNAL_SYMBOLS)
CMAKEFILES(
CMakeLists.txt
Modified: brlcad/trunk/src/conv/ply/rply.h
===================================================================
--- brlcad/trunk/src/conv/ply/rply.h 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/src/conv/ply/rply.h 2020-05-23 13:42:39 UTC (rev 75892)
@@ -15,9 +15,9 @@
# if defined(RPLY_DLL_EXPORTS) && defined(RPLY_DLL_IMPORTS)
# error "Only RPLY_DLL_EXPORTS or RPLY_DLL_IMPORTS can be defined, not
both."
# elif defined(RPLY_DLL_EXPORTS)
-# define RPLY_EXPORT __declspec(dllexport)
+# define RPLY_EXPORT COMPILER_DLLEXPORT
# elif defined(RPLY_DLL_IMPORTS)
-# define RPLY_EXPORT __declspec(dllimport)
+# define RPLY_EXPORT COMPILER_DLLIMPORT
# else
# define RPLY_EXPORT
# endif
Modified: brlcad/trunk/src/conv/step/ap203e2-g/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/ap203e2-g/CMakeLists.txt 2020-05-23 13:35:38 UTC
(rev 75891)
+++ brlcad/trunk/src/conv/step/ap203e2-g/CMakeLists.txt 2020-05-23 13:42:39 UTC
(rev 75892)
@@ -238,7 +238,7 @@
BRLCAD_ADDEXEC(ap203e2-g "${ap203e2g_SOURCES}" "${ap203e2g_LIBS}" NO_STRICT)
add_dependencies(ap203e2-g step-express-${SCHEMA_NAME}-ap203e2g)
-if(MSVC)
+if (HIDE_INTERNAL_SYMBOLS)
set(ap203e2g_IMPORTS
BU_DLL_IMPORTS
RT_DLL_IMPORTS
@@ -250,7 +250,7 @@
)
list(APPEND ap203e2g_IMPORTS ${ap203e2g_IMPORTS})
set_target_properties(step-g PROPERTIES COMPILE_DEFINITIONS
"${ap203e2g_IMPORTS}")
-endif(MSVC)
+endif (HIDE_INTERNAL_SYMBOLS)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/trunk/src/conv/step/ap214-g/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/ap214-g/CMakeLists.txt 2020-05-23 13:35:38 UTC
(rev 75891)
+++ brlcad/trunk/src/conv/step/ap214-g/CMakeLists.txt 2020-05-23 13:42:39 UTC
(rev 75892)
@@ -239,7 +239,7 @@
BRLCAD_ADDEXEC(ap214-g "${ap214g_SOURCES}" "${ap214g_LIBS}" NO_STRICT)
add_dependencies(ap214-g step-express-${SCHEMA_NAME}-ap214g)
-if(MSVC)
+if (HIDE_INTERNAL_SYMBOLS)
set(ap214g_IMPORTS
BU_DLL_IMPORTS
RT_DLL_IMPORTS
@@ -251,7 +251,7 @@
)
list(APPEND ap214g_IMPORTS ${ap214g_IMPORTS})
set_target_properties(step-g PROPERTIES COMPILE_DEFINITIONS
"${ap214g_IMPORTS}")
-endif(MSVC)
+endif (HIDE_INTERNAL_SYMBOLS)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/trunk/src/conv/step/ap242-g/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/ap242-g/CMakeLists.txt 2020-05-23 13:35:38 UTC
(rev 75891)
+++ brlcad/trunk/src/conv/step/ap242-g/CMakeLists.txt 2020-05-23 13:42:39 UTC
(rev 75892)
@@ -238,7 +238,7 @@
BRLCAD_ADDEXEC(ap242-g "${ap242g_SOURCES}" "${ap242g_LIBS}" NO_STRICT)
add_dependencies(ap242-g step-express-${SCHEMA_NAME}-ap242g)
-if(MSVC)
+if (HIDE_INTERNAL_SYMBOLS)
set(ap242g_IMPORTS
BU_DLL_IMPORTS
RT_DLL_IMPORTS
@@ -250,7 +250,7 @@
)
list(APPEND ap242g_IMPORTS ${ap242g_IMPORTS})
set_target_properties(step-g PROPERTIES COMPILE_DEFINITIONS
"${ap242g_IMPORTS}")
-endif(MSVC)
+endif (HIDE_INTERNAL_SYMBOLS)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/trunk/src/conv/step/g-ap203e2/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/g-ap203e2/CMakeLists.txt 2020-05-23 13:35:38 UTC
(rev 75891)
+++ brlcad/trunk/src/conv/step/g-ap203e2/CMakeLists.txt 2020-05-23 13:42:39 UTC
(rev 75892)
@@ -45,7 +45,7 @@
BRLCAD_ADDEXEC(g-ap203e2 "${gap203e2_SOURCES}" "${gap203e2_LIBS}" NO_STRICT)
add_dependencies(g-ap203e2 step-express-${SCHEMA_NAME}-gap203e2)
-if(MSVC)
+if (HIDE_INTERNAL_SYMBOLS)
set(gap203e2_IMPORTS
BU_DLL_IMPORTS
BN_DLL_IMPORTS
@@ -58,7 +58,7 @@
)
list(APPEND gap203e2_IMPORTS ${gap203e2_IMPORTS})
set_target_properties(g-step PROPERTIES COMPILE_DEFINITIONS
"${gap203e2_IMPORTS}")
-endif(MSVC)
+endif (HIDE_INTERNAL_SYMBOLS)
set(IGNORE_FILES
CMakeLists.txt
Modified: brlcad/trunk/src/conv/step/g-ap214/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/g-ap214/CMakeLists.txt 2020-05-23 13:35:38 UTC
(rev 75891)
+++ brlcad/trunk/src/conv/step/g-ap214/CMakeLists.txt 2020-05-23 13:42:39 UTC
(rev 75892)
@@ -46,7 +46,7 @@
BRLCAD_ADDEXEC(g-ap214 "${gap214_SOURCES}" "${gap214_LIBS}" NO_STRICT)
add_dependencies(g-ap214 step-express-${SCHEMA_NAME}-gap214)
-if(MSVC)
+if (HIDE_INTERNAL_SYMBOLS)
set(gap214_IMPORTS
BU_DLL_IMPORTS
BN_DLL_IMPORTS
@@ -62,7 +62,7 @@
set_property(SOURCE
${CMAKE_CURRENT_BINARY_DIR}/AUTOMOTIVE_DESIGN/SdaiAUTOMOTIVE_DESIGN.cc
APPEND PROPERTY COMPILE_FLAGS "/bigobj")
-endif(MSVC)
+endif (HIDE_INTERNAL_SYMBOLS)
set(IGNORE_FILES
CMakeLists.txt
Modified: brlcad/trunk/src/conv/step/g-ap242/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/g-ap242/CMakeLists.txt 2020-05-23 13:35:38 UTC
(rev 75891)
+++ brlcad/trunk/src/conv/step/g-ap242/CMakeLists.txt 2020-05-23 13:42:39 UTC
(rev 75892)
@@ -42,7 +42,7 @@
BRLCAD_ADDEXEC(g-ap242 "${gap242_SOURCES}" "${gap242_LIBS}" NO_STRICT)
add_dependencies(g-ap242 step-express-${SCHEMA_NAME}-gap242)
-if(MSVC)
+if (HIDE_INTERNAL_SYMBOLS)
set(gap242_IMPORTS
BU_DLL_IMPORTS
BN_DLL_IMPORTS
@@ -58,7 +58,7 @@
set_property(SOURCE
${CMAKE_CURRENT_BINARY_DIR}/AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF/SdaiAP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF.cc
APPEND PROPERTY COMPILE_FLAGS "/bigobj")
-endif(MSVC)
+endif (HIDE_INTERNAL_SYMBOLS)
set(IGNORE_FILES
CMakeLists.txt
Modified: brlcad/trunk/src/conv/step/g-step/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/g-step/CMakeLists.txt 2020-05-23 13:35:38 UTC
(rev 75891)
+++ brlcad/trunk/src/conv/step/g-step/CMakeLists.txt 2020-05-23 13:42:39 UTC
(rev 75892)
@@ -45,7 +45,7 @@
add_dependencies(g-step step-express-${SCHEMA_NAME}-gstep)
set_property(TARGET g-step APPEND PROPERTY INCLUDE_DIRECTORIES
"${gstep_SCHEMA_OUT_DIR}")
-if(MSVC)
+if (HIDE_INTERNAL_SYMBOLS)
set(gstep_IMPORTS
BU_DLL_IMPORTS
BN_DLL_IMPORTS
@@ -58,7 +58,7 @@
)
list(APPEND gstep_IMPORTS ${gstep_IMPORTS})
set_target_properties(g-step PROPERTIES COMPILE_DEFINITIONS
"${gstep_IMPORTS}")
-endif(MSVC)
+endif (HIDE_INTERNAL_SYMBOLS)
set(IGNORE_FILES
CMakeLists.txt
Modified: brlcad/trunk/src/conv/step/ifc-g/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/ifc-g/CMakeLists.txt 2020-05-23 13:35:38 UTC
(rev 75891)
+++ brlcad/trunk/src/conv/step/ifc-g/CMakeLists.txt 2020-05-23 13:42:39 UTC
(rev 75892)
@@ -31,7 +31,7 @@
BRLCAD_ADDEXEC(ifc-g "${ifcg_SOURCES}" "${ifcg_LIBS}" NO_STRICT)
add_dependencies(ifc-g ifc-express-${SCHEMA_NAME}-ifcg)
-if(MSVC)
+if (HIDE_INTERNAL_SYMBOLS)
set(ifcg_IMPORTS
BU_DLL_IMPORTS
RT_DLL_IMPORTS
@@ -43,7 +43,7 @@
)
list(APPEND ifcg_IMPORTS ${ifcg_IMPORTS})
set_target_properties(ifc-g PROPERTIES COMPILE_DEFINITIONS "${ifcg_IMPORTS}")
-endif(MSVC)
+endif (HIDE_INTERNAL_SYMBOLS)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/trunk/src/conv/step/step-g/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/step-g/CMakeLists.txt 2020-05-23 13:35:38 UTC
(rev 75891)
+++ brlcad/trunk/src/conv/step/step-g/CMakeLists.txt 2020-05-23 13:42:39 UTC
(rev 75892)
@@ -469,12 +469,12 @@
add_dependencies(step-g step-express-${SCHEMA_NAME}-stepg)
set_property(TARGET step-g APPEND PROPERTY INCLUDE_DIRECTORIES
"${stepg_SCHEMA_OUT_DIR}")
-if(CPP_DLL_DEFINES)
- set(SCIMPORTS SC_CORE_DLL_IMPORTS SC_DAI_DLL_IMPORTS SC_EDITOR_DLL_IMPORTS
SC_UTILS_DLL_IMPORTS)
+if(HIDE_INTERNAL_SYMBOLS)
+ set(SCIMPORTS SC_CORE_DLL_IMPORTS SC_DAI_DLL_IMPORTS SC_EDITOR_DLL_IMPORTS
SC_UTILS_DLL_IMPORTS ON_DLL_IMPORTS)
foreach(scp ${SCIMPORTS})
set_property(TARGET step-g APPEND PROPERTY COMPILE_DEFINITIONS "${scp}")
endforeach(scp ${SCIMPORTS})
-endif(CPP_DLL_DEFINES)
+endif(HIDE_INTERNAL_SYMBOLS)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/trunk/src/conv/step/util/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/util/CMakeLists.txt 2020-05-23 13:35:38 UTC
(rev 75891)
+++ brlcad/trunk/src/conv/step/util/CMakeLists.txt 2020-05-23 13:42:39 UTC
(rev 75892)
@@ -24,7 +24,7 @@
add_dependencies(list_elements step-express-${SCHEMA_NAME}-list_elements)
set_property(TARGET list_elements APPEND PROPERTY INCLUDE_DIRECTORIES
"${list_elements_SCHEMA_OUT_DIR}")
-if(MSVC)
+if (HIDE_INTERNAL_SYMBOLS)
set(list_elements_IMPORTS
BU_DLL_IMPORTS
BN_DLL_IMPORTS
@@ -37,7 +37,7 @@
)
list(APPEND list_elements_IMPORTS ${list_elements_IMPORTS})
set_target_properties(list_elements PROPERTIES COMPILE_DEFINITIONS
"${list_elements_IMPORTS}")
-endif(MSVC)
+endif (HIDE_INTERNAL_SYMBOLS)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/trunk/src/external/Creo/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/external/Creo/CMakeLists.txt 2020-05-23 13:35:38 UTC
(rev 75891)
+++ brlcad/trunk/src/external/Creo/CMakeLists.txt 2020-05-23 13:42:39 UTC
(rev 75892)
@@ -365,7 +365,7 @@
add_library(creo-brl ${creo_brl_srcs})
target_link_libraries(creo-brl librt libwdb libbrep libbg libnmg libbn libbu)
set_target_properties(creo-brl PROPERTIES FOLDER "BRL-CAD Executables/Build
Only")
- if(CPP_DLL_DEFINES)
+ if(HIDE_INTERNAL_SYMBOLS)
set_property(TARGET creo-brl APPEND PROPERTY COMPILE_DEFINITIONS
"BU_DLL_IMPORTS")
set_property(TARGET creo-brl APPEND PROPERTY COMPILE_DEFINITIONS
"BN_DLL_IMPORTS")
set_property(TARGET creo-brl APPEND PROPERTY COMPILE_DEFINITIONS
"NMG_DLL_IMPORTS")
@@ -379,7 +379,7 @@
set_property(TARGET creo-brl APPEND PROPERTY COMPILE_DEFINITIONS
"VDS_DLL_IMPORTS")
set_property(TARGET creo-brl APPEND PROPERTY COMPILE_DEFINITIONS
"ON_DLL_IMPORTS")
set_property(TARGET creo-brl APPEND PROPERTY COMPILE_DEFINITIONS
"LZ4_DLL_IMPORT=1")
- endif(CPP_DLL_DEFINES)
+ endif(HIDE_INTERNAL_SYMBOLS)
# Distcheck file list
set(creo_dist_files
Modified: brlcad/trunk/src/external/Cubit/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/external/Cubit/CMakeLists.txt 2020-05-23 13:35:38 UTC
(rev 75891)
+++ brlcad/trunk/src/external/Cubit/CMakeLists.txt 2020-05-23 13:42:39 UTC
(rev 75892)
@@ -24,7 +24,7 @@
add_library(g-sat ${g_sat_srcs})
target_link_libraries(g-sat librt libwdb libbrep libbg libnmg libbn libbu)
set_target_properties(g-sat PROPERTIES FOLDER "BRL-CAD Executables/Build
Only")
- if(CPP_DLL_DEFINES)
+ if(HIDE_INTERNAL_SYMBOLS)
set_property(TARGET g-sat APPEND PROPERTY COMPILE_DEFINITIONS
"BU_DLL_IMPORTS")
set_property(TARGET g-sat APPEND PROPERTY COMPILE_DEFINITIONS
"BN_DLL_IMPORTS")
set_property(TARGET g-sat APPEND PROPERTY COMPILE_DEFINITIONS
"NMG_DLL_IMPORTS")
@@ -39,7 +39,7 @@
set_property(TARGET g-sat APPEND PROPERTY COMPILE_DEFINITIONS
"ON_DLL_IMPORTS")
set_property(TARGET g-sat APPEND PROPERTY COMPILE_DEFINITIONS
"TINYCTHREAD_DLL_IMPORTS")
set_property(TARGET g-sat APPEND PROPERTY COMPILE_DEFINITIONS
"LZ4_DLL_IMPORT=1")
- endif(CPP_DLL_DEFINES)
+ endif(HIDE_INTERNAL_SYMBOLS)
CMAKEFILES(${g_sat_srcs} shim.h)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/trunk/src/external/Unigraphics/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/external/Unigraphics/CMakeLists.txt 2020-05-23
13:35:38 UTC (rev 75891)
+++ brlcad/trunk/src/external/Unigraphics/CMakeLists.txt 2020-05-23
13:42:39 UTC (rev 75892)
@@ -26,7 +26,7 @@
add_library(ug-g ${ug_g_srcs})
target_link_libraries(ug-g librt libwdb libbrep libbg libnmg libbn libbu
${TCL_LIBRARY})
set_target_properties(ug-g PROPERTIES FOLDER "BRL-CAD Executables/Build
Only")
- if(CPP_DLL_DEFINES)
+ if(HIDE_INTERNAL_SYMBOLS)
set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"BU_DLL_IMPORTS")
set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"BN_DLL_IMPORTS")
set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"NMG_DLL_IMPORTS")
@@ -41,7 +41,7 @@
set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"ON_DLL_IMPORTS")
set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"TINYCTHREAD_DLL_IMPORTS")
set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"LZ4_DLL_IMPORT=1")
- endif(CPP_DLL_DEFINES)
+ endif(HIDE_INTERNAL_SYMBOLS)
# Distcheck file list
CMAKEFILES(${ug_g_srcs} conv.h log.h shim.h ug-g.1 ug_misc.h)
Modified: brlcad/trunk/src/libbg/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbg/CMakeLists.txt 2020-05-23 13:35:38 UTC (rev
75891)
+++ brlcad/trunk/src/libbg/CMakeLists.txt 2020-05-23 13:42:39 UTC (rev
75892)
@@ -32,10 +32,10 @@
BRLCAD_ADDLIB(libbg "${LIBBG_SOURCES}" "libbn;libbu;SPSR;${P2T_LIBRARY}")
set_target_properties(libbg PROPERTIES VERSION 20.0.1 SOVERSION 20)
-if(CPP_DLL_DEFINES)
+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(CPP_DLL_DEFINES)
+endif(HIDE_INTERNAL_SYMBOLS)
add_subdirectory(tests)
Modified: brlcad/trunk/src/libbrep/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbrep/CMakeLists.txt 2020-05-23 13:35:38 UTC (rev
75891)
+++ brlcad/trunk/src/libbrep/CMakeLists.txt 2020-05-23 13:42:39 UTC (rev
75892)
@@ -82,9 +82,9 @@
CMAKEFILES(${libbrep_ignored_files})
# Anyone who needs to import libbrep will also need to import openNURBS
-if(CPP_DLL_DEFINES)
+if(HIDE_INTERNAL_SYMBOLS)
set_property(GLOBAL APPEND PROPERTY libbrep_DLL_DEFINES "ON_DLL_IMPORTS")
-endif(CPP_DLL_DEFINES)
+endif(HIDE_INTERNAL_SYMBOLS)
BRLCAD_ADDLIB(libbrep "${LIBBREP_SOURCES}"
"libbg;libbn;libbu;${OPENNURBS_LIBRARIES};${P2T_LIBRARY};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}")
Index: brlcad/trunk/src/libbu
===================================================================
--- brlcad/trunk/src/libbu 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/src/libbu 2020-05-23 13:42:39 UTC (rev 75892)
Property changes on: brlcad/trunk/src/libbu
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/brlcad/branches/RELEASE/src/libbu:70323-70333,71915-71935,72826-72858,74376-74454
-/brlcad/branches/bioh/src/libbu:75720-75736
+/brlcad/branches/bioh/src/libbu:75720-75736,75860-75891
/brlcad/branches/brep-debug/src/libbu:69168,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100
/brlcad/branches/tcltk86/src/libbu:68300-75257
\ No newline at end of property
Modified: brlcad/trunk/src/libbu/tests/dylib/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbu/tests/dylib/CMakeLists.txt 2020-05-23 13:35:38 UTC
(rev 75891)
+++ brlcad/trunk/src/libbu/tests/dylib/CMakeLists.txt 2020-05-23 13:42:39 UTC
(rev 75892)
@@ -32,19 +32,19 @@
endforeach (target_name${plugins})
add_library(libdylib SHARED dylib.c)
-if (CPP_DLL_DEFINES)
+if (HIDE_INTERNAL_SYMBOLS)
set_property(TARGET plugin_1 APPEND PROPERTY COMPILE_DEFINITIONS
BU_DYLIB_DLL_EXPORTS)
set_property(TARGET plugin_2 APPEND PROPERTY COMPILE_DEFINITIONS
BU_DYLIB_DLL_EXPORTS)
set_property(TARGET libdylib APPEND PROPERTY COMPILE_DEFINITIONS
BU_DYLIB_DLL_EXPORTS)
-endif (CPP_DLL_DEFINES)
+endif (HIDE_INTERNAL_SYMBOLS)
target_link_libraries(libdylib libbu)
set_target_properties(libdylib PROPERTIES FOLDER "BRL-CAD Executables/Test
Programs/dylib")
add_executable(bu_dylib run.c)
target_link_libraries(bu_dylib libdylib libbu)
-if (CPP_DLL_DEFINES)
+if (HIDE_INTERNAL_SYMBOLS)
set_property(TARGET bu_dylib APPEND PROPERTY COMPILE_DEFINITIONS
BU_DYLIB_DLL_IMPORTS)
-endif (CPP_DLL_DEFINES)
+endif (HIDE_INTERNAL_SYMBOLS)
set_target_properties(bu_dylib PROPERTIES FOLDER "BRL-CAD Executables/Test
Programs/dylib")
# As a build convenience, make bu_dylib depend on everything
Modified: brlcad/trunk/src/libbu/tests/dylib/dylib.h
===================================================================
--- brlcad/trunk/src/libbu/tests/dylib/dylib.h 2020-05-23 13:35:38 UTC (rev
75891)
+++ brlcad/trunk/src/libbu/tests/dylib/dylib.h 2020-05-23 13:42:39 UTC (rev
75892)
@@ -18,9 +18,9 @@
# if defined(BU_DYLIB_DLL_EXPORTS) && defined(BU_DYLIB_DLL_IMPORTS)
# error "Only BU_DYLIB_DLL_EXPORTS or BU_DYLIB_DLL_IMPORTS can be defined,
not both."
# elif defined(BU_DYLIB_DLL_EXPORTS)
-# define BU_DYLIB_EXPORT __declspec(dllexport)
+# define BU_DYLIB_EXPORT COMPILER_DLLEXPORT
# elif defined(BU_DYLIB_DLL_IMPORTS)
-# define BU_DYLIB_EXPORT __declspec(dllimport)
+# define BU_DYLIB_EXPORT COMPILER_DLLIMPORT
# else
# define BU_DYLIB_EXPORT
# endif
Modified: brlcad/trunk/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/CMakeLists.txt 2020-05-23 13:35:38 UTC (rev
75891)
+++ brlcad/trunk/src/libdm/CMakeLists.txt 2020-05-23 13:42:39 UTC (rev
75892)
@@ -118,9 +118,9 @@
if(BRLCAD_ENABLE_OSG)
BRLCAD_ADDEXEC(osg-test osg-test.cpp "librt;libbu;${OSG_LIBRARIES}"
NO_STRICT NO_INSTALL)
- if(CPP_DLL_DEFINES)
+ if(HIDE_INTERNAL_SYMBOLS)
set_property(TARGET libdm APPEND PROPERTY COMPILE_DEFINITIONS
"FREETYPE_DLL_IMPORTS")
- endif(CPP_DLL_DEFINES)
+ endif(HIDE_INTERNAL_SYMBOLS)
endif(BRLCAD_ENABLE_OSG)
if(BRLCAD_BUILD_LOCAL_TK AND BRLCAD_ENABLE_TK)
Modified: brlcad/trunk/src/libfb/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libfb/CMakeLists.txt 2020-05-23 13:35:38 UTC (rev
75891)
+++ brlcad/trunk/src/libfb/CMakeLists.txt 2020-05-23 13:42:39 UTC (rev
75892)
@@ -41,7 +41,7 @@
add_definitions(
-DIF_WGL
)
- set(LINKLIBS ${LINKLIBS} opengl32.lib ${TCL_LIBRARY} ${TK_LIBRARY})
+ set(LINKLIBS ${LINKLIBS} ${OPENGL32_LIBRARY} ${TCL_LIBRARY} ${TK_LIBRARY})
set(fbwgl_srcs if_wgl.c)
set_property(SOURCE if_wgl.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
endif(WIN32)
Modified: brlcad/trunk/src/libgcv/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libgcv/CMakeLists.txt 2020-05-23 13:35:38 UTC (rev
75891)
+++ brlcad/trunk/src/libgcv/CMakeLists.txt 2020-05-23 13:42:39 UTC (rev
75892)
@@ -9,11 +9,11 @@
)
BRLCAD_LIB_INCLUDE_DIRS(gcv GCV_INCLUDE_DIRS "")
-if(CPP_DLL_DEFINES)
+if(MSVC)
set(LIBGCV_PLUGINS_PATH "${BIN_DIR}")
-else(CPP_DLL_DEFINES)
+else(MSVC)
set(LIBGCV_PLUGINS_PATH "${LIB_DIR}")
-endif(CPP_DLL_DEFINES)
+endif(MSVC)
set(LIBGCV_PLUGINS_DIRECTORY "libgcv_plugins")
add_subdirectory(plugins)
@@ -35,9 +35,9 @@
enable_testing()
BRLCAD_ADDEXEC(test_bottess test_bottess.c libgcv NO_INSTALL)
-if(CPP_DLL_DEFINES)
+if(HIDE_INTERNAL_SYMBOLS)
set_property(TARGET test_bottess APPEND PROPERTY COMPILE_DEFINITIONS
"BOTTESS_DLL_IMPORTS")
-endif(CPP_DLL_DEFINES)
+endif(HIDE_INTERNAL_SYMBOLS)
add_test(NAME bottess_test COMMAND test_bottess)
Modified: brlcad/trunk/src/libgcv/plugins/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libgcv/plugins/CMakeLists.txt 2020-05-23 13:35:38 UTC
(rev 75891)
+++ brlcad/trunk/src/libgcv/plugins/CMakeLists.txt 2020-05-23 13:42:39 UTC
(rev 75892)
@@ -28,9 +28,12 @@
endif(NOT CMAKE_CONFIGURATION_TYPES)
# We're using GCV_EXPORT for these plugins, so we need to set the
DLL_EXPORTS accordingly
- if(CPP_DLL_DEFINES)
+ if(HIDE_INTERNAL_SYMBOLS)
set_property(TARGET ${target_name} APPEND PROPERTY COMPILE_DEFINITIONS
"GCV_DLL_EXPORTS")
- endif(CPP_DLL_DEFINES)
+ if (TARGET ${target_name}-obj)
+ set_property(TARGET ${target_name}-obj APPEND PROPERTY
COMPILE_DEFINITIONS "GCV_DLL_EXPORTS")
+ endif (TARGET ${target_name}-obj)
+ endif(HIDE_INTERNAL_SYMBOLS)
install(TARGETS ${target_name}
RUNTIME DESTINATION ${BIN_DIR}/${LIBGCV_PLUGINS_DIRECTORY}
Modified: brlcad/trunk/src/libgcv/plugins/obj/wfobj/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libgcv/plugins/obj/wfobj/CMakeLists.txt 2020-05-23
13:35:38 UTC (rev 75891)
+++ brlcad/trunk/src/libgcv/plugins/obj/wfobj/CMakeLists.txt 2020-05-23
13:42:39 UTC (rev 75892)
@@ -109,10 +109,11 @@
add_library(libwfobj SHARED ${WFOBJ_SRCS})
set_target_properties(libwfobj PROPERTIES PREFIX "")
set_target_properties(libwfobj PROPERTIES VERSION 20.0.1 SOVERSION 20)
-if(MSVC)
+if(HIDE_INTERNAL_SYMBOLS)
set_property(TARGET libwfobj APPEND PROPERTY COMPILE_DEFINITIONS
"WFOBJ_DLL_EXPORTS")
-endif(MSVC)
+endif(HIDE_INTERNAL_SYMBOLS)
set_property(TARGET libwfobj APPEND PROPERTY INCLUDE_DIRECTORIES
"${GENERATED_INCLUDES}")
+
install(TARGETS libwfobj
RUNTIME DESTINATION ${BIN_DIR}
LIBRARY DESTINATION ${LIB_DIR}
Modified: brlcad/trunk/src/libgcv/plugins/obj/wfobj/obj_util.h
===================================================================
--- brlcad/trunk/src/libgcv/plugins/obj/wfobj/obj_util.h 2020-05-23
13:35:38 UTC (rev 75891)
+++ brlcad/trunk/src/libgcv/plugins/obj/wfobj/obj_util.h 2020-05-23
13:42:39 UTC (rev 75892)
@@ -34,9 +34,9 @@
# elif defined(STATIC_BUILD)
# define WFOBJ_EXPORT
# elif defined(WFOBJ_DLL_EXPORTS)
-# define WFOBJ_EXPORT __declspec(dllexport)
+# define WFOBJ_EXPORT COMPILER_DLLEXPORT
# elif defined(WFOBJ_DLL_IMPORTS)
-# define WFOBJ_EXPORT __declspec(dllimport)
+# define WFOBJ_EXPORT COMPILER_DLLIMPORT
# else
# define WFOBJ_EXPORT
# endif
Modified: brlcad/trunk/src/libicv/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libicv/CMakeLists.txt 2020-05-23 13:35:38 UTC (rev
75891)
+++ brlcad/trunk/src/libicv/CMakeLists.txt 2020-05-23 13:42:39 UTC (rev
75892)
@@ -26,9 +26,9 @@
BRLCAD_ADDLIB(libicv "${LIBICV_SOURCES}"
"libbu;libbn;${PNG_LIBRARIES};${NETPBM_LIBRARY}")
set_target_properties(libicv PROPERTIES VERSION 20.0.1 SOVERSION 20)
-if(CPP_DLL_DEFINES)
+if(HIDE_INTERNAL_SYMBOLS)
set_property(TARGET libicv APPEND PROPERTY COMPILE_DEFINITIONS
"NETPBM_DLL_IMPORTS")
-endif(CPP_DLL_DEFINES)
+endif(HIDE_INTERNAL_SYMBOLS)
add_subdirectory(tests)
Modified: brlcad/trunk/src/librt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/librt/CMakeLists.txt 2020-05-23 13:35:38 UTC (rev
75891)
+++ brlcad/trunk/src/librt/CMakeLists.txt 2020-05-23 13:42:39 UTC (rev
75892)
@@ -364,13 +364,13 @@
BRLCAD_ADDLIB(librt "${LIBRT_SOURCES}"
"${OPENCL_LIBS};${GDIAM_LIBRARY};${VDS_LIBRARY};libbrep;libnmg;libbg;libbn;libbu;${OPENNURBS_LIBRARIES};${P2T_LIBRARY};${SPR_LIB};${REGEX_LIBRARIES};${LZ4_LIBRARIES};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}")
set_target_properties(librt PROPERTIES VERSION 20.0.1 SOVERSION 20)
-if(CPP_DLL_DEFINES)
+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")
-endif(CPP_DLL_DEFINES)
+endif(HIDE_INTERNAL_SYMBOLS)
# The following is build code for test applications used during
# development
Modified: brlcad/trunk/src/libtclcad/tkImgFmtPIX.c
===================================================================
--- brlcad/trunk/src/libtclcad/tkImgFmtPIX.c 2020-05-23 13:35:38 UTC (rev
75891)
+++ brlcad/trunk/src/libtclcad/tkImgFmtPIX.c 2020-05-23 13:42:39 UTC (rev
75892)
@@ -66,6 +66,7 @@
#include "fb.h"
#include "tk.h"
+#include "tclcad.h"
/* we need tk version numbers for compatibility compilation */
#if !defined(TK_MAJOR_VERSION) || (TK_MAJOR_VERSION != 8)
@@ -90,7 +91,7 @@
const char *fileName, Tcl_Obj
*formatString,
Tk_PhotoImageBlock
*blockPtr));
-Tk_PhotoImageFormat tkImgFmtPIX = {
+TCLCAD_EXPORT Tk_PhotoImageFormat tkImgFmtPIX = {
"PIX", /* name */
FileMatchPIX, /* fileMatchProc */
NULL, /* stringMatchProc */
Modified: brlcad/trunk/src/mged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/mged/CMakeLists.txt 2020-05-23 13:35:38 UTC (rev
75891)
+++ brlcad/trunk/src/mged/CMakeLists.txt 2020-05-23 13:42:39 UTC (rev
75892)
@@ -63,13 +63,10 @@
wdb_obj.c
)
-set(mged_libs libtclcad libged libwdb libdm libnmg ${ITCL_LIBRARY}
${ITK_LIBRARY})
+set(mged_libs libtclcad libged libwdb libdm libnmg ${ITCL_LIBRARY}
${ITK_LIBRARY} ${WS2_32_LIBRARY} ${OPENGL32_LIBRARY})
if(TARGET libtermio)
set(mged_libs ${mged_libs} libtermio)
endif(TARGET libtermio)
-if(CPP_DLL_DEFINES)
- set(mged_libs ${mged_libs} ws2_32.lib;opengl32.lib)
-endif(CPP_DLL_DEFINES)
# Ideally we'd build as GUI for Windows to avoid the command window popping up,
# but I'm not sure if that would be a problem for scripting with mged.exe on
Index: brlcad/trunk/src/other
===================================================================
--- brlcad/trunk/src/other 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/src/other 2020-05-23 13:42:39 UTC (rev 75892)
Property changes on: brlcad/trunk/src/other
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
/brlcad/branches/RELEASE/src/other:57439,57447-57860,69901-69913,71917-72242,72525-72534,72826-72858,74376-74454,75682-75685
-/brlcad/branches/bioh/src/other:75720-75736
+/brlcad/branches/bioh/src/other:75720-75736,75860-75891
/brlcad/branches/brep-debug/src/other:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927
/brlcad/branches/bullet/src/other:62518
/brlcad/branches/cmake/src/other:43219
Modified: brlcad/trunk/src/other/openNURBS/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/openNURBS/CMakeLists.txt 2020-05-23 13:35:38 UTC
(rev 75891)
+++ brlcad/trunk/src/other/openNURBS/CMakeLists.txt 2020-05-23 13:42:39 UTC
(rev 75892)
@@ -39,7 +39,7 @@
# If we can, use OBJECT libraries to build both shared and static
# libraries from the same .o files, saving double compilation
include(CMakeDependentOption)
-cmake_dependent_option(USE_OBJECT_LIBS "Use OBJECT libraries" ON "NOT
CPP_DLL_DEFINES" OFF)
+cmake_dependent_option(USE_OBJECT_LIBS "Use OBJECT libraries" ON "NOT MSVC"
OFF)
if(BRLCAD_FLAGS_DEBUG)
add_definitions(${DEBUG_CXX_FLAGS})
Modified: brlcad/trunk/src/other/openNURBS/opennurbs_defines.h
===================================================================
--- brlcad/trunk/src/other/openNURBS/opennurbs_defines.h 2020-05-23
13:35:38 UTC (rev 75891)
+++ brlcad/trunk/src/other/openNURBS/opennurbs_defines.h 2020-05-23
13:42:39 UTC (rev 75892)
@@ -90,10 +90,16 @@
#endif
/* compiling OpenNurbs as a Windows DLL - export classes, functions,
templates, and globals */
-#define ON_CLASS __declspec(dllexport)
-#define ON_DECL __declspec(dllexport)
-#define ON_EXTERN_DECL __declspec(dllexport)
-#define ON_DLL_TEMPLATE
+#ifdef _WIN32
+# define ON_CLASS __declspec(dllexport)
+# define ON_DECL __declspec(dllexport)
+# define ON_EXTERN_DECL __declspec(dllexport)
+# define ON_DLL_TEMPLATE
+#else
+# define ON_CLASS __attribute__ ((visibility ("default")))
+# define ON_DECL __attribute__ ((visibility ("default")))
+# define ON_EXTERN_DECL __attribute__ ((visibility ("default")))
+#endif
#elif defined(ON_DLL_IMPORTS)
@@ -102,10 +108,16 @@
#endif
/* using OpenNurbs as a Windows DLL - import classes, functions, templates,
and globals */
-#define ON_CLASS __declspec(dllimport)
-#define ON_DECL __declspec(dllimport)
-#define ON_EXTERN_DECL __declspec(dllimport)
-#define ON_DLL_TEMPLATE extern
+#ifdef _WIN32
+# define ON_CLASS __declspec(dllimport)
+# define ON_DECL __declspec(dllimport)
+# define ON_EXTERN_DECL __declspec(dllimport)
+# define ON_DLL_TEMPLATE extern
+#else
+# define ON_CLASS __attribute__ ((visibility ("default")))
+# define ON_DECL __attribute__ ((visibility ("default")))
+# define ON_EXTERN_DECL __attribute__ ((visibility ("default")))
+#endif
#else
Index: brlcad/trunk/src/other/stepcode
===================================================================
--- brlcad/trunk/src/other/stepcode 2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/src/other/stepcode 2020-05-23 13:42:39 UTC (rev 75892)
Property changes on: brlcad/trunk/src/other/stepcode
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,5 ##
/brlcad/branches/RELEASE/src/other/stepcode:57439,57447-57860,69901-69913,71917-72242,72525-72534,72826-72858,74376-74454,75682-75685
+/brlcad/branches/bioh/src/other/stepcode:75860-75891
/brlcad/branches/brep-debug/src/other/stepcode:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927
/brlcad/branches/bullet/src/other/stepcode:62518
/brlcad/branches/cmake/src/other/stepcode:43219
Modified: brlcad/trunk/src/other/stepcode/include/sc_export.h
===================================================================
--- brlcad/trunk/src/other/stepcode/include/sc_export.h 2020-05-23 13:35:38 UTC
(rev 75891)
+++ brlcad/trunk/src/other/stepcode/include/sc_export.h 2020-05-23 13:42:39 UTC
(rev 75892)
@@ -1,12 +1,20 @@
#ifndef SC_EXPORT_H
#define SC_EXPORT_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
+
/* Import/Export flags for base. */
#ifndef SC_BASE_EXPORT
# if defined(SC_BASE_DLL_EXPORTS) && defined(SC_BASE_DLL_IMPORTS)
# error "Only SC_BASE_DLL_EXPORTS or SC_BASE_DLL_IMPORTS can be defined, not
both."
# elif defined(SC_BASE_DLL_EXPORTS)
-# define SC_BASE_EXPORT __declspec(dllexport)
+# define SC_BASE_EXPORT COMPILER_DLLEXPORT
# elif defined(SC_BASE_DLL_IMPORTS)
# define SC_BASE_EXPORT __declspec(dllimport)
# else
@@ -19,7 +27,7 @@
# if defined(SC_EXPRESS_DLL_EXPORTS) && defined(SC_EXPRESS_DLL_IMPORTS)
# error "Only SC_EXPRESS_DLL_EXPORTS or SC_EXPRESS_DLL_IMPORTS can be
defined, not both."
# elif defined(SC_EXPRESS_DLL_EXPORTS)
-# define SC_EXPRESS_EXPORT __declspec(dllexport)
+# define SC_EXPRESS_EXPORT COMPILER_DLLEXPORT
# elif defined(SC_EXPRESS_DLL_IMPORTS)
# define SC_EXPRESS_EXPORT __declspec(dllimport)
# else
@@ -32,7 +40,7 @@
# if defined(SC_EXPPP_DLL_EXPORTS) && defined(SC_EXPPP_DLL_IMPORTS)
# error "Only SC_EXPPP_DLL_EXPORTS or SC_EXPPP_DLL_IMPORTS can be defined,
not both."
# elif defined(SC_EXPPP_DLL_EXPORTS)
-# define SC_EXPPP_EXPORT __declspec(dllexport)
+# define SC_EXPPP_EXPORT COMPILER_DLLEXPORT
# elif defined(SC_EXPPP_DLL_IMPORTS)
# define SC_EXPPP_EXPORT __declspec(dllimport)
# else
@@ -45,9 +53,9 @@
# if defined(SC_UTILS_DLL_EXPORTS) && defined(SC_UTILS_DLL_IMPORTS)
# error "Only SC_UTILS_DLL_EXPORTS or SC_UTILS_DLL_IMPORTS can be defined,
not both."
# elif defined(SC_UTILS_DLL_EXPORTS)
-# define SC_UTILS_EXPORT __declspec(dllexport)
+# define SC_UTILS_EXPORT COMPILER_DLLEXPORT
# elif defined(SC_UTILS_DLL_IMPORTS)
-# define SC_UTILS_EXPORT __declspec(dllimport)
+# define SC_UTILS_EXPORT COMPILER_DLLIMPORT
# else
# define SC_UTILS_EXPORT
# endif
@@ -58,9 +66,9 @@
# if defined(SC_DAI_DLL_EXPORTS) && defined(SC_DAI_DLL_IMPORTS)
# error "Only SC_DAI_DLL_EXPORTS or SC_DAI_DLL_IMPORTS can be defined, not
both."
# elif defined(SC_DAI_DLL_EXPORTS)
-# define SC_DAI_EXPORT __declspec(dllexport)
+# define SC_DAI_EXPORT COMPILER_DLLEXPORT
# elif defined(SC_DAI_DLL_IMPORTS)
-# define SC_DAI_EXPORT __declspec(dllimport)
+# define SC_DAI_EXPORT COMPILER_DLLIMPORT
# else
# define SC_DAI_EXPORT
# endif
@@ -71,9 +79,9 @@
# if defined(SC_CORE_DLL_EXPORTS) && defined(SC_CORE_DLL_IMPORTS)
# error "Only SC_CORE_DLL_EXPORTS or SC_CORE_DLL_IMPORTS can be defined,
not both."
# elif defined(SC_CORE_DLL_EXPORTS)
-# define SC_CORE_EXPORT __declspec(dllexport)
+# define SC_CORE_EXPORT COMPILER_DLLEXPORT
# elif defined(SC_CORE_DLL_IMPORTS)
-# define SC_CORE_EXPORT __declspec(dllimport)
+# define SC_CORE_EXPORT COMPILER_DLLIMPORT
# else
# define SC_CORE_EXPORT
# endif
@@ -84,9 +92,9 @@
# if defined(SC_EDITOR_DLL_EXPORTS) && defined(SC_EDITOR_DLL_IMPORTS)
# error "Only SC_EDITOR_DLL_EXPORTS or SC_EDITOR_DLL_IMPORTS can be
defined, not both."
# elif defined(SC_EDITOR_DLL_EXPORTS)
-# define SC_EDITOR_EXPORT __declspec(dllexport)
+# define SC_EDITOR_EXPORT COMPILER_DLLEXPORT
# elif defined(SC_EDITOR_DLL_IMPORTS)
-# define SC_EDITOR_EXPORT __declspec(dllimport)
+# define SC_EDITOR_EXPORT COMPILER_DLLIMPORT
# else
# define SC_EDITOR_EXPORT
# endif
@@ -97,9 +105,9 @@
# if defined(SC_LAZYFILE_DLL_EXPORTS) && defined(SC_LAZYFILE_DLL_IMPORTS)
# error "Only SC_LAZYFILE_DLL_EXPORTS or SC_LAZYFILE_DLL_IMPORTS can be
defined, not both."
# elif defined(SC_LAZYFILE_DLL_EXPORTS)
-# define SC_LAZYFILE_EXPORT __declspec(dllexport)
+# define SC_LAZYFILE_EXPORT COMPILER_DLLEXPORT
# elif defined(SC_LAZYFILE_DLL_IMPORTS)
-# define SC_LAZYFILE_EXPORT __declspec(dllimport)
+# define SC_LAZYFILE_EXPORT COMPILER_DLLIMPORT
# else
# define SC_LAZYFILE_EXPORT
# endif
Modified: brlcad/trunk/src/other/stepcode/src/base/judy/src/judy.h
===================================================================
--- brlcad/trunk/src/other/stepcode/src/base/judy/src/judy.h 2020-05-23
13:35:38 UTC (rev 75891)
+++ brlcad/trunk/src/other/stepcode/src/base/judy/src/judy.h 2020-05-23
13:42:39 UTC (rev 75892)
@@ -33,13 +33,22 @@
// judy_del: delete the key and cell for the current stack entry.
/* Import/Export flags for base. */
+#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 SC_BASE_EXPORT
# if defined(SC_BASE_DLL_EXPORTS) && defined(SC_BASE_DLL_IMPORTS)
# error "Only SC_BASE_DLL_EXPORTS or SC_BASE_DLL_IMPORTS can be defined, not
both."
# elif defined(SC_BASE_DLL_EXPORTS)
-# define SC_BASE_EXPORT __declspec(dllexport)
+# 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
Modified: brlcad/trunk/src/other/stepcode/src/exp2cxx/classes_wrapper.cc
===================================================================
--- brlcad/trunk/src/other/stepcode/src/exp2cxx/classes_wrapper.cc
2020-05-23 13:35:38 UTC (rev 75891)
+++ brlcad/trunk/src/other/stepcode/src/exp2cxx/classes_wrapper.cc
2020-05-23 13:42:39 UTC (rev 75892)
@@ -65,9 +65,17 @@
fprintf( files->incall, "# if defined(SC_%s_DLL_EXPORTS) &&
defined(SC_%s_DLL_IMPORTS)\n", "SCHEMA", "SCHEMA" );
fprintf( files->incall, "# error \"SC_%s_DLL_EXPORTS or SC_%s_DLL_IMPORTS
can be defined, not both.\"\n", "SCHEMA", "SCHEMA" );
fprintf( files->incall, "# elif defined(SC_%s_DLL_EXPORTS)\n", "SCHEMA" );
+#ifdef _WIN32
fprintf( files->incall, "# define SC_%s_EXPORT __declspec(dllexport)\n",
"SCHEMA" );
+#else
+ fprintf( files->incall, "# define SC_%s_EXPORT __attribute__ ((visibility
(\"default\")))\n", "SCHEMA" );
+#endif
fprintf( files->incall, "# elif defined(SC_%s_DLL_IMPORTS)\n", "SCHEMA" );
+#ifdef _WIN32
fprintf( files->incall, "# define SC_%s_EXPORT __declspec(dllimport)\n",
"SCHEMA" );
+#else
+ fprintf( files->incall, "# define SC_%s_EXPORT __attribute__ ((visibility
(\"default\")))\n", "SCHEMA" );
+#endif
fprintf( files->incall, "# else\n" );
fprintf( files->incall, "# define SC_%s_EXPORT\n", "SCHEMA" );
fprintf( files->incall, "# endif\n" );
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
