Revision: 75422
http://sourceforge.net/p/brlcad/code/75422
Author: starseeker
Date: 2020-04-16 01:22:15 +0000 (Thu, 16 Apr 2020)
Log Message:
-----------
Break out libfb defines into separate header
Modified Paths:
--------------
brlcad/trunk/include/CMakeLists.txt
brlcad/trunk/include/fb/CMakeLists.txt
brlcad/trunk/include/fb.h
Added Paths:
-----------
brlcad/trunk/include/fb/defines.h
Modified: brlcad/trunk/include/CMakeLists.txt
===================================================================
--- brlcad/trunk/include/CMakeLists.txt 2020-04-16 01:14:23 UTC (rev 75421)
+++ brlcad/trunk/include/CMakeLists.txt 2020-04-16 01:22:15 UTC (rev 75422)
@@ -10,7 +10,6 @@
add_subdirectory(nmg)
add_subdirectory(optical)
add_subdirectory(rt)
-add_subdirectory(fb)
set(public_hdrs
RtServerImpl.h
Modified: brlcad/trunk/include/fb/CMakeLists.txt
===================================================================
--- brlcad/trunk/include/fb/CMakeLists.txt 2020-04-16 01:14:23 UTC (rev
75421)
+++ brlcad/trunk/include/fb/CMakeLists.txt 2020-04-16 01:22:15 UTC (rev
75422)
@@ -1,3 +1,8 @@
+set(fb_headers
+ defines.h
+ )
+BRLCAD_MANAGE_FILES(fb_headers ${INCLUDE_DIR}/brlcad/fb)
+
set(fb_noinstall_headers
fb_ogl.h
fb_osgl.h
Added: brlcad/trunk/include/fb/defines.h
===================================================================
--- brlcad/trunk/include/fb/defines.h (rev 0)
+++ brlcad/trunk/include/fb/defines.h 2020-04-16 01:22:15 UTC (rev 75422)
@@ -0,0 +1,54 @@
+/* D E F I N E S . H
+ * BRL-CAD
+ *
+ * Copyright (c) 2004-2020 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+/** @addtogroup libfb */
+/** @{ */
+/** @file fb/defines.h
+ *
+ * "Generic" Framebuffer Library Interface Defines.
+ *
+ */
+
+#ifndef FB_DEFINES_H
+#define FB_DEFINES_H
+
+#ifndef FB_EXPORT
+# if defined(FB_DLL_EXPORTS) && defined(FB_DLL_IMPORTS)
+# error "Only FB_DLL_EXPORTS or FB_DLL_IMPORTS can be defined, not both."
+# elif defined(FB_DLL_EXPORTS)
+# define FB_EXPORT __declspec(dllexport)
+# elif defined(FB_DLL_IMPORTS)
+# define FB_EXPORT __declspec(dllimport)
+# else
+# define FB_EXPORT
+# endif
+#endif
+
+#endif /* FB_DEFINES_H */
+
+/** @} */
+/*
+ * Local Variables:
+ * mode: C
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * c-file-style: "stroustrup"
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
Property changes on: brlcad/trunk/include/fb/defines.h
___________________________________________________________________
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/trunk/include/fb.h
===================================================================
--- brlcad/trunk/include/fb.h 2020-04-16 01:14:23 UTC (rev 75421)
+++ brlcad/trunk/include/fb.h 2020-04-16 01:22:15 UTC (rev 75422)
@@ -28,18 +28,10 @@
#ifndef FB_H
#define FB_H
-#ifndef FB_EXPORT
-# if defined(FB_DLL_EXPORTS) && defined(FB_DLL_IMPORTS)
-# error "Only FB_DLL_EXPORTS or FB_DLL_IMPORTS can be defined, not both."
-# elif defined(FB_DLL_EXPORTS)
-# define FB_EXPORT __declspec(dllexport)
-# elif defined(FB_DLL_IMPORTS)
-# define FB_EXPORT __declspec(dllimport)
-# else
-# define FB_EXPORT
-# endif
-#endif
+#include "common.h"
+#include "./fb/defines.h"
+
/*
* Needed for fd_set, avoid including sys/select.h outright since it
* conflicts on some systems (e.g. freebsd4).
@@ -47,7 +39,6 @@
* FIXME: would be nice to decouple this interface from fd_set as it's
* only used in one place right now.
*/
-#include "common.h"
#if defined(HAVE_SYS_TYPES_H)
# include <sys/types.h>
#endif
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
