Revision: 75504
http://sourceforge.net/p/brlcad/code/75504
Author: starseeker
Date: 2020-04-21 19:34:31 +0000 (Tue, 21 Apr 2020)
Log Message:
-----------
The null dm is a special case, doesn't really make sense as a plugin - it's the
one that has to always be guaranteed for this to work at all...
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/dm_plugins.cpp
Removed Paths:
-------------
brlcad/branches/dm-fb-merge/src/libdm/null/CMakeLists.txt
Modified: brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt 2020-04-21
19:20:48 UTC (rev 75503)
+++ brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt 2020-04-21
19:34:31 UTC (rev 75504)
@@ -21,7 +21,6 @@
BRLCAD_LIB_INCLUDE_DIRS(dm DM_INCLUDE_DIRS DM_LOCAL_INCLUDE_DIRS)
-add_subdirectory(null)
add_subdirectory(plot)
add_subdirectory(txt)
@@ -129,9 +128,6 @@
${dmqt_srcs}
null/dm-Null.c
null/if_null.c
- plot/dm-plot.c
- postscript/dm-ps.c
- txt/dm-txt.c
txt/if_debug.c
adc.c
asize.c
Modified: brlcad/branches/dm-fb-merge/src/libdm/dm_plugins.cpp
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/dm_plugins.cpp 2020-04-21
19:20:48 UTC (rev 75503)
+++ brlcad/branches/dm-fb-merge/src/libdm/dm_plugins.cpp 2020-04-21
19:34:31 UTC (rev 75504)
@@ -14,7 +14,12 @@
extern "C" struct dm *
dm_open(void *interp, const char *type, int argc, const char *argv[])
{
-
+ if (BU_STR_EQUIV(type, "nu")) {
+ return dm_null.i->dm_open(interp, argc, argv);
+ }
+ if (BU_STR_EQUIV(type, "null")) {
+ return dm_null.i->dm_open(interp, argc, argv);
+ }
std::map<std::string, const struct dm *> *dmb = (std::map<std::string,
const struct dm *> *)dm_backends;
std::map<std::string, const struct dm *>::iterator d_it =
dmb->find(std::string(type));
if (d_it == dmb->end()) {
@@ -49,6 +54,8 @@
if (strlen(bu_vls_cstr(list)) > 0) bu_vls_printf(list, "%s",
bu_vls_cstr(&sep));
bu_vls_printf(list, "%s", dm_get_name(d));
}
+ if (strlen(bu_vls_cstr(list)) > 0) bu_vls_printf(list, "%s",
bu_vls_cstr(&sep));
+ bu_vls_printf(list, "nu");
return list;
}
@@ -56,6 +63,12 @@
extern "C" int
dm_validXType(const char *dpy_string, const char *name)
{
+ if (BU_STR_EQUIV(name, "nu")) {
+ return 1;
+ }
+ if (BU_STR_EQUIV(name, "null")) {
+ return 1;
+ }
std::map<std::string, const struct dm *> *dmb = (std::map<std::string,
const struct dm *> *)dm_backends;
std::map<std::string, const struct dm *>::iterator d_it =
dmb->find(std::string(name));
if (d_it == dmb->end()) {
Deleted: brlcad/branches/dm-fb-merge/src/libdm/null/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/null/CMakeLists.txt 2020-04-21
19:20:48 UTC (rev 75503)
+++ brlcad/branches/dm-fb-merge/src/libdm/null/CMakeLists.txt 2020-04-21
19:34:31 UTC (rev 75504)
@@ -1,32 +0,0 @@
-# Include directories needed by libdm users
-include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${BRLCAD_BINARY_DIR}/include
- ${BRLCAD_SOURCE_DIR}/include
- ${BU_INCLUDE_DIRS}
- )
-
-set(NULL_SRCS
- dm-Null.c
- if_null.c
- )
-
-add_definitions(-DDM_PLUGIN)
-
-add_library(dm_null SHARED ${NULL_SRCS})
-target_link_libraries(dm_null libdm libbu)
-if (CPP_DLL_DEFINES)
- set_property(TARGET dm_null APPEND PROPERTY COMPILE_DEFINITIONS
"DM_DLL_EXPORTS")
-endif (CPP_DLL_DEFINES)
-VALIDATE_STYLE(dm_null "${NULL_SRCS}")
-
-PLUGIN_SETUP(dm_null dm)
-
-CMAKEFILES(dm-Null.h)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
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
