Revision: 75469
http://sourceforge.net/p/brlcad/code/75469
Author: starseeker
Date: 2020-04-20 15:59:40 +0000 (Mon, 20 Apr 2020)
Log Message:
-----------
Get two plugins working
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c
brlcad/branches/dm-fb-merge/src/libdm/null/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.c
Added Paths:
-----------
brlcad/branches/dm-fb-merge/src/libdm/glx/CMakeLists.txt
Modified: brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt 2020-04-20
13:56:34 UTC (rev 75468)
+++ brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt 2020-04-20
15:59:40 UTC (rev 75469)
@@ -22,6 +22,7 @@
BRLCAD_LIB_INCLUDE_DIRS(dm DM_INCLUDE_DIRS DM_LOCAL_INCLUDE_DIRS)
add_subdirectory(null)
+add_subdirectory(glx)
# Initialize libdm_DEFINES in case of reconfiguration
set(libdm_DEFINES "")
Added: brlcad/branches/dm-fb-merge/src/libdm/glx/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/glx/CMakeLists.txt
(rev 0)
+++ brlcad/branches/dm-fb-merge/src/libdm/glx/CMakeLists.txt 2020-04-20
15:59:40 UTC (rev 75469)
@@ -0,0 +1,39 @@
+# Include directories needed by libdm users
+set(DM_OGL_INCLUDE_DIRS
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ )
+include_directories(${DM_OGL_INCLUDE_DIRS})
+
+find_package(X11)
+find_package(GL)
+
+set(OGL_SRCS
+ dm-ogl.c
+ if_ogl.c
+ )
+
+set_property(SOURCE dm-ogl.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+set_property(SOURCE if_ogl.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+
+add_definitions(-DDM_PLUGIN)
+add_definitions(-DDM_OGL -DIF_OGL)
+
+add_library(dm-ogl SHARED ${OGL_SRCS})
+target_link_libraries(dm-ogl libdm libbu ${X11_LIBRARIES} ${OPENGL_LIBRARIES})
+if (CPP_DLL_DEFINES)
+ set_property(TARGET dm-ogl APPEND PROPERTY COMPILE_DEFINITIONS
"DM_DLL_EXPORTS")
+endif (CPP_DLL_DEFINES)
+VALIDATE_STYLE(dm-ogl "${OGL_SRCS}")
+
+PLUGIN_SETUP(dm-ogl dm)
+
+CMAKEFILES(dm-ogl.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/glx/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/glx/dm-ogl.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c 2020-04-20 13:56:34 UTC
(rev 75468)
+++ brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c 2020-04-20 15:59:40 UTC
(rev 75469)
@@ -2997,6 +2997,15 @@
struct dm dm_ogl = { &dm_ogl_impl };
+#ifdef DM_PLUGIN
+static const struct dm_plugin pinfo = { &dm_ogl };
+
+DM_EXPORT const struct dm_plugin *dm_plugin_info()
+{
+ return &pinfo;
+}
+#endif
+
#endif /* DM_OGL */
/*
Modified: brlcad/branches/dm-fb-merge/src/libdm/null/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/null/CMakeLists.txt 2020-04-20
13:56:34 UTC (rev 75468)
+++ brlcad/branches/dm-fb-merge/src/libdm/null/CMakeLists.txt 2020-04-20
15:59:40 UTC (rev 75469)
@@ -11,6 +11,8 @@
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)
Modified: brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.c 2020-04-20
13:56:34 UTC (rev 75468)
+++ brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.c 2020-04-20
15:59:40 UTC (rev 75469)
@@ -375,6 +375,7 @@
struct dm dm_null = { &dm_null_impl };
+#ifdef DM_PLUGIN
const struct dm_plugin pinfo = { &dm_null };
DM_EXPORT const struct dm_plugin *dm_plugin_info()
@@ -381,6 +382,7 @@
{
return &pinfo;
}
+#endif
/*
* Local Variables:
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
