Revision: 75552
http://sourceforge.net/p/brlcad/code/75552
Author: starseeker
Date: 2020-04-22 20:14:31 +0000 (Wed, 22 Apr 2020)
Log Message:
-----------
Move fontstash into the osgl subdir
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/doc/legal/embedded/fontstash.txt
brlcad/branches/dm-fb-merge/doc/legal/embedded/stb_truetype.txt
brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libdm/osgl/CMakeLists.txt
Added Paths:
-----------
brlcad/branches/dm-fb-merge/src/libdm/osgl/fontstash/
Removed Paths:
-------------
brlcad/branches/dm-fb-merge/src/libdm/fontstash/
Modified: brlcad/branches/dm-fb-merge/doc/legal/embedded/fontstash.txt
===================================================================
--- brlcad/branches/dm-fb-merge/doc/legal/embedded/fontstash.txt
2020-04-22 20:02:40 UTC (rev 75551)
+++ brlcad/branches/dm-fb-merge/doc/legal/embedded/fontstash.txt
2020-04-22 20:14:31 UTC (rev 75552)
@@ -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/fontstash/fontstash.h
-file:src/libdm/fontstash/glfontstash.h
+file:src/libdm/osgl/fontstash/fontstash.h
+file:src/libdm/osgl/fontstash/glfontstash.h
Modified: brlcad/branches/dm-fb-merge/doc/legal/embedded/stb_truetype.txt
===================================================================
--- brlcad/branches/dm-fb-merge/doc/legal/embedded/stb_truetype.txt
2020-04-22 20:02:40 UTC (rev 75551)
+++ brlcad/branches/dm-fb-merge/doc/legal/embedded/stb_truetype.txt
2020-04-22 20:14:31 UTC (rev 75552)
@@ -15,4 +15,4 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-file:src/libdm/fontstash/stb_truetype.h
+file:src/libdm/osgl/fontstash/stb_truetype.h
Modified: brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt 2020-04-22
20:02:40 UTC (rev 75551)
+++ brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt 2020-04-22
20:14:31 UTC (rev 75552)
@@ -109,11 +109,6 @@
X/dm-X.h
X/if_X24.c
include/private.h
- fontstash/LICENSE.fontstash
- fontstash/README.md
- fontstash/fontstash.h
- fontstash/glfontstash.h
- fontstash/stb_truetype.h
glx/dm-glx.h
glx/dm-ogl.c
glx/dm-ogl.h
Modified: brlcad/branches/dm-fb-merge/src/libdm/osgl/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/osgl/CMakeLists.txt 2020-04-22
20:02:40 UTC (rev 75551)
+++ brlcad/branches/dm-fb-merge/src/libdm/osgl/CMakeLists.txt 2020-04-22
20:14:31 UTC (rev 75552)
@@ -56,6 +56,11 @@
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:
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
