Revision: 76675
http://sourceforge.net/p/brlcad/code/76675
Author: starseeker
Date: 2020-08-06 17:40:33 +0000 (Thu, 06 Aug 2020)
Log Message:
-----------
Shouldn't need the defines at lower levels either...
Modified Paths:
--------------
brlcad/trunk/src/libdm/X/CMakeLists.txt
brlcad/trunk/src/libdm/X/fb_X.h
brlcad/trunk/src/libdm/glx/CMakeLists.txt
brlcad/trunk/src/libdm/glx/fb_ogl.h
brlcad/trunk/src/libdm/glx/if_ogl.c
brlcad/trunk/src/libdm/osgl/CMakeLists.txt
brlcad/trunk/src/libdm/osgl/fb_osgl.h
brlcad/trunk/src/libdm/osgl/if_osgl.cpp
brlcad/trunk/src/libdm/qt/CMakeLists.txt
brlcad/trunk/src/libdm/qt/fb_qt.h
brlcad/trunk/src/libdm/tk/CMakeLists.txt
brlcad/trunk/src/libdm/wgl/CMakeLists.txt
brlcad/trunk/src/libdm/wgl/fb_wgl.h
Modified: brlcad/trunk/src/libdm/X/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/X/CMakeLists.txt 2020-08-06 17:32:20 UTC (rev
76674)
+++ brlcad/trunk/src/libdm/X/CMakeLists.txt 2020-08-06 17:40:33 UTC (rev
76675)
@@ -21,7 +21,6 @@
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})
Modified: brlcad/trunk/src/libdm/X/fb_X.h
===================================================================
--- brlcad/trunk/src/libdm/X/fb_X.h 2020-08-06 17:32:20 UTC (rev 76674)
+++ brlcad/trunk/src/libdm/X/fb_X.h 2020-08-06 17:40:33 UTC (rev 76675)
@@ -30,7 +30,6 @@
/** @} */
#ifdef FB_USE_INTERNAL_API
-#ifdef IF_X
#include "common.h"
#include <X11/X.h>
@@ -42,7 +41,6 @@
XVisualInfo *vip;
GC gc;
};
-#endif /* IF_X */
#endif /* FB_USE_INTERNAL_API */
/*
Modified: brlcad/trunk/src/libdm/glx/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/glx/CMakeLists.txt 2020-08-06 17:32:20 UTC (rev
76674)
+++ brlcad/trunk/src/libdm/glx/CMakeLists.txt 2020-08-06 17:40:33 UTC (rev
76675)
@@ -23,7 +23,6 @@
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}
${TCL_LIBRARY} ${TK_LIBRARY})
Modified: brlcad/trunk/src/libdm/glx/fb_ogl.h
===================================================================
--- brlcad/trunk/src/libdm/glx/fb_ogl.h 2020-08-06 17:32:20 UTC (rev 76674)
+++ brlcad/trunk/src/libdm/glx/fb_ogl.h 2020-08-06 17:40:33 UTC (rev 76675)
@@ -30,7 +30,6 @@
/** @} */
#ifdef FB_USE_INTERNAL_API
-#ifdef IF_OGL
#include "common.h"
# ifdef HAVE_X11_XLIB_H
# include <X11/Xlib.h>
@@ -68,7 +67,6 @@
int double_buffer;
int soft_cmap;
};
-#endif /* IF_OGL */
#endif /* FB_USE_INTERNAL_API */
/*
Modified: brlcad/trunk/src/libdm/glx/if_ogl.c
===================================================================
--- brlcad/trunk/src/libdm/glx/if_ogl.c 2020-08-06 17:32:20 UTC (rev 76674)
+++ brlcad/trunk/src/libdm/glx/if_ogl.c 2020-08-06 17:40:33 UTC (rev 76675)
@@ -36,8 +36,6 @@
#include "common.h"
-#ifdef IF_OGL
-
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
@@ -2363,13 +2361,6 @@
* collisions until the end of this file */
#undef class
-#else
-
-/* quell empty-compilation unit warnings */
-static const int unused = 0;
-
-#endif /* IF_OGL */
-
/*
* Local Variables:
* mode: C
Modified: brlcad/trunk/src/libdm/osgl/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/osgl/CMakeLists.txt 2020-08-06 17:32:20 UTC (rev
76674)
+++ brlcad/trunk/src/libdm/osgl/CMakeLists.txt 2020-08-06 17:40:33 UTC (rev
76675)
@@ -39,7 +39,6 @@
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})
Modified: brlcad/trunk/src/libdm/osgl/fb_osgl.h
===================================================================
--- brlcad/trunk/src/libdm/osgl/fb_osgl.h 2020-08-06 17:32:20 UTC (rev
76674)
+++ brlcad/trunk/src/libdm/osgl/fb_osgl.h 2020-08-06 17:40:33 UTC (rev
76675)
@@ -30,7 +30,6 @@
/** @} */
#ifdef FB_USE_INTERNAL_API
-#ifdef IF_OSGL
#include "common.h"
#ifdef HAVE_SIGNAL_H
@@ -120,7 +119,6 @@
int double_buffer;
int soft_cmap;
};
-#endif /* IF_OSGL */
#endif /* FB_USE_INTERNAL_API */
Modified: brlcad/trunk/src/libdm/osgl/if_osgl.cpp
===================================================================
--- brlcad/trunk/src/libdm/osgl/if_osgl.cpp 2020-08-06 17:32:20 UTC (rev
76674)
+++ brlcad/trunk/src/libdm/osgl/if_osgl.cpp 2020-08-06 17:40:33 UTC (rev
76675)
@@ -35,8 +35,6 @@
/** @} */
-#ifdef IF_OSGL
-
#include "common.h"
#include <osg/GLExtensions>
@@ -1528,13 +1526,6 @@
* collisions until the end of this file */
#undef class
-#else
-
-/* quell empty-compilation unit warnings */
-static const int unused = 0;
-
-#endif /* IF_OSGL */
-
/*
* Local Variables:
* mode: C
Modified: brlcad/trunk/src/libdm/qt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/qt/CMakeLists.txt 2020-08-06 17:32:20 UTC (rev
76674)
+++ brlcad/trunk/src/libdm/qt/CMakeLists.txt 2020-08-06 17:40:33 UTC (rev
76675)
@@ -31,7 +31,6 @@
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})
Modified: brlcad/trunk/src/libdm/qt/fb_qt.h
===================================================================
--- brlcad/trunk/src/libdm/qt/fb_qt.h 2020-08-06 17:32:20 UTC (rev 76674)
+++ brlcad/trunk/src/libdm/qt/fb_qt.h 2020-08-06 17:40:33 UTC (rev 76675)
@@ -30,7 +30,6 @@
/** @} */
#ifdef FB_USE_INTERNAL_API
-#ifdef IF_QT
#include "common.h"
#include <QApplication>
#include <QPainter>
@@ -46,7 +45,6 @@
void *draw;
void **qimg;
};
-#endif /* IF_QT */
#endif /* FB_USE_INTERNAL_API */
/*
Modified: brlcad/trunk/src/libdm/tk/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/tk/CMakeLists.txt 2020-08-06 17:32:20 UTC (rev
76674)
+++ brlcad/trunk/src/libdm/tk/CMakeLists.txt 2020-08-06 17:40:33 UTC (rev
76675)
@@ -18,7 +18,6 @@
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})
Modified: brlcad/trunk/src/libdm/wgl/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/wgl/CMakeLists.txt 2020-08-06 17:32:20 UTC (rev
76674)
+++ brlcad/trunk/src/libdm/wgl/CMakeLists.txt 2020-08-06 17:40:33 UTC (rev
76675)
@@ -19,7 +19,6 @@
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}
${OPENGL32_LIBRARY} ${OPENGL_LIBRARIES})
Modified: brlcad/trunk/src/libdm/wgl/fb_wgl.h
===================================================================
--- brlcad/trunk/src/libdm/wgl/fb_wgl.h 2020-08-06 17:32:20 UTC (rev 76674)
+++ brlcad/trunk/src/libdm/wgl/fb_wgl.h 2020-08-06 17:40:33 UTC (rev 76675)
@@ -30,7 +30,6 @@
/** @} */
#ifdef FB_USE_INTERNAL_API
-#ifdef IF_WGL
# include "common.h"
# include "bio.h"
@@ -52,7 +51,6 @@
int double_buffer;
int soft_cmap;
};
-#endif /* IF_WGL */
#endif /* FB_USE_INTERNAL_API */
/*
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
