Revision: 78238
http://sourceforge.net/p/brlcad/code/78238
Author: starseeker
Date: 2021-02-11 20:08:24 +0000 (Thu, 11 Feb 2021)
Log Message:
-----------
Move fontstash up a level - it may get used in more than one dm backend, and
there's no point particular point in multiple copies.
Modified Paths:
--------------
brlcad/trunk/doc/legal/embedded/fontstash.txt
brlcad/trunk/src/libdm/CMakeLists.txt
brlcad/trunk/src/libdm/osgl/CMakeLists.txt
brlcad/trunk/src/libdm/osgl/dm-osgl.h
Added Paths:
-----------
brlcad/trunk/src/libdm/fontstash/
Removed Paths:
-------------
brlcad/trunk/src/libdm/osgl/fontstash/
Modified: brlcad/trunk/doc/legal/embedded/fontstash.txt
===================================================================
--- brlcad/trunk/doc/legal/embedded/fontstash.txt 2021-02-11 02:17:12 UTC
(rev 78237)
+++ brlcad/trunk/doc/legal/embedded/fontstash.txt 2021-02-11 20:08:24 UTC
(rev 78238)
@@ -14,5 +14,5 @@
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
-file:/src/libdm/osgl/fontstash/fontstash.h
-file:/src/libdm/osgl/fontstash/glfontstash.h
+file:/src/libdm/fontstash/fontstash.h
+file:/src/libdm/fontstash/glfontstash.h
Modified: brlcad/trunk/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/CMakeLists.txt 2021-02-11 02:17:12 UTC (rev
78237)
+++ brlcad/trunk/src/libdm/CMakeLists.txt 2021-02-11 20:08:24 UTC (rev
78238)
@@ -100,6 +100,11 @@
null/dm-Null.h
include/private.h
include/calltable.h
+ fontstash/LICENSE.fontstash
+ fontstash/README.md
+ fontstash/fontstash.h
+ fontstash/glfontstash.h
+ fontstash/stb_truetype.h
)
CMAKEFILES(${libdm_ignore_files})
Modified: brlcad/trunk/src/libdm/osgl/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/osgl/CMakeLists.txt 2021-02-11 02:17:12 UTC (rev
78237)
+++ brlcad/trunk/src/libdm/osgl/CMakeLists.txt 2021-02-11 20:08:24 UTC (rev
78238)
@@ -73,11 +73,6 @@
osg-test.cpp
osg_bob.cpp
osg_fb_manipulator.h
- fontstash/LICENSE.fontstash
- fontstash/README.md
- fontstash/fontstash.h
- fontstash/glfontstash.h
- fontstash/stb_truetype.h
)
# Local Variables:
Modified: brlcad/trunk/src/libdm/osgl/dm-osgl.h
===================================================================
--- brlcad/trunk/src/libdm/osgl/dm-osgl.h 2021-02-11 02:17:12 UTC (rev
78237)
+++ brlcad/trunk/src/libdm/osgl/dm-osgl.h 2021-02-11 20:08:24 UTC (rev
78238)
@@ -72,7 +72,7 @@
#endif
#if defined(__GNUC__) && !defined(__clang__)
# pragma GCC diagnostic ignored "-Wfloat-equal"
-#include "./fontstash/fontstash.h"
+#include "../fontstash/fontstash.h"
#endif
#if defined(__clang__)
# pragma clang diagnostic ignored "-Wfloat-equal"
@@ -79,7 +79,7 @@
#endif
#define GLFONTSTASH_IMPLEMENTATION
-#include "./fontstash/glfontstash.h"
+#include "../fontstash/glfontstash.h"
#if defined(__GNUC__) && !defined(__clang__)
# pragma GCC diagnostic pop
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
