Revision: 75476
http://sourceforge.net/p/brlcad/code/75476
Author: starseeker
Date: 2020-04-20 20:17:41 +0000 (Mon, 20 Apr 2020)
Log Message:
-----------
Start roughing in plugin building logic across the board for libdm backends
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c
brlcad/branches/dm-fb-merge/src/libdm/glx/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/include/private.h
brlcad/branches/dm-fb-merge/src/libdm/null/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/plot/dm-plot.c
brlcad/branches/dm-fb-merge/src/libdm/postscript/dm-ps.c
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/dm-tk.c
brlcad/branches/dm-fb-merge/src/libdm/txt/dm-txt.c
brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c
Added Paths:
-----------
brlcad/branches/dm-fb-merge/src/libdm/X/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/osgl/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/plot/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/postscript/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/qt/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/tk/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/txt/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/wgl/CMakeLists.txt
Modified: brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt 2020-04-20
20:16:57 UTC (rev 75475)
+++ brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt 2020-04-20
20:17:41 UTC (rev 75476)
@@ -22,8 +22,28 @@
BRLCAD_LIB_INCLUDE_DIRS(dm DM_INCLUDE_DIRS DM_LOCAL_INCLUDE_DIRS)
add_subdirectory(null)
-add_subdirectory(glx)
+add_subdirectory(plot)
+add_subdirectory(txt)
+if(BRLCAD_ENABLE_X11 AND BRLCAD_ENABLE_OPENGL AND BRLCAD_ENABLE_TK)
+ add_subdirectory(glx)
+endif(BRLCAD_ENABLE_X11 AND BRLCAD_ENABLE_OPENGL AND BRLCAD_ENABLE_TK)
+if(BRLCAD_ENABLE_X11 AND BRLCAD_ENABLE_TK)
+ add_subdirectory(X)
+endif(BRLCAD_ENABLE_X11 AND BRLCAD_ENABLE_TK)
+if(WIN32 AND BRLCAD_ENABLE_OPENGL)
+ add_subdirectory(wgl)
+endif(WIN32 AND BRLCAD_ENABLE_OPENGL)
+if(BRLCAD_ENABLE_TK AND NOT WIN32)
+ add_subdirectory(tk)
+endif(BRLCAD_ENABLE_TK AND NOT WIN32)
+if(BRLCAD_ENABLE_OSG AND BRLCAD_ENABLE_TK)
+ add_subdirectory(osgl)
+endif(BRLCAD_ENABLE_OSG AND BRLCAD_ENABLE_TK)
+if(BRLCAD_ENABLE_QT)
+ add_subdirectory(qt)
+endif(BRLCAD_ENABLE_QT)
+
# Initialize libdm_DEFINES in case of reconfiguration
set(libdm_DEFINES "")
@@ -147,7 +167,7 @@
set_target_properties(libdm PROPERTIES VERSION 20.0.1 SOVERSION 20)
if(BRLCAD_ENABLE_OSG)
- BRLCAD_ADDEXEC(osg-test osg-test.cpp "librt;libbu;${OSG_LIBRARIES}"
NO_STRICT NO_INSTALL)
+ BRLCAD_ADDEXEC(osg-test osgl/osg-test.cpp "librt;libbu;${OSG_LIBRARIES}"
NO_STRICT NO_INSTALL)
if(CPP_DLL_DEFINES)
set_property(TARGET libdm APPEND PROPERTY COMPILE_DEFINITIONS
"FREETYPE_DLL_IMPORTS")
endif(CPP_DLL_DEFINES)
Added: brlcad/branches/dm-fb-merge/src/libdm/X/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/X/CMakeLists.txt
(rev 0)
+++ brlcad/branches/dm-fb-merge/src/libdm/X/CMakeLists.txt 2020-04-20
20:17:41 UTC (rev 75476)
@@ -0,0 +1,41 @@
+
+find_package(X11)
+find_package(TCL)
+
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${X11_INCLUDE_DIR}
+ ${TCL_INCLUDE_PATH}
+ ${TK_INCLUDE_PATH}
+ )
+
+set(X_SRCS
+ dm-X.c
+ if_X24.c
+ )
+
+set_property(SOURCE dm-X.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+set_property(SOURCE if_X24.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+
+add_definitions(-DDM_PLUGIN)
+add_definitions(-DDM_X -DIF_X)
+
+add_library(dm-X SHARED ${X_SRCS})
+target_link_libraries(dm-X libdm libbu ${TCL_LIBRARY} ${TK_LIBRARY}
${X11_LIBRARIES})
+if (CPP_DLL_DEFINES)
+ set_property(TARGET dm-X APPEND PROPERTY COMPILE_DEFINITIONS
"DM_DLL_EXPORTS")
+endif (CPP_DLL_DEFINES)
+VALIDATE_STYLE(dm-X "${X_SRCS}")
+
+PLUGIN_SETUP(dm-X dm)
+
+CMAKEFILES(dm-X.h)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
Property changes on: brlcad/branches/dm-fb-merge/src/libdm/X/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c 2020-04-20 20:16:57 UTC
(rev 75475)
+++ brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c 2020-04-20 20:17:41 UTC
(rev 75476)
@@ -2138,6 +2138,15 @@
struct dm dm_X = { &dm_X_impl };
+#ifdef DM_PLUGIN
+static const struct dm_plugin pinfo = { &dm_X };
+
+DM_EXPORT const struct dm_plugin *dm_plugin_info()
+{
+ return &pinfo;
+}
+#endif
+
/* Because class is actually used to access a struct
* entry in this file, preserve our redefinition
* of class for the benefit of avoiding C++ name
Modified: brlcad/branches/dm-fb-merge/src/libdm/glx/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/glx/CMakeLists.txt 2020-04-20
20:16:57 UTC (rev 75475)
+++ brlcad/branches/dm-fb-merge/src/libdm/glx/CMakeLists.txt 2020-04-20
20:17:41 UTC (rev 75476)
@@ -1,14 +1,19 @@
-# Include directories needed by libdm users
-set(DM_OGL_INCLUDE_DIRS
+find_package(TCL)
+find_package(X11)
+find_package(GL)
+
+include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${BRLCAD_BINARY_DIR}/include
${BRLCAD_SOURCE_DIR}/include
+ ${BU_INCLUDE_DIRS}
+ ${X11_INCLUDE_DIR}
+ ${OPENGL_INCLUDE_DIR_GL}
+ ${OPENGL_INCLUDE_DIR_GLX}
+ ${TCL_INCLUDE_PATH}
+ ${TK_INCLUDE_PATH}
)
-include_directories(${DM_OGL_INCLUDE_DIRS})
-find_package(X11)
-find_package(GL)
-
set(OGL_SRCS
dm-ogl.c
if_ogl.c
@@ -21,7 +26,7 @@
add_definitions(-DDM_OGL -DIF_OGL)
add_library(dm-ogl SHARED ${OGL_SRCS})
-target_link_libraries(dm-ogl libdm libbu ${X11_LIBRARIES} ${OPENGL_LIBRARIES})
+target_link_libraries(dm-ogl libdm libbu ${X11_LIBRARIES} ${OPENGL_LIBRARIES}
${TCL_LIBRARY} ${TK_LIBRARY})
if (CPP_DLL_DEFINES)
set_property(TARGET dm-ogl APPEND PROPERTY COMPILE_DEFINITIONS
"DM_DLL_EXPORTS")
endif (CPP_DLL_DEFINES)
Modified: brlcad/branches/dm-fb-merge/src/libdm/include/private.h
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/include/private.h 2020-04-20
20:16:57 UTC (rev 75475)
+++ brlcad/branches/dm-fb-merge/src/libdm/include/private.h 2020-04-20
20:17:41 UTC (rev 75476)
@@ -218,8 +218,6 @@
/* setting to 1 turns on general intrface debugging for all fb types */
#define FB_DEBUG 0
-__BEGIN_DECLS
-
/*
* Structure of color map in shared memory region. Has exactly the
* same format as the SGI hardware "gammaramp" map Note that only the
Modified: brlcad/branches/dm-fb-merge/src/libdm/null/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/null/CMakeLists.txt 2020-04-20
20:16:57 UTC (rev 75475)
+++ brlcad/branches/dm-fb-merge/src/libdm/null/CMakeLists.txt 2020-04-20
20:17:41 UTC (rev 75476)
@@ -1,10 +1,10 @@
# Include directories needed by libdm users
-set(DM_NULL_INCLUDE_DIRS
+include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${BRLCAD_BINARY_DIR}/include
${BRLCAD_SOURCE_DIR}/include
+ ${BU_INCLUDE_DIRS}
)
-include_directories(${DM_NULL_INCLUDE_DIRS})
set(NULL_SRCS
dm-Null.c
Added: brlcad/branches/dm-fb-merge/src/libdm/osgl/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/osgl/CMakeLists.txt
(rev 0)
+++ brlcad/branches/dm-fb-merge/src/libdm/osgl/CMakeLists.txt 2020-04-20
20:17:41 UTC (rev 75476)
@@ -0,0 +1,66 @@
+# Make sure we know about required components
+find_package(X11)
+find_package(GL)
+#find_package(OpenThreads)
+#find_package(OpenSceneGraph)
+find_package(TCL)
+
+# Include directories needed by libdm users
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${BU_INCLUDE_DIRS}
+ ${RT_INCLUDE_DIRS}
+ ${X11_INCLUDE_DIR}
+ ${OPENGL_INCLUDE_DIR_GL}
+ ${OPENGL_INCLUDE_DIR_GLX}
+ ${TCL_INCLUDE_PATH}
+ ${TK_INCLUDE_PATH}
+ ${OPENTHREADS_INCLUDE_DIR}
+ ${OSG_INCLUDE_DIR}
+ )
+
+set(OSGL_LIBRARIES
+ ${OPENGL_LIBRARIES}
+ ${TCL_LIBRARY}
+ ${TK_LIBRARY}
+ ${OSG_LIBRARY}
+ ${OSGTEXT_LIBRARY}
+ ${OSGVIEWER_LIBRARY}
+ )
+
+set(OSGL_SRCS
+ dm-osgl.cpp
+ if_osgl.cpp
+ )
+
+set_property(SOURCE dm-osgl.cpp APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+set_property(SOURCE if_osgl.cpp APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+
+add_definitions(-DDM_PLUGIN)
+add_definitions(-DDM_OSGL -DIF_OSGL)
+
+add_library(dm-osgl SHARED ${OSGL_SRCS})
+target_link_libraries(dm-osgl libdm librt libbu ${OSGL_LIBRARIES})
+if (CPP_DLL_DEFINES)
+ set_property(TARGET dm-osgl APPEND PROPERTY COMPILE_DEFINITIONS
"DM_DLL_EXPORTS")
+endif (CPP_DLL_DEFINES)
+VALIDATE_STYLE(dm-osgl "${OSGL_SRCS}")
+
+PLUGIN_SETUP(dm-osgl dm)
+
+CMAKEFILES(
+ dm-osgl.h
+ fb_osgl.h
+ osg-test.cpp
+ osg_bob.cpp
+ osg_fb_manipulator.h
+ )
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
Property changes on: brlcad/branches/dm-fb-merge/src/libdm/osgl/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: brlcad/branches/dm-fb-merge/src/libdm/plot/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/plot/CMakeLists.txt
(rev 0)
+++ brlcad/branches/dm-fb-merge/src/libdm/plot/CMakeLists.txt 2020-04-20
20:17:41 UTC (rev 75476)
@@ -0,0 +1,30 @@
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${BU_INCLUDE_DIRS}
+ )
+
+set(PLOT_SRCS
+ dm-plot.c
+ )
+
+add_definitions(-DDM_PLUGIN)
+
+add_library(dm-plot SHARED ${PLOT_SRCS})
+target_link_libraries(dm-plot libdm libbu)
+if (CPP_DLL_DEFINES)
+ set_property(TARGET dm-plot APPEND PROPERTY COMPILE_DEFINITIONS
"DM_DLL_EXPORTS")
+endif (CPP_DLL_DEFINES)
+VALIDATE_STYLE(dm-plot "${PLOT_SRCS}")
+
+PLUGIN_SETUP(dm-plot dm)
+
+CMAKEFILES(dm-plot.h)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
Property changes on: brlcad/branches/dm-fb-merge/src/libdm/plot/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: brlcad/branches/dm-fb-merge/src/libdm/plot/dm-plot.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/plot/dm-plot.c 2020-04-20
20:16:57 UTC (rev 75475)
+++ brlcad/branches/dm-fb-merge/src/libdm/plot/dm-plot.c 2020-04-20
20:17:41 UTC (rev 75476)
@@ -620,6 +620,15 @@
struct dm dm_plot = { &dm_plot_impl };
+#ifdef DM_PLUGIN
+const struct dm_plugin pinfo = { &dm_plot };
+
+DM_EXPORT const struct dm_plugin *dm_plugin_info()
+{
+ return &pinfo;
+}
+#endif
+
/*
* Fire up the display manager, and the display processor.
*
Added: brlcad/branches/dm-fb-merge/src/libdm/postscript/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/postscript/CMakeLists.txt
(rev 0)
+++ brlcad/branches/dm-fb-merge/src/libdm/postscript/CMakeLists.txt
2020-04-20 20:17:41 UTC (rev 75476)
@@ -0,0 +1,30 @@
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${BU_INCLUDE_DIRS}
+ )
+
+set(PS_SRCS
+ dm-ps.c
+ )
+
+add_definitions(-DDM_PLUGIN)
+
+add_library(dm-ps SHARED ${PS_SRCS})
+target_link_libraries(dm-ps libdm libbu)
+if (CPP_DLL_DEFINES)
+ set_property(TARGET dm-ps APPEND PROPERTY COMPILE_DEFINITIONS
"DM_DLL_EXPORTS")
+endif (CPP_DLL_DEFINES)
+VALIDATE_STYLE(dm-ps "${PS_SRCS}")
+
+PLUGIN_SETUP(dm-ps dm)
+
+CMAKEFILES(dm-ps.h)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
Property changes on:
brlcad/branches/dm-fb-merge/src/libdm/postscript/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: brlcad/branches/dm-fb-merge/src/libdm/postscript/dm-ps.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/postscript/dm-ps.c 2020-04-20
20:16:57 UTC (rev 75475)
+++ brlcad/branches/dm-fb-merge/src/libdm/postscript/dm-ps.c 2020-04-20
20:17:41 UTC (rev 75476)
@@ -591,6 +591,15 @@
struct dm dm_ps = { &dm_ps_impl };
+#ifdef DM_PLUGIN
+const struct dm_plugin pinfo = { &dm_ps };
+
+DM_EXPORT const struct dm_plugin *dm_plugin_info()
+{
+ return &pinfo;
+}
+#endif
+
/*
* Open the output file, and output the PostScript prolog.
*
Added: brlcad/branches/dm-fb-merge/src/libdm/qt/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/qt/CMakeLists.txt
(rev 0)
+++ brlcad/branches/dm-fb-merge/src/libdm/qt/CMakeLists.txt 2020-04-20
20:17:41 UTC (rev 75476)
@@ -0,0 +1,54 @@
+# Make sure we know about required components
+find_package(X11)
+find_package(GL)
+find_package(Qt5Widgets QUIET)
+find_package(TCL)
+
+# Include directories needed by libdm users
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/../include
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${BU_INCLUDE_DIRS}
+ ${TCL_INCLUDE_PATH}
+ ${TK_INCLUDE_PATH}
+ ${Qt5Widgets_INCLUDE_DIRS}
+ )
+
+set(QT_LIBRARIES
+ ${TCL_LIBRARY}
+ ${TK_LIBRARY}
+ ${Qt5Widgets_LIBRARIES}
+ )
+
+set(QT_SRCS
+ dm-qt.cpp
+ if_qt.cpp
+ )
+
+set_property(SOURCE dm-qt.cpp APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+set_property(SOURCE if_qt.cpp APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+
+add_definitions(-DDM_PLUGIN)
+add_definitions(-DDM_QT -DIF_QT)
+
+add_library(dm-qt SHARED ${QT_SRCS})
+target_link_libraries(dm-qt libdm libbu ${QT_LIBRARIES})
+if (CPP_DLL_DEFINES)
+ set_property(TARGET dm-qt APPEND PROPERTY COMPILE_DEFINITIONS
"DM_DLL_EXPORTS")
+endif (CPP_DLL_DEFINES)
+VALIDATE_STYLE(dm-qt "${QT_SRCS}")
+
+PLUGIN_SETUP(dm-qt dm)
+
+CMAKEFILES(
+ fb_qt.h
+ )
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
Property changes on: brlcad/branches/dm-fb-merge/src/libdm/qt/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp 2020-04-20 20:16:57 UTC
(rev 75475)
+++ brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp 2020-04-20 20:17:41 UTC
(rev 75476)
@@ -1137,6 +1137,15 @@
extern "C" {
struct dm dm_qt = { &dm_qt_impl };
+
+#ifdef DM_PLUGIN
+ static const struct dm_plugin pinfo = { &dm_qt };
+
+ DM_EXPORT const struct dm_plugin *dm_plugin_info()
+ {
+ return &pinfo;
+ }
+#endif
}
/**
Modified: brlcad/branches/dm-fb-merge/src/libdm/qt/if_qt.cpp
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/qt/if_qt.cpp 2020-04-20 20:16:57 UTC
(rev 75475)
+++ brlcad/branches/dm-fb-merge/src/libdm/qt/if_qt.cpp 2020-04-20 20:17:41 UTC
(rev 75476)
@@ -108,8 +108,8 @@
unsigned char *qi_grnmap;
};
-#define QI(ptr) ((struct qtinfo *)((ptr)->u1.p))
-#define QI_SET(ptr, val) ((ptr)->u1.p) = (char *) val;
+#define QI(ptr) ((struct qtinfo *)((ptr)->i->u1.p))
+#define QI_SET(ptr, val) ((ptr)->i->u1.p) = (char *) val;
/* Flags in qi_flags */
#define FLG_LINCMAP 0x10 /* We're using a linear colormap */
Added: brlcad/branches/dm-fb-merge/src/libdm/tk/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/tk/CMakeLists.txt
(rev 0)
+++ brlcad/branches/dm-fb-merge/src/libdm/tk/CMakeLists.txt 2020-04-20
20:17:41 UTC (rev 75476)
@@ -0,0 +1,39 @@
+find_package(TCL)
+
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${BU_INCLUDE_DIRS}
+ ${TCL_INCLUDE_PATH}
+ ${TK_INCLUDE_PATH}
+ )
+
+set(TK_SRCS
+ dm-tk.c
+ if_tk.c
+ )
+
+set_property(SOURCE dm-tk.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+set_property(SOURCE if_tk24.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+
+add_definitions(-DDM_PLUGIN)
+add_definitions(-DDM_TK -DIF_TK)
+
+add_library(dm-tk SHARED ${TK_SRCS})
+target_link_libraries(dm-tk libdm libbu ${TCL_LIBRARY} ${TK_LIBRARY})
+if (CPP_DLL_DEFINES)
+ set_property(TARGET dm-tk APPEND PROPERTY COMPILE_DEFINITIONS
"DM_DLL_EtkPORTS")
+endif (CPP_DLL_DEFINES)
+VALIDATE_STYLE(dm-tk "${TK_SRCS}")
+
+PLUGIN_SETUP(dm-tk dm)
+
+CMAKEFILES(dm-tk.h)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
Property changes on: brlcad/branches/dm-fb-merge/src/libdm/tk/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c 2020-04-20 20:16:57 UTC
(rev 75475)
+++ brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c 2020-04-20 20:17:41 UTC
(rev 75476)
@@ -999,7 +999,16 @@
struct dm dm_tk = { &dm_tk_impl };
+#ifdef DM_PLUGIN
+static const struct dm_plugin pinfo = { &dm_tk };
+DM_EXPORT const struct dm_plugin *dm_plugin_info()
+{
+ return &pinfo;
+}
+#endif
+
+
/* Display Manager package interface */
/*
Added: brlcad/branches/dm-fb-merge/src/libdm/txt/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/txt/CMakeLists.txt
(rev 0)
+++ brlcad/branches/dm-fb-merge/src/libdm/txt/CMakeLists.txt 2020-04-20
20:17:41 UTC (rev 75476)
@@ -0,0 +1,29 @@
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${BU_INCLUDE_DIRS}
+ )
+
+set(TXT_SRCS
+ dm-txt.c
+ if_debug.c
+ )
+
+add_definitions(-DDM_PLUGIN)
+
+add_library(dm-txt SHARED ${TXT_SRCS})
+target_link_libraries(dm-txt libdm libbu)
+if (CPP_DLL_DEFINES)
+ set_property(TARGET dm-txt APPEND PROPERTY COMPILE_DEFINITIONS
"DM_DLL_EXPORTS")
+endif (CPP_DLL_DEFINES)
+VALIDATE_STYLE(dm-txt "${TXT_SRCS}")
+
+PLUGIN_SETUP(dm-txt dm)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
Property changes on: brlcad/branches/dm-fb-merge/src/libdm/txt/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: brlcad/branches/dm-fb-merge/src/libdm/txt/dm-txt.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/txt/dm-txt.c 2020-04-20 20:16:57 UTC
(rev 75475)
+++ brlcad/branches/dm-fb-merge/src/libdm/txt/dm-txt.c 2020-04-20 20:17:41 UTC
(rev 75476)
@@ -431,7 +431,15 @@
struct dm dm_txt = { &dm_txt_impl };
+#ifdef DM_PLUGIN
+const struct dm_plugin pinfo = { &dm_txt };
+DM_EXPORT const struct dm_plugin *dm_plugin_info()
+{
+ return &pinfo;
+}
+#endif
+
/*
* Local Variables:
* mode: C
Added: brlcad/branches/dm-fb-merge/src/libdm/wgl/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/wgl/CMakeLists.txt
(rev 0)
+++ brlcad/branches/dm-fb-merge/src/libdm/wgl/CMakeLists.txt 2020-04-20
20:17:41 UTC (rev 75476)
@@ -0,0 +1,40 @@
+find_package(GL)
+find_package(TCL)
+
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${OPENGL_INCLUDE_DIR_GL}
+ ${TCL_INCLUDE_PATH}
+ ${TK_INCLUDE_PATH}
+ )
+
+set(WGL_SRCS
+ dm-wgl.c
+ if_wgl.c
+ )
+
+set_property(SOURCE dm-wgl.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+set_property(SOURCE if_wgl.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+
+add_definitions(-DDM_PLUGIN)
+add_definitions(-DDM_WGL -DIF_WGL)
+
+add_library(dm-wgl SHARED ${WGL_SRCS})
+target_link_libraries(dm-wgl libdm libbu ${TCL_LIBRARY} ${TK_LIBRARY}
${OPENGL_LIBRARIES})
+if (CPP_DLL_DEFINES)
+ set_property(TARGET dm-wgl APPEND PROPERTY COMPILE_DEFINITIONS
"DM_DLL_EXPORTS")
+endif (CPP_DLL_DEFINES)
+VALIDATE_STYLE(dm-wgl "${WGL_SRCS}")
+
+PLUGIN_SETUP(dm-wgl dm)
+
+CMAKEFILES(dm-wgl.h)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
Property changes on: brlcad/branches/dm-fb-merge/src/libdm/wgl/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c 2020-04-20 20:16:57 UTC
(rev 75475)
+++ brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c 2020-04-20 20:17:41 UTC
(rev 75476)
@@ -2285,7 +2285,15 @@
struct dm dm_wgl = { &dm_wgl_impl };
+#ifdef DM_PLUGIN
+static const struct dm_plugin pinfo = { &dm_wgl };
+DM_EXPORT const struct dm_plugin *dm_plugin_info()
+{
+ return &pinfo;
+}
+#endif
+
/*
* Fire up the display manager, and the display processor.
*
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
