Revision: 76770
http://sourceforge.net/p/brlcad/code/76770
Author: starseeker
Date: 2020-08-15 01:11:03 +0000 (Sat, 15 Aug 2020)
Log Message:
-----------
Pull in the latest RELEASE changes through r76769.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/include/dm/defines.h
brlcad/trunk/misc/CMake/BRLCAD_Util.cmake
brlcad/trunk/misc/CMake/distclean.cmake.in
brlcad/trunk/regress/burst/CMakeLists.txt
brlcad/trunk/regress/dsp/CMakeLists.txt
brlcad/trunk/regress/iges/CMakeLists.txt
brlcad/trunk/regress/red/CMakeLists.txt
brlcad/trunk/regress/repository/repocheck.cpp
brlcad/trunk/src/libdm/X/dm-X.c
brlcad/trunk/src/libdm/dm_init.cpp
brlcad/trunk/src/libdm/glx/dm-ogl.c
brlcad/trunk/src/libdm/include/calltable.h
brlcad/trunk/src/libdm/osgl/dm-osgl.cpp
brlcad/trunk/src/libdm/plot/CMakeLists.txt
brlcad/trunk/src/libdm/plot/dm-plot.c
brlcad/trunk/src/libdm/postscript/CMakeLists.txt
brlcad/trunk/src/libdm/postscript/dm-ps.c
brlcad/trunk/src/libdm/qt/dm-qt.cpp
brlcad/trunk/src/libdm/tk/dm-tk.c
brlcad/trunk/src/libdm/txt/dm-txt.c
brlcad/trunk/src/libdm/wgl/dm-wgl.c
Property Changed:
----------------
brlcad/trunk/
brlcad/trunk/NEWS
brlcad/trunk/include/
brlcad/trunk/regress/
Index: brlcad/trunk
===================================================================
--- brlcad/trunk 2020-08-15 01:05:57 UTC (rev 76769)
+++ brlcad/trunk 2020-08-15 01:11:03 UTC (rev 76770)
Property changes on: brlcad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
-/brlcad/branches/RELEASE:57439,57447-57860,69901-69913,70323-70333,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140,75372-75685,76001-76451,76693-76746
+/brlcad/branches/RELEASE:57439,57447-57860,69901-69913,70323-70333,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140,75372-75685,76001-76451,76693-76768
/brlcad/branches/bioh:75720-75736,75740-75742,75860-75891,75894-75986,76088-76153,76354-76506,76577
/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
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2020-08-15 01:05:57 UTC (rev 76769)
+++ brlcad/trunk/CMakeLists.txt 2020-08-15 01:11:03 UTC (rev 76770)
@@ -3737,25 +3737,18 @@
get_property(CMAKE_DISTCLEAN_TARGET_LIST GLOBAL PROPERTY
CMAKE_DISTCLEAN_TARGET_LIST)
list(REMOVE_DUPLICATES CMAKE_DISTCLEAN_TARGET_LIST)
configure_file("${BRLCAD_CMAKE_DIR}/distclean.cmake.in"
"${BRLCAD_BINARY_DIR}/distclean.cmake" @ONLY)
-if("${CMAKE_GENERATOR}" MATCHES "Make")
+if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
add_custom_target(distclean
- COMMAND ${CMAKE_COMMAND} -E echo "Running make clean..."
- COMMAND ${CMAKE_COMMAND} -E chdir "${BRLCAD_BINARY_DIR}" $(MAKE) clean
- COMMAND ${CMAKE_COMMAND} -E echo "Running make clean... done."
COMMAND ${CMAKE_COMMAND} -P "${BRLCAD_BINARY_DIR}/distclean.cmake"
)
-elseif("${CMAKE_GENERATOR}" MATCHES "Ninja")
+else ("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
add_custom_target(distclean
- COMMAND ${CMAKE_COMMAND} -E echo "Running make clean..."
- COMMAND ${CMAKE_COMMAND} -E chdir "${BRLCAD_BINARY_DIR}" ninja -t clean
- COMMAND ${CMAKE_COMMAND} -E echo "Running make clean... done."
+ COMMAND ${CMAKE_COMMAND} -E echo "Running clean target..."
+ COMMAND ${CMAKE_COMMAND} --build ${BRLCAD_BINARY_DIR} --target clean
+ COMMAND ${CMAKE_COMMAND} -E echo "Running clean target... done."
COMMAND ${CMAKE_COMMAND} -P "${BRLCAD_BINARY_DIR}/distclean.cmake"
)
-else("${CMAKE_GENERATOR}" MATCHES "Make")
- add_custom_target(distclean
- COMMAND ${CMAKE_COMMAND} -E echo "Not implemented for generator
${CMAKE_GENERATOR}"
- )
-endif("${CMAKE_GENERATOR}" MATCHES "Make")
+endif ("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
if(TARGET distclean)
set_target_properties(distclean PROPERTIES FOLDER "Compilation Utilities")
endif(TARGET distclean)
Index: brlcad/trunk/NEWS
===================================================================
--- brlcad/trunk/NEWS 2020-08-15 01:05:57 UTC (rev 76769)
+++ brlcad/trunk/NEWS 2020-08-15 01:11:03 UTC (rev 76770)
Property changes on: brlcad/trunk/NEWS
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
-/brlcad/branches/RELEASE/NEWS:57439,57447-57860,68609-68613,69901-69913,70323-70333,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140,76001-76451
+/brlcad/branches/RELEASE/NEWS:57439,57447-57860,68609-68613,69901-69913,70323-70333,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140,76001-76451,76726-76768
/brlcad/branches/bioh/NEWS:75894-75986,76088-76153,76354-76506
/brlcad/branches/brep-debug/NEWS: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/NEWS:62518
Index: brlcad/trunk/include
===================================================================
--- brlcad/trunk/include 2020-08-15 01:05:57 UTC (rev 76769)
+++ brlcad/trunk/include 2020-08-15 01:11:03 UTC (rev 76770)
Property changes on: brlcad/trunk/include
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
-/brlcad/branches/RELEASE/include:57439,57447-57860,69901-69913,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140,75372-75681
+/brlcad/branches/RELEASE/include:57439,57447-57860,69901-69913,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140,75372-75681,76726-76768
/brlcad/branches/bioh/include:75720-75736,75740-75742,75860-75891,75894-75986,76088-76153,76354-76506
/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
Modified: brlcad/trunk/include/dm/defines.h
===================================================================
--- brlcad/trunk/include/dm/defines.h 2020-08-15 01:05:57 UTC (rev 76769)
+++ brlcad/trunk/include/dm/defines.h 2020-08-15 01:11:03 UTC (rev 76770)
@@ -26,6 +26,8 @@
#ifndef DM_DEFINES_H
#define DM_DEFINES_H
+#include "common.h"
+
#ifndef DM_EXPORT
# if defined(DM_DLL_EXPORTS) && defined(DM_DLL_IMPORTS)
# error "Only DM_DLL_EXPORTS or DM_DLL_IMPORTS can be defined, not both."
@@ -57,6 +59,7 @@
};
struct dm_plugin {
+ uint32_t api_version;
const struct dm * const p;
};
Modified: brlcad/trunk/misc/CMake/BRLCAD_Util.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Util.cmake 2020-08-15 01:05:57 UTC (rev
76769)
+++ brlcad/trunk/misc/CMake/BRLCAD_Util.cmake 2020-08-15 01:11:03 UTC (rev
76770)
@@ -45,7 +45,13 @@
define_property(GLOBAL PROPERTY CMAKE_DISTCLEAN_TARGET_LIST BRIEF_DOCS "All
CMake generated files" FULL_DOCS "List of all files generated by CMake")
function(distclean)
foreach(item ${ARGN})
- set_property(GLOBAL APPEND PROPERTY CMAKE_DISTCLEAN_TARGET_LIST "${item}")
+ get_filename_component(item_dir ${item} DIRECTORY)
+ if ("${item_dir}" STREQUAL "")
+ set(item_path "${CMAKE_CURRENT_BINARY_DIR}/${item}")
+ else ("${item_dir}" STREQUAL "")
+ set(item_path "${item}")
+ endif ("${item_dir}" STREQUAL "")
+ set_property(GLOBAL APPEND PROPERTY CMAKE_DISTCLEAN_TARGET_LIST
"${item_path}")
endforeach(item ${ARGN})
endfunction(distclean)
Modified: brlcad/trunk/misc/CMake/distclean.cmake.in
===================================================================
--- brlcad/trunk/misc/CMake/distclean.cmake.in 2020-08-15 01:05:57 UTC (rev
76769)
+++ brlcad/trunk/misc/CMake/distclean.cmake.in 2020-08-15 01:11:03 UTC (rev
76770)
@@ -53,6 +53,15 @@
endif(EXISTS "@BRLCAD_BINARY_DIR@/source_archive_contents")
message("Removing CMake-generated files... done.")
+# Visual Studio solution file generated by CMake doesn't seem to produce
+# a clean target msbuild is happy with. (Maybe this issue?
+# https://github.com/dotnet/msbuild/issues/3019) Until that can work,
+# scrub manually.
+if(EXISTS "@BRLCAD_BINARY_DIR@/BRLCAD.sln")
+ file(GLOB_RECURSE VSFILES LIST_DIRECTORIES TRUE RELATIVE
"@BRLCAD_BINARY_DIR@" "*")
+ file(REMOVE_RECURSE ${VSFILES})
+endif(EXISTS "@BRLCAD_BINARY_DIR@/BRLCAD.sln")
+
# Need to recursively go down the directories to get a full list.
# Easier to use a function, so maintain the directory list in
# a global property
Index: brlcad/trunk/regress
===================================================================
--- brlcad/trunk/regress 2020-08-15 01:05:57 UTC (rev 76769)
+++ brlcad/trunk/regress 2020-08-15 01:11:03 UTC (rev 76770)
Property changes on: brlcad/trunk/regress
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
-/brlcad/branches/RELEASE/regress:57439,57447-57860,69901-69913,71917-72242,72525-72534,72826-72858,74376-74454,75372-75681,76704-76746
+/brlcad/branches/RELEASE/regress:57439,57447-57860,69901-69913,71917-72242,72525-72534,72826-72858,74376-74454,75372-75681,76704-76768
/brlcad/branches/bioh/regress:75860-75891,75894-75986,76088-76153,76354-76506
/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
Modified: brlcad/trunk/regress/burst/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/burst/CMakeLists.txt 2020-08-15 01:05:57 UTC (rev
76769)
+++ brlcad/trunk/regress/burst/CMakeLists.txt 2020-08-15 01:11:03 UTC (rev
76770)
@@ -16,17 +16,13 @@
ktank.g
ktank_burst.shotlines
burst_ktank.log
+ regress-burst.log
)
- foreach(BCF ${BURST_CLEAN_FILES})
- DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/${BCF}")
- endforeach(BCF ${BURST_CLEAN_FILES})
- DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/regress-burst.log")
+ DISTCLEAN(${BURST_CLEAN_FILES})
# If we copied the input files, clear them out as well
if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
- foreach(BIF ${BURST_INPUT_FILES})
- DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/${BCF}")
- endforeach(BIF ${BURST_INPUT_FILES})
+ DISTCLEAN(${BURST_INPUT_FILES})
endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL
"${CMAKE_CURRENT_BINARY_DIR}")
endif (TARGET ktank.g)
Modified: brlcad/trunk/regress/dsp/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/dsp/CMakeLists.txt 2020-08-15 01:05:57 UTC (rev
76769)
+++ brlcad/trunk/regress/dsp/CMakeLists.txt 2020-08-15 01:11:03 UTC (rev
76770)
@@ -1,8 +1,12 @@
if (SH_EXEC AND TARGET mged)
- add_test(NAME regress-dsp COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/dsp.sh" ${CMAKE_SOURCE_DIR})
- BRLCAD_REGRESSION_TEST(regress-dsp "mged;cv;asc2pix;rt;pix-bw" TEST_DEFINED)
+ if (NOT WIN32)
+ add_test(NAME regress-dsp COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/dsp.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-dsp "mged;cv;asc2pix;rt;pix-bw"
TEST_DEFINED)
+ else (NOT WIN32)
+ message(WARNING "regress-dsp failes on some Windows platforms (pix-bw
appears to hang on github runners) - skipping")
+ endif (NOT WIN32)
endif (SH_EXEC AND TARGET mged)
Modified: brlcad/trunk/regress/iges/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/iges/CMakeLists.txt 2020-08-15 01:05:57 UTC (rev
76769)
+++ brlcad/trunk/regress/iges/CMakeLists.txt 2020-08-15 01:11:03 UTC (rev
76770)
@@ -1,8 +1,12 @@
if (SH_EXEC AND TARGET mged AND TARGET asc2g)
- add_test(NAME regress-iges COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/iges.sh" ${CMAKE_SOURCE_DIR})
- BRLCAD_REGRESSION_TEST(regress-iges "iges-g;g-iges;mged;asc2g" TEST_DEFINED)
+ if (NOT WIN32)
+ add_test(NAME regress-iges COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/iges.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-iges "iges-g;g-iges;mged;asc2g"
TEST_DEFINED)
+ else (NOT WIN32)
+ message(WARNING "iges.sh doesn not currently pass on Windows - disabling")
+ endif (NOT WIN32)
endif (SH_EXEC AND TARGET mged AND TARGET asc2g)
Modified: brlcad/trunk/regress/red/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/red/CMakeLists.txt 2020-08-15 01:05:57 UTC (rev
76769)
+++ brlcad/trunk/regress/red/CMakeLists.txt 2020-08-15 01:11:03 UTC (rev
76770)
@@ -1,8 +1,12 @@
if (SH_EXEC AND TARGET mged)
- add_test(NAME regress-red COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/red.sh" ${CMAKE_SOURCE_DIR})
- BRLCAD_REGRESSION_TEST(regress-red mged TEST_DEFINED)
+ if (NOT WIN32)
+ add_test(NAME regress-red COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/red.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-red mged TEST_DEFINED)
+ else (NOT WIN32)
+ message(WARNING "regress-red does not currently pass on Windows,
disabling")
+ endif (NOT WIN32)
endif (SH_EXEC AND TARGET mged)
Modified: brlcad/trunk/regress/repository/repocheck.cpp
===================================================================
--- brlcad/trunk/regress/repository/repocheck.cpp 2020-08-15 01:05:57 UTC
(rev 76769)
+++ brlcad/trunk/regress/repository/repocheck.cpp 2020-08-15 01:11:03 UTC
(rev 76770)
@@ -60,7 +60,7 @@
#include "bu/str.h"
#define MAX_LINES_CHECK 500
-#define EXPECTED_PLATFORM_SYMBOLS 254
+#define EXPECTED_PLATFORM_SYMBOLS 257
class repo_info_t {
public:
Modified: brlcad/trunk/src/libdm/X/dm-X.c
===================================================================
--- brlcad/trunk/src/libdm/X/dm-X.c 2020-08-15 01:05:57 UTC (rev 76769)
+++ brlcad/trunk/src/libdm/X/dm-X.c 2020-08-15 01:11:03 UTC (rev 76770)
@@ -2166,7 +2166,7 @@
struct dm dm_X = { &dm_X_impl };
#ifdef DM_PLUGIN
-static const struct dm_plugin pinfo = { &dm_X };
+static const struct dm_plugin pinfo = { DM_API, &dm_X };
COMPILER_DLLEXPORT const struct dm_plugin *dm_plugin_info()
{
Modified: brlcad/trunk/src/libdm/dm_init.cpp
===================================================================
--- brlcad/trunk/src/libdm/dm_init.cpp 2020-08-15 01:05:57 UTC (rev 76769)
+++ brlcad/trunk/src/libdm/dm_init.cpp 2020-08-15 01:11:03 UTC (rev 76770)
@@ -98,12 +98,24 @@
const struct dm_plugin *plugin = plugin_info();
- if (!plugin || !plugin->p) {
+ if (!plugin) {
bu_vls_printf(dm_init_msg_str, "Invalid plugin encountered from
'%s' (skipping)\n", pfile);
bu_dlclose(dl_handle);
continue;
}
+ if (((uintptr_t)(plugin) & (sizeof((uintptr_t)(plugin))-1)) ||
*((const uint32_t *)(plugin)) != (uint32_t)(DM_API)) {
+ bu_vls_printf(dm_init_msg_str, "Plugin version %d of '%s'
differs from %d (skipping)\n", *((const uint32_t *)(plugin)), pfile, DM_API);
+ bu_dlclose(dl_handle);
+ continue;
+ }
+
+ if (!plugin->p) {
+ bu_vls_printf(dm_init_msg_str, "Invalid plugin encountered from
'%s' (skipping)\n", pfile);
+ bu_dlclose(dl_handle);
+ continue;
+ }
+
const struct dm *d = plugin->p;
const char *dname = dm_get_name(d);
if (!dname) {
Modified: brlcad/trunk/src/libdm/glx/dm-ogl.c
===================================================================
--- brlcad/trunk/src/libdm/glx/dm-ogl.c 2020-08-15 01:05:57 UTC (rev 76769)
+++ brlcad/trunk/src/libdm/glx/dm-ogl.c 2020-08-15 01:11:03 UTC (rev 76770)
@@ -3104,7 +3104,7 @@
struct dm dm_ogl = { &dm_ogl_impl };
#ifdef DM_PLUGIN
-static const struct dm_plugin pinfo = { &dm_ogl };
+static const struct dm_plugin pinfo = { DM_API, &dm_ogl };
COMPILER_DLLEXPORT const struct dm_plugin *dm_plugin_info()
{
Modified: brlcad/trunk/src/libdm/include/calltable.h
===================================================================
--- brlcad/trunk/src/libdm/include/calltable.h 2020-08-15 01:05:57 UTC (rev
76769)
+++ brlcad/trunk/src/libdm/include/calltable.h 2020-08-15 01:11:03 UTC (rev
76770)
@@ -39,9 +39,12 @@
#include "bu/parse.h"
#include "bu/vls.h"
#include "dm.h"
+#include "brlcad_version.h"
__BEGIN_DECLS
+#define DM_API ((BRLCAD_VERSION_MAJOR*10000) + (BRLCAD_VERSION_MINOR*100) +
BRLCAD_VERSION_PATCH)
+
struct dm_vars {
void *pub_vars;
void *priv_vars;
Modified: brlcad/trunk/src/libdm/osgl/dm-osgl.cpp
===================================================================
--- brlcad/trunk/src/libdm/osgl/dm-osgl.cpp 2020-08-15 01:05:57 UTC (rev
76769)
+++ brlcad/trunk/src/libdm/osgl/dm-osgl.cpp 2020-08-15 01:11:03 UTC (rev
76770)
@@ -2756,7 +2756,7 @@
struct dm dm_osgl = { &dm_osgl_impl };
#ifdef DM_PLUGIN
- static const struct dm_plugin pinfo = { &dm_osgl };
+ static const struct dm_plugin pinfo = { DM_API, &dm_osgl };
COMPILER_DLLEXPORT const struct dm_plugin *dm_plugin_info()
{
Modified: brlcad/trunk/src/libdm/plot/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/plot/CMakeLists.txt 2020-08-15 01:05:57 UTC (rev
76769)
+++ brlcad/trunk/src/libdm/plot/CMakeLists.txt 2020-08-15 01:11:03 UTC (rev
76770)
@@ -5,8 +5,6 @@
if(BRLCAD_ENABLE_TCL)
- find_package(TCL)
-
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${BRLCAD_BINARY_DIR}/include
Modified: brlcad/trunk/src/libdm/plot/dm-plot.c
===================================================================
--- brlcad/trunk/src/libdm/plot/dm-plot.c 2020-08-15 01:05:57 UTC (rev
76769)
+++ brlcad/trunk/src/libdm/plot/dm-plot.c 2020-08-15 01:11:03 UTC (rev
76770)
@@ -763,7 +763,7 @@
struct dm dm_plot = { &dm_plot_impl };
#ifdef DM_PLUGIN
-const struct dm_plugin pinfo = { &dm_plot };
+const struct dm_plugin pinfo = { DM_API, &dm_plot };
COMPILER_DLLEXPORT const struct dm_plugin *dm_plugin_info()
{
Modified: brlcad/trunk/src/libdm/postscript/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/postscript/CMakeLists.txt 2020-08-15 01:05:57 UTC
(rev 76769)
+++ brlcad/trunk/src/libdm/postscript/CMakeLists.txt 2020-08-15 01:11:03 UTC
(rev 76770)
@@ -17,7 +17,7 @@
add_definitions(-DDM_PLUGIN)
add_library(dm-ps SHARED ${PS_SRCS})
- target_link_libraries(dm-ps libdm libbu ${TCL_LIBRARY})
+ target_link_libraries(dm-ps libdm libbu)
set_property(TARGET dm-ps APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
VALIDATE_STYLE(dm-ps "${PS_SRCS}")
Modified: brlcad/trunk/src/libdm/postscript/dm-ps.c
===================================================================
--- brlcad/trunk/src/libdm/postscript/dm-ps.c 2020-08-15 01:05:57 UTC (rev
76769)
+++ brlcad/trunk/src/libdm/postscript/dm-ps.c 2020-08-15 01:11:03 UTC (rev
76770)
@@ -833,7 +833,7 @@
struct dm dm_ps = { &dm_ps_impl };
#ifdef DM_PLUGIN
-const struct dm_plugin pinfo = { &dm_ps };
+const struct dm_plugin pinfo = { DM_API, &dm_ps };
COMPILER_DLLEXPORT const struct dm_plugin *dm_plugin_info()
{
Modified: brlcad/trunk/src/libdm/qt/dm-qt.cpp
===================================================================
--- brlcad/trunk/src/libdm/qt/dm-qt.cpp 2020-08-15 01:05:57 UTC (rev 76769)
+++ brlcad/trunk/src/libdm/qt/dm-qt.cpp 2020-08-15 01:11:03 UTC (rev 76770)
@@ -1408,7 +1408,7 @@
struct dm dm_qt = { &dm_qt_impl };
#ifdef DM_PLUGIN
- static const struct dm_plugin pinfo = { &dm_qt };
+ static const struct dm_plugin pinfo = { DM_API, &dm_qt };
COMPILER_DLLEXPORT const struct dm_plugin *dm_plugin_info()
{
Modified: brlcad/trunk/src/libdm/tk/dm-tk.c
===================================================================
--- brlcad/trunk/src/libdm/tk/dm-tk.c 2020-08-15 01:05:57 UTC (rev 76769)
+++ brlcad/trunk/src/libdm/tk/dm-tk.c 2020-08-15 01:11:03 UTC (rev 76770)
@@ -1205,7 +1205,7 @@
struct dm dm_tk = { &dm_tk_impl };
#ifdef DM_PLUGIN
-static const struct dm_plugin pinfo = { &dm_tk };
+static const struct dm_plugin pinfo = { DM_API, &dm_tk };
COMPILER_DLLEXPORT const struct dm_plugin *dm_plugin_info()
{
Modified: brlcad/trunk/src/libdm/txt/dm-txt.c
===================================================================
--- brlcad/trunk/src/libdm/txt/dm-txt.c 2020-08-15 01:05:57 UTC (rev 76769)
+++ brlcad/trunk/src/libdm/txt/dm-txt.c 2020-08-15 01:11:03 UTC (rev 76770)
@@ -456,7 +456,7 @@
struct dm dm_txt = { &dm_txt_impl };
#ifdef DM_PLUGIN
-const struct dm_plugin pinfo = { &dm_txt };
+const struct dm_plugin pinfo = { DM_API, &dm_txt };
COMPILER_DLLEXPORT const struct dm_plugin *dm_plugin_info()
{
Modified: brlcad/trunk/src/libdm/wgl/dm-wgl.c
===================================================================
--- brlcad/trunk/src/libdm/wgl/dm-wgl.c 2020-08-15 01:05:57 UTC (rev 76769)
+++ brlcad/trunk/src/libdm/wgl/dm-wgl.c 2020-08-15 01:11:03 UTC (rev 76770)
@@ -2683,7 +2683,7 @@
struct dm dm_wgl = { &dm_wgl_impl };
#ifdef DM_PLUGIN
-static const struct dm_plugin pinfo = { &dm_wgl };
+static const struct dm_plugin pinfo = { DM_API, &dm_wgl };
COMPILER_DLLEXPORT const struct dm_plugin *dm_plugin_info()
{
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
