Revision: 75515
http://sourceforge.net/p/brlcad/code/75515
Author: starseeker
Date: 2020-04-22 00:47:14 +0000 (Wed, 22 Apr 2020)
Log Message:
-----------
remove IF_ and DM_ conditionals
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/X/color.c
brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c
brlcad/branches/dm-fb-merge/src/libdm/X/if_X24.c
brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c
brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp
brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.h
brlcad/branches/dm-fb-merge/src/libdm/osgl/if_osgl.cpp
brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp
brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.h
brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c
brlcad/branches/dm-fb-merge/src/libdm/tk/if_tk.c
brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c
brlcad/branches/dm-fb-merge/src/libdm/wgl/if_wgl.c
Modified: brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt 2020-04-22
00:44:51 UTC (rev 75514)
+++ brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt 2020-04-22
00:47:14 UTC (rev 75515)
@@ -93,12 +93,12 @@
BRLCAD_ADDLIB(libdm "${LIBDM_SRCS}"
"librt;libbu;libpkg;${TCL_LIBRARY};${TK_LIBRARY};${OPENGL_LIBRARIES};${PNG_LIBRARIES}")
set_target_properties(libdm PROPERTIES VERSION 20.0.1 SOVERSION 20)
-if(BRLCAD_ENABLE_OSG)
- 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)
-endif(BRLCAD_ENABLE_OSG)
+#if(BRLCAD_ENABLE_OSG)
+# 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)
+#endif(BRLCAD_ENABLE_OSG)
if (TARGET tk)
add_dependencies(libdm tk)
Modified: brlcad/branches/dm-fb-merge/src/libdm/X/color.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/X/color.c 2020-04-22 00:44:51 UTC
(rev 75514)
+++ brlcad/branches/dm-fb-merge/src/libdm/X/color.c 2020-04-22 00:47:14 UTC
(rev 75515)
@@ -23,8 +23,6 @@
#include "common.h"
-#ifdef DM_X
-
#include <stdio.h>
#include <string.h>
@@ -146,9 +144,6 @@
}
}
-
-#endif /* DM_X */
-
/*
* Local Variables:
* mode: C
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-22 00:44:51 UTC
(rev 75514)
+++ brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c 2020-04-22 00:47:14 UTC
(rev 75515)
@@ -25,8 +25,6 @@
#include "common.h"
-#ifdef DM_X
-
#include <stdlib.h>
#include <stdio.h>
#include <limits.h>
@@ -2167,8 +2165,6 @@
* collisions until the end of this file */
#undef class
-#endif /* DM_X */
-
/*
* Local Variables:
* mode: C
Modified: brlcad/branches/dm-fb-merge/src/libdm/X/if_X24.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/X/if_X24.c 2020-04-22 00:44:51 UTC
(rev 75514)
+++ brlcad/branches/dm-fb-merge/src/libdm/X/if_X24.c 2020-04-22 00:47:14 UTC
(rev 75515)
@@ -32,8 +32,6 @@
#include "common.h"
-#ifdef IF_X
-
#include <errno.h>
#include <stdlib.h>
#include <time.h>
@@ -3559,13 +3557,6 @@
* collisions until the end of this file */
#undef class
-#else
-
-/* quell empty-compilation unit warnings */
-static const int unused = 0;
-
-#endif /* IF_X */
-
/*
* Local Variables:
* mode: C
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-22 00:44:51 UTC
(rev 75514)
+++ brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c 2020-04-22 00:47:14 UTC
(rev 75515)
@@ -25,8 +25,6 @@
#include "common.h"
-#ifdef DM_OGL
-
#include <stdlib.h>
#include <stdio.h>
#include <math.h>
@@ -3098,8 +3096,6 @@
}
#endif
-#endif /* DM_OGL */
-
/*
* Local Variables:
* mode: C
Modified: brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp 2020-04-22
00:44:51 UTC (rev 75514)
+++ brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp 2020-04-22
00:47:14 UTC (rev 75515)
@@ -25,8 +25,6 @@
#include "common.h"
-#ifdef DM_OSGL
-
//#define OSG_VIEWER_TEST 1
#include <string.h>
@@ -2262,7 +2260,7 @@
unsigned int green_mask = 0x00ff0000;
unsigned int blue_mask = 0x0000ff00;
int h, w;
-#if defined(DM_WGL)
+#ifdef _WIN32
unsigned int alpha_mask = 0x000000ff;
int big_endian;
int swap_bytes;
@@ -2283,7 +2281,7 @@
{
glReadBuffer(GL_FRONT);
-#if defined(DM_WGL)
+#ifdef _WIN32
/* XXX GL_UNSIGNED_INT_8_8_8_8 is currently not
* available on windows. Need to update when it
* becomes available.
@@ -2303,7 +2301,7 @@
int i_h_inv = (height - h - 1)*width + w;
int j = i*bytes_per_pixel;
unsigned char *value = (unsigned char *)(idata + j);
-#if defined(DM_WGL)
+#ifdef _WIN32
unsigned char alpha;
#endif
@@ -2313,7 +2311,7 @@
value[1] = (pixel & green_mask) >> 16;
value[2] = (pixel & blue_mask) >> 8;
-#if defined(DM_WGL)
+#ifdef _WIN32
alpha = pixel & alpha_mask;
if (swap_bytes) {
unsigned char tmp_byte;
@@ -2729,7 +2727,6 @@
}
#endif
}
-#endif /* DM_OSGL */
/*
* Local Variables:
Modified: brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.h
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.h 2020-04-22
00:44:51 UTC (rev 75514)
+++ brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.h 2020-04-22
00:47:14 UTC (rev 75515)
@@ -26,8 +26,6 @@
#ifndef DM_OSGL_H
#define DM_OSGL_H
-#ifdef DM_OSGL
-
#include "common.h"
#include "bu/vls.h"
@@ -145,7 +143,6 @@
__END_DECLS
-#endif /* DM_OSGL */
#endif /* DM_OSGL_H */
/** @} */
Modified: brlcad/branches/dm-fb-merge/src/libdm/osgl/if_osgl.cpp
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/osgl/if_osgl.cpp 2020-04-22
00:44:51 UTC (rev 75514)
+++ brlcad/branches/dm-fb-merge/src/libdm/osgl/if_osgl.cpp 2020-04-22
00:47:14 UTC (rev 75515)
@@ -1505,6 +1505,7 @@
{0} /* u6 */
};
+extern "C" {
struct fb osgl_interface = { &osgl_interface_impl };
#ifdef DM_PLUGIN
@@ -1514,6 +1515,7 @@
{
return &finfo;
}
+}
#endif
/* Because class is actually used to access a struct
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-22 00:44:51 UTC
(rev 75514)
+++ brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp 2020-04-22 00:47:14 UTC
(rev 75515)
@@ -23,8 +23,6 @@
#include "common.h"
#include <locale.h>
-#ifdef DM_QT
-
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
@@ -1420,7 +1418,6 @@
}
-#endif /* DM_QT */
/*
* Local Variables:
* mode: C++
Modified: brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.h
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.h 2020-04-22 00:44:51 UTC
(rev 75514)
+++ brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.h 2020-04-22 00:47:14 UTC
(rev 75515)
@@ -28,7 +28,6 @@
#include "vmath.h"
-#ifdef DM_QT
# include <QApplication>
# include <QPainter>
# include <QWindow>
@@ -92,9 +91,6 @@
int devbuttonrelease;
};
-
-#endif /* DM_QT */
-
#endif /* DM_QT_H */
/** @} */
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-22 00:44:51 UTC
(rev 75514)
+++ brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c 2020-04-22 00:47:14 UTC
(rev 75515)
@@ -25,8 +25,6 @@
#include "common.h"
-#ifdef DM_TK
-
#include <stdlib.h>
#include <stdio.h>
#include <limits.h>
@@ -1213,10 +1211,6 @@
}
#endif
-
-
-#endif /* DM_TK */
-
/*
* Local Variables:
* mode: C
Modified: brlcad/branches/dm-fb-merge/src/libdm/tk/if_tk.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/tk/if_tk.c 2020-04-22 00:44:51 UTC
(rev 75514)
+++ brlcad/branches/dm-fb-merge/src/libdm/tk/if_tk.c 2020-04-22 00:47:14 UTC
(rev 75515)
@@ -28,8 +28,6 @@
#include "common.h"
-#ifdef IF_TK
-
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
@@ -646,13 +644,6 @@
}
#endif
-#else
-
-/* quell empty-compilation unit warnings */
-static const int unused = 0;
-
-#endif /* IF_TK */
-
/*
* Local Variables:
* mode: C
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-22 00:44:51 UTC
(rev 75514)
+++ brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c 2020-04-22 00:47:14 UTC
(rev 75515)
@@ -25,8 +25,6 @@
#include "common.h"
-#ifdef DM_WGL
-
#include "tk.h"
/* needed for TkWinGetHWND() */
#include "TkWinInt.h"
@@ -2669,9 +2667,6 @@
}
#endif
-
-#endif /* DM_WGL */
-
/*
* Local Variables:
* mode: C
Modified: brlcad/branches/dm-fb-merge/src/libdm/wgl/if_wgl.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/wgl/if_wgl.c 2020-04-22 00:44:51 UTC
(rev 75514)
+++ brlcad/branches/dm-fb-merge/src/libdm/wgl/if_wgl.c 2020-04-22 00:47:14 UTC
(rev 75515)
@@ -35,8 +35,6 @@
#include "common.h"
-#ifdef IF_WGL
-
#include <stdlib.h>
#include <ctype.h>
#include <errno.h>
@@ -2058,13 +2056,6 @@
}
#endif
-#else
-
-/* quell empty-compilation unit warnings */
-static const int unused = 0;
-
-#endif /* IF_WGL */
-
/*
* Local Variables:
* mode: C
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
