Revision: 76079
http://sourceforge.net/p/brlcad/code/76079
Author: starseeker
Date: 2020-06-09 00:28:50 +0000 (Tue, 09 Jun 2020)
Log Message:
-----------
As with GCV, switching the DLL export tracking will need adjustment for the
libdm plugins
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/src/burst/burst.h
brlcad/branches/dm-fb-merge/src/libdm/X/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c
brlcad/branches/dm-fb-merge/src/libdm/X/if_X24.c
brlcad/branches/dm-fb-merge/src/libdm/glx/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c
brlcad/branches/dm-fb-merge/src/libdm/glx/if_ogl.c
brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.c
brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.h
brlcad/branches/dm-fb-merge/src/libdm/osgl/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp
brlcad/branches/dm-fb-merge/src/libdm/osgl/if_osgl.cpp
brlcad/branches/dm-fb-merge/src/libdm/plot/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/plot/dm-plot.c
brlcad/branches/dm-fb-merge/src/libdm/postscript/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/postscript/dm-ps.c
brlcad/branches/dm-fb-merge/src/libdm/qt/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp
brlcad/branches/dm-fb-merge/src/libdm/qt/if_qt.cpp
brlcad/branches/dm-fb-merge/src/libdm/tk/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c
brlcad/branches/dm-fb-merge/src/libdm/tk/if_tk.c
brlcad/branches/dm-fb-merge/src/libdm/txt/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/txt/dm-txt.c
brlcad/branches/dm-fb-merge/src/libdm/txt/if_debug.c
brlcad/branches/dm-fb-merge/src/libdm/wgl/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c
brlcad/branches/dm-fb-merge/src/libdm/wgl/if_wgl.c
Modified: brlcad/branches/dm-fb-merge/src/burst/burst.h
===================================================================
--- brlcad/branches/dm-fb-merge/src/burst/burst.h 2020-06-09 00:02:58 UTC
(rev 76078)
+++ brlcad/branches/dm-fb-merge/src/burst/burst.h 2020-06-09 00:28:50 UTC
(rev 76079)
@@ -30,7 +30,7 @@
#include <signal.h>
#include "vmath.h"
-#include "fb.h"
+#include "dm.h"
#include "raytrace.h"
/* NSIG not always defined in <signal.h> */
@@ -524,7 +524,7 @@
struct burst_state {
Colors colorids; /* ident range to color mappings for plots */
- fb *fbiop; /* frame buffer specific access from libfb */
+ struct fb *fbiop; /* frame buffer specific access from libfb */
FILE *burstfp; /* input stream for burst point locations */
FILE *gridfp; /* grid file output stream (2-d shots) */
FILE *histfp; /* histogram output stream (statistics) */
Modified: brlcad/branches/dm-fb-merge/src/libdm/X/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/X/CMakeLists.txt 2020-06-09
00:02:58 UTC (rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/X/CMakeLists.txt 2020-06-09
00:28:50 UTC (rev 76079)
@@ -26,9 +26,6 @@
add_library(dm-X SHARED ${X_SRCS})
target_link_libraries(dm-X libdm libbu ${TCL_LIBRARY} ${TK_LIBRARY}
${X11_LIBRARIES})
set_property(TARGET dm-X APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
-if (HIDE_INTERNAL_SYMBOLS)
- set_property(TARGET dm-X APPEND PROPERTY COMPILE_DEFINITIONS
"DM_DLL_EXPORTS")
-endif (HIDE_INTERNAL_SYMBOLS)
VALIDATE_STYLE(dm-X "${X_SRCS}")
PLUGIN_SETUP(dm-X dm)
Modified: brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c 2020-06-09 00:02:58 UTC
(rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c 2020-06-09 00:28:50 UTC
(rev 76079)
@@ -2152,7 +2152,7 @@
#ifdef DM_PLUGIN
static const struct dm_plugin pinfo = { &dm_X };
-DM_EXPORT const struct dm_plugin *dm_plugin_info()
+COMPILER_DLLEXPORT const struct dm_plugin *dm_plugin_info()
{
return &pinfo;
}
Modified: brlcad/branches/dm-fb-merge/src/libdm/X/if_X24.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/X/if_X24.c 2020-06-09 00:02:58 UTC
(rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/X/if_X24.c 2020-06-09 00:28:50 UTC
(rev 76079)
@@ -3548,7 +3548,7 @@
#ifdef DM_PLUGIN
static const struct fb_plugin finfo = { &X24_interface };
-DM_EXPORT const struct fb_plugin *fb_plugin_info()
+COMPILER_DLLEXPORT const struct fb_plugin *fb_plugin_info()
{
return &finfo;
}
Modified: brlcad/branches/dm-fb-merge/src/libdm/glx/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/glx/CMakeLists.txt 2020-06-09
00:02:58 UTC (rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/glx/CMakeLists.txt 2020-06-09
00:28:50 UTC (rev 76079)
@@ -28,9 +28,6 @@
add_library(dm-ogl SHARED ${OGL_SRCS})
target_link_libraries(dm-ogl libdm libbu ${X11_LIBRARIES} ${OPENGL_LIBRARIES}
${TCL_LIBRARY} ${TK_LIBRARY})
set_property(TARGET dm-ogl APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
-if (HIDE_INTERNAL_SYMBOLS)
- set_property(TARGET dm-ogl APPEND PROPERTY COMPILE_DEFINITIONS
"DM_DLL_EXPORTS")
-endif (HIDE_INTERNAL_SYMBOLS)
VALIDATE_STYLE(dm-ogl "${OGL_SRCS}")
PLUGIN_SETUP(dm-ogl dm)
Modified: brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c 2020-06-09 00:02:58 UTC
(rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c 2020-06-09 00:28:50 UTC
(rev 76079)
@@ -3089,7 +3089,7 @@
#ifdef DM_PLUGIN
static const struct dm_plugin pinfo = { &dm_ogl };
-DM_EXPORT const struct dm_plugin *dm_plugin_info()
+COMPILER_DLLEXPORT const struct dm_plugin *dm_plugin_info()
{
return &pinfo;
}
Modified: brlcad/branches/dm-fb-merge/src/libdm/glx/if_ogl.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/glx/if_ogl.c 2020-06-09 00:02:58 UTC
(rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/glx/if_ogl.c 2020-06-09 00:28:50 UTC
(rev 76079)
@@ -2351,7 +2351,7 @@
#ifdef DM_PLUGIN
static const struct fb_plugin finfo = { &ogl_interface };
-DM_EXPORT const struct fb_plugin *fb_plugin_info()
+COMPILER_DLLEXPORT const struct fb_plugin *fb_plugin_info()
{
return &finfo;
}
Modified: brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.c 2020-06-09
00:02:58 UTC (rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.c 2020-06-09
00:28:50 UTC (rev 76079)
@@ -398,7 +398,7 @@
#ifdef DM_PLUGIN
const struct dm_plugin pinfo = { &dm_null };
-DM_EXPORT const struct dm_plugin *dm_plugin_info()
+COMPILER_DLLEXPORT const struct dm_plugin *dm_plugin_info()
{
return &pinfo;
}
Modified: brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.h
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.h 2020-06-09
00:02:58 UTC (rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.h 2020-06-09
00:28:50 UTC (rev 76079)
@@ -29,164 +29,176 @@
#include "dm.h"
+#ifndef DM_NULL_EXPORT
+# 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_NULL_EXPORT COMPILER_DLLEXPORT
+# elif defined(DM_DLL_IMPORTS)
+# define DM_NULL_EXPORT COMPILER_DLLIMPORT
+# else
+# define DM_NULL_EXPORT
+# endif
+#endif
+
__BEGIN_DECLS
-DM_EXPORT extern struct dm dm_null;
+DM_NULL_EXPORT extern struct dm dm_null;
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_close(struct dm *dmp);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_drawBegin(struct dm *dmp);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_drawEnd(struct dm *dmp);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_normal(struct dm *dmp);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_loadMatrix(struct dm *dmp, fastf_t *mat, int which_eye);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_loadPMatrix(struct dm *dmp, fastf_t *mat);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_drawString2D(struct dm *dmp, const char *str, fastf_t x, fastf_t y, int
size, int use_aspect);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_drawLine2D(struct dm *dmp, fastf_t x_1, fastf_t y_1, fastf_t x_2, fastf_t
y_2);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_drawLine3D(struct dm *dmp, point_t pt1, point_t pt2);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_drawLines3D(struct dm *dmp, int npoints, point_t *points, int sflag);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_drawPoint2D(struct dm *dmp, fastf_t x, fastf_t y);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_drawPoint3D(struct dm *dmp, point_t point);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_drawPoints3D(struct dm *dmp, int npoints, point_t *points);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_drawVList(struct dm *dmp, struct bn_vlist *vp);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_drawVListHiddenLine(struct dm *dmp, struct bn_vlist *vp);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_draw(struct dm *dmp, struct bn_vlist *(*callback_function)(void *), void
**data);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_setFGColor(struct dm *dmp, unsigned char r, unsigned char g, unsigned
char b, int strict, fastf_t transparency);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_setBGColor(struct dm *dmp, unsigned char r, unsigned char g, unsigned
char b);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_setLineAttr(struct dm *dmp, int width, int style);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_configureWin(struct dm *dmp, int force);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_setWinBounds(struct dm *dmp, fastf_t *w);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_setLight(struct dm *dmp, int light_on);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_setTransparency(struct dm *dmp, int transparency);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_setDepthMask(struct dm *dmp, int mask);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_setZBuffer(struct dm *dmp, int zbuffer_on);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_debug(struct dm *dmp, int lvl);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_beginDList(struct dm *dmp, unsigned int list);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_endDList(struct dm *dmp);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_drawDList(unsigned int list);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_freeDLists(struct dm *dmp, unsigned int list, int range);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_genDLists(struct dm *dmp, size_t range);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_getDisplayImage(struct dm *dmp, unsigned char **image);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_draw(struct dm *dmp, struct bn_vlist *(*callback_function)(void *), void
**data);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_fg(struct dm *dmp, unsigned char r, unsigned char g, unsigned char b, int
strict, fastf_t transparency);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_bg(struct dm *dmp, unsigned char r, unsigned char g, unsigned char b);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_reshape(struct dm *dmp, int width, int height);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_makeCurrent(struct dm *dmp);
-DM_EXPORT extern void
+DM_NULL_EXPORT extern void
null_processEvents(struct dm *dmp);
-DM_EXPORT extern int
+DM_NULL_EXPORT extern int
null_openFb(struct dm *dmp);
__END_DECLS
Modified: brlcad/branches/dm-fb-merge/src/libdm/osgl/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/osgl/CMakeLists.txt 2020-06-09
00:02:58 UTC (rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/osgl/CMakeLists.txt 2020-06-09
00:28:50 UTC (rev 76079)
@@ -44,9 +44,6 @@
add_library(dm-osgl SHARED ${OSGL_SRCS})
target_link_libraries(dm-osgl libdm librt libbu ${OSGL_LIBRARIES})
set_property(TARGET dm-osgl APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
-if (HIDE_INTERNAL_SYMBOLS)
- set_property(TARGET dm-osgl APPEND PROPERTY COMPILE_DEFINITIONS
"DM_DLL_EXPORTS")
-endif (HIDE_INTERNAL_SYMBOLS)
VALIDATE_STYLE(dm-osgl "${OSGL_SRCS}")
PLUGIN_SETUP(dm-osgl dm)
Modified: brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp 2020-06-09
00:02:58 UTC (rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp 2020-06-09
00:28:50 UTC (rev 76079)
@@ -2741,7 +2741,7 @@
#ifdef DM_PLUGIN
static const struct dm_plugin pinfo = { &dm_osgl };
- DM_EXPORT const struct dm_plugin *dm_plugin_info()
+ COMPILER_DLLEXPORT const struct dm_plugin *dm_plugin_info()
{
return &pinfo;
}
Modified: brlcad/branches/dm-fb-merge/src/libdm/osgl/if_osgl.cpp
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/osgl/if_osgl.cpp 2020-06-09
00:02:58 UTC (rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/osgl/if_osgl.cpp 2020-06-09
00:28:50 UTC (rev 76079)
@@ -1515,7 +1515,7 @@
#ifdef DM_PLUGIN
static const struct fb_plugin finfo = { &osgl_interface };
-DM_EXPORT const struct fb_plugin *fb_plugin_info()
+COMPILER_DLLEXPORT const struct fb_plugin *fb_plugin_info()
{
return &finfo;
}
Modified: brlcad/branches/dm-fb-merge/src/libdm/plot/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/plot/CMakeLists.txt 2020-06-09
00:02:58 UTC (rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/plot/CMakeLists.txt 2020-06-09
00:28:50 UTC (rev 76079)
@@ -15,9 +15,6 @@
add_library(dm-plot SHARED ${PLOT_SRCS})
target_link_libraries(dm-plot libdm libbu ${TCL_LIBRARY})
set_property(TARGET dm-plot APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
-if (HIDE_INTERNAL_SYMBOLS)
- set_property(TARGET dm-plot APPEND PROPERTY COMPILE_DEFINITIONS
"DM_DLL_EXPORTS")
-endif (HIDE_INTERNAL_SYMBOLS)
VALIDATE_STYLE(dm-plot "${PLOT_SRCS}")
PLUGIN_SETUP(dm-plot dm)
Modified: brlcad/branches/dm-fb-merge/src/libdm/plot/dm-plot.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/plot/dm-plot.c 2020-06-09
00:02:58 UTC (rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/plot/dm-plot.c 2020-06-09
00:28:50 UTC (rev 76079)
@@ -761,7 +761,7 @@
#ifdef DM_PLUGIN
const struct dm_plugin pinfo = { &dm_plot };
-DM_EXPORT const struct dm_plugin *dm_plugin_info()
+COMPILER_DLLEXPORT const struct dm_plugin *dm_plugin_info()
{
return &pinfo;
}
Modified: brlcad/branches/dm-fb-merge/src/libdm/postscript/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/postscript/CMakeLists.txt
2020-06-09 00:02:58 UTC (rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/postscript/CMakeLists.txt
2020-06-09 00:28:50 UTC (rev 76079)
@@ -14,9 +14,6 @@
add_library(dm-ps SHARED ${PS_SRCS})
target_link_libraries(dm-ps libdm libbu)
set_property(TARGET dm-ps APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
-if (HIDE_INTERNAL_SYMBOLS)
- set_property(TARGET dm-ps APPEND PROPERTY COMPILE_DEFINITIONS
"DM_DLL_EXPORTS")
-endif (HIDE_INTERNAL_SYMBOLS)
VALIDATE_STYLE(dm-ps "${PS_SRCS}")
PLUGIN_SETUP(dm-ps dm)
Modified: brlcad/branches/dm-fb-merge/src/libdm/postscript/dm-ps.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/postscript/dm-ps.c 2020-06-09
00:02:58 UTC (rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/postscript/dm-ps.c 2020-06-09
00:28:50 UTC (rev 76079)
@@ -831,7 +831,7 @@
#ifdef DM_PLUGIN
const struct dm_plugin pinfo = { &dm_ps };
-DM_EXPORT const struct dm_plugin *dm_plugin_info()
+COMPILER_DLLEXPORT const struct dm_plugin *dm_plugin_info()
{
return &pinfo;
}
Modified: brlcad/branches/dm-fb-merge/src/libdm/qt/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/qt/CMakeLists.txt 2020-06-09
00:02:58 UTC (rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/qt/CMakeLists.txt 2020-06-09
00:28:50 UTC (rev 76079)
@@ -36,9 +36,6 @@
add_library(dm-qt SHARED ${QT_SRCS})
target_link_libraries(dm-qt libdm libbu ${QT_LIBRARIES})
set_property(TARGET dm-qt APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
-if (HIDE_INTERNAL_SYMBOLS)
- set_property(TARGET dm-qt APPEND PROPERTY COMPILE_DEFINITIONS
"DM_DLL_EXPORTS")
-endif (HIDE_INTERNAL_SYMBOLS)
VALIDATE_STYLE(dm-qt "${QT_SRCS}")
PLUGIN_SETUP(dm-qt dm)
Modified: brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp 2020-06-09 00:02:58 UTC
(rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp 2020-06-09 00:28:50 UTC
(rev 76079)
@@ -1409,7 +1409,7 @@
#ifdef DM_PLUGIN
static const struct dm_plugin pinfo = { &dm_qt };
- DM_EXPORT const struct dm_plugin *dm_plugin_info()
+ COMPILER_DLLEXPORT const struct dm_plugin *dm_plugin_info()
{
return &pinfo;
}
Modified: brlcad/branches/dm-fb-merge/src/libdm/qt/if_qt.cpp
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/qt/if_qt.cpp 2020-06-09 00:02:58 UTC
(rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/qt/if_qt.cpp 2020-06-09 00:28:50 UTC
(rev 76079)
@@ -1409,7 +1409,7 @@
#ifdef DM_PLUGIN
static const struct fb_plugin finfo = { &qt_interface };
-DM_EXPORT const struct fb_plugin *fb_plugin_info()
+COMPILER_DLLEXPORT const struct fb_plugin *fb_plugin_info()
{
return &finfo;
}
Modified: brlcad/branches/dm-fb-merge/src/libdm/tk/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/tk/CMakeLists.txt 2020-06-09
00:02:58 UTC (rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/tk/CMakeLists.txt 2020-06-09
00:28:50 UTC (rev 76079)
@@ -23,9 +23,6 @@
add_library(dm-tk SHARED ${TK_SRCS})
target_link_libraries(dm-tk libdm libbu ${TCL_LIBRARY} ${TK_LIBRARY})
set_property(TARGET dm-tk APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
-if (HIDE_INTERNAL_SYMBOLS)
- set_property(TARGET dm-tk APPEND PROPERTY COMPILE_DEFINITIONS
"DM_DLL_EtkPORTS")
-endif (HIDE_INTERNAL_SYMBOLS)
VALIDATE_STYLE(dm-tk "${TK_SRCS}")
PLUGIN_SETUP(dm-tk dm)
Modified: brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c 2020-06-09 00:02:58 UTC
(rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c 2020-06-09 00:28:50 UTC
(rev 76079)
@@ -1203,7 +1203,7 @@
#ifdef DM_PLUGIN
static const struct dm_plugin pinfo = { &dm_tk };
-DM_EXPORT const struct dm_plugin *dm_plugin_info()
+COMPILER_DLLEXPORT const struct dm_plugin *dm_plugin_info()
{
return &pinfo;
}
Modified: brlcad/branches/dm-fb-merge/src/libdm/tk/if_tk.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/tk/if_tk.c 2020-06-09 00:02:58 UTC
(rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/tk/if_tk.c 2020-06-09 00:28:50 UTC
(rev 76079)
@@ -640,7 +640,7 @@
#ifdef DM_PLUGIN
static const struct fb_plugin finfo = { &tk_interface };
-DM_EXPORT const struct fb_plugin *fb_plugin_info()
+COMPILER_DLLEXPORT const struct fb_plugin *fb_plugin_info()
{
return &finfo;
}
Modified: brlcad/branches/dm-fb-merge/src/libdm/txt/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/txt/CMakeLists.txt 2020-06-09
00:02:58 UTC (rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/txt/CMakeLists.txt 2020-06-09
00:28:50 UTC (rev 76079)
@@ -14,11 +14,8 @@
add_definitions(-DDM_PLUGIN)
add_library(dm-txt SHARED ${TXT_SRCS})
-target_link_libraries(dm-txt libdm libbu ${TCL_LIBRARY})
+target_link_libraries(dm-txt libbu ${TCL_LIBRARY})
set_property(TARGET dm-txt APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
-if (HIDE_INTERNAL_SYMBOLS)
- set_property(TARGET dm-txt APPEND PROPERTY COMPILE_DEFINITIONS
"DM_DLL_EXPORTS")
-endif (HIDE_INTERNAL_SYMBOLS)
VALIDATE_STYLE(dm-txt "${TXT_SRCS}")
PLUGIN_SETUP(dm-txt dm)
Modified: brlcad/branches/dm-fb-merge/src/libdm/txt/dm-txt.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/txt/dm-txt.c 2020-06-09 00:02:58 UTC
(rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/txt/dm-txt.c 2020-06-09 00:28:50 UTC
(rev 76079)
@@ -32,7 +32,6 @@
#include "dm.h"
#include "../include/private.h"
-
struct dm *
txt_open(void *interp, int argc, const char **argv)
{
@@ -446,7 +445,7 @@
#ifdef DM_PLUGIN
const struct dm_plugin pinfo = { &dm_txt };
-DM_EXPORT const struct dm_plugin *dm_plugin_info()
+COMPILER_DLLEXPORT const struct dm_plugin *dm_plugin_info()
{
return &pinfo;
}
Modified: brlcad/branches/dm-fb-merge/src/libdm/txt/if_debug.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/txt/if_debug.c 2020-06-09
00:02:58 UTC (rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/txt/if_debug.c 2020-06-09
00:28:50 UTC (rev 76079)
@@ -422,7 +422,7 @@
#ifdef DM_PLUGIN
static const struct fb_plugin finfo = { &debug_interface };
-DM_EXPORT const struct fb_plugin *fb_plugin_info()
+COMPILER_DLLEXPORT const struct fb_plugin *fb_plugin_info()
{
return &finfo;
}
Modified: brlcad/branches/dm-fb-merge/src/libdm/wgl/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/wgl/CMakeLists.txt 2020-06-09
00:02:58 UTC (rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/wgl/CMakeLists.txt 2020-06-09
00:28:50 UTC (rev 76079)
@@ -24,9 +24,6 @@
add_library(dm-wgl SHARED ${WGL_SRCS})
target_link_libraries(dm-wgl libdm libbu ${TCL_LIBRARY} ${TK_LIBRARY}
${OPENGL32_LIBRARY} ${OPENGL_LIBRARIES})
set_property(TARGET dm-wgl APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
-if (HIDE_INTERNAL_SYMBOLS)
- set_property(TARGET dm-wgl APPEND PROPERTY COMPILE_DEFINITIONS
"DM_DLL_EXPORTS")
-endif (HIDE_INTERNAL_SYMBOLS)
VALIDATE_STYLE(dm-wgl "${WGL_SRCS}")
PLUGIN_SETUP(dm-wgl dm)
Modified: brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c 2020-06-09 00:02:58 UTC
(rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c 2020-06-09 00:28:50 UTC
(rev 76079)
@@ -2662,7 +2662,7 @@
#ifdef DM_PLUGIN
static const struct dm_plugin pinfo = { &dm_wgl };
-DM_EXPORT const struct dm_plugin *dm_plugin_info()
+COMPILER_DLLEXPORT const struct dm_plugin *dm_plugin_info()
{
return &pinfo;
}
Modified: brlcad/branches/dm-fb-merge/src/libdm/wgl/if_wgl.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/wgl/if_wgl.c 2020-06-09 00:02:58 UTC
(rev 76078)
+++ brlcad/branches/dm-fb-merge/src/libdm/wgl/if_wgl.c 2020-06-09 00:28:50 UTC
(rev 76079)
@@ -2051,7 +2051,7 @@
#ifdef DM_PLUGIN
static const struct fb_plugin finfo = { &wgl_interface };
-DM_EXPORT const struct fb_plugin *fb_plugin_info()
+COMPILER_DLLEXPORT const struct fb_plugin *fb_plugin_info()
{
return &finfo;
}
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
