move-osd_fontmgr-vis

Move OSD_FontMgr from TKernel into TKOpenGl.

This avoids having libTKernel depend on X11.

Submitted upstream: http://www.opencascade.org/org/forum/thread_20042/

Gbp-Pq: Topic submitted
Gbp-Pq: Name move-osd_fontmgr-vis.patch

diff --git a/ros/adm/make/TKOpenGl/Makefile.am b/ros/adm/make/TKOpenGl/Makefile.am
index 8cb3f623ac81a914a19139cf359ce4accec6c8a9..70919fd51d1a2a0db26f9f1c7d4407c0e03fdbbe 100644 (file)
--- a/ros/adm/make/TKOpenGl/Makefile.am
+++ b/ros/adm/make/TKOpenGl/Makefile.am
@@ -2,6 +2,7 @@
 srcdir = @srcdir@
 
 VPATH = @srcdir@ : \
+@top_srcdir@/drv/OSD : @top_srcdir@/src/OSD : \
 @top_srcdir@/drv/OpenGl : @top_srcdir@/src/OpenGl
 
 
@@ -12,8 +13,9 @@ AM_CFLAGS = -DSILGL \
 -DSILGL_VRS=50
 
 
-INCLUDES = $(STLPort_INCLUDES) $(CSF_OpenGlLibs_INCLUDES) $(CSF_FREETYPE_INCLUDES) $(CSF_FTGL_INCLUDES) $(CSF_GL2PS_INCLUDES) $(CSF_user32_INCLUDES) $(CSF_gdi32_INCLUDES)  \
+INCLUDES = $(STLPort_INCLUDES) $(CSF_OpenGlLibs_INCLUDES) $(CSF_FREETYPE_INCLUDES) $(CSF_FTGL_INCLUDES) $(CSF_MotifLibs_INCLUDES) $(CSF_GL2PS_INCLUDES) $(CSF_user32_INCLUDES) $(CSF_gdi32_INCLUDES)  \
 -I@top_srcdir@/inc \
+-I@top_srcdir@/drv/OSD -I@top_srcdir@/src/OSD \
 -I@top_srcdir@/drv/OpenGl -I@top_srcdir@/src/OpenGl
 
 
@@ -23,9 +25,10 @@ libTKOpenGl_la_LIBADD = \
 ../TKService/libTKService.la \
 ../TKernel/libTKernel.la \
 ../TKV3d/libTKV3d.la \
-$(STLPort_LIB) $(CSF_OpenGlLibs_LIB) $(CSF_FREETYPE_LIB) $(CSF_FTGL_LIB) $(CSF_GL2PS_LIB) $(CSF_user32_LIB) $(CSF_gdi32_LIB) 
+$(STLPort_LIB) $(CSF_OpenGlLibs_LIB) $(CSF_FREETYPE_LIB) $(CSF_FTGL_LIB) $(CSF_GL2PS_LIB) $(CSF_MotifLibs_LIB) $(CSF_user32_LIB) $(CSF_gdi32_LIB) 
 
 libTKOpenGl_la_SOURCES = \
+@top_srcdir@/src/OSD/OSD_FontMgr.cxx \
 @top_srcdir@/drv/OpenGl/OpenGl_Error_0.cxx \
 @top_srcdir@/src/OpenGl/OpenGl_AVIWriter.cxx \
 @top_srcdir@/src/OpenGl/OpenGl_Extension.cxx \

diff --git a/ros/adm/make/TKernel/Makefile.am b/ros/adm/make/TKernel/Makefile.am
index e5cd99be6ac50af9bc3f435d758832fcfce340bf..99e327c41bfeefa9840a0ab47374fc06d1585dc2 100644 (file)
--- a/ros/adm/make/TKernel/Makefile.am
+++ b/ros/adm/make/TKernel/Makefile.am
@@ -29,7 +29,7 @@ AM_CXXFLAGS =
 AM_CFLAGS = 
 
 
-INCLUDES = $(STLPort_INCLUDES) $(CSF_SOCKETLibs_INCLUDES) $(CSF_FPELibs_INCLUDES) $(CSF_ThreadLibs_INCLUDES) $(CSF_advapi32_INCLUDES) $(CSF_gdi32_INCLUDES) $(CSF_user32_INCLUDES) $(CSF_kernel32_INCLUDES) $(CSF_TBB_INCLUDES) $(CSF_MotifLibs_INCLUDES)  \
+INCLUDES = $(STLPort_INCLUDES) $(CSF_SOCKETLibs_INCLUDES) $(CSF_FPELibs_INCLUDES) $(CSF_ThreadLibs_INCLUDES) $(CSF_advapi32_INCLUDES) $(CSF_gdi32_INCLUDES) $(CSF_user32_INCLUDES) $(CSF_kernel32_INCLUDES) $(CSF_TBB_INCLUDES) \
 -I@top_srcdir@/inc \
 -I@top_srcdir@/drv/FSD -I@top_srcdir@/src/FSD \
 -I@top_srcdir@/drv/MMgt -I@top_srcdir@/src/MMgt \
@@ -55,7 +55,7 @@ INCLUDES = $(STLPort_INCLUDES) $(CSF_SOCKETLibs_INCLUDES) $(CSF_FPELibs_INCLUDES
 lib_LTLIBRARIES=libTKernel.la
 
 libTKernel_la_LIBADD = \
-$(STLPort_LIB) $(CSF_SOCKETLibs_LIB) $(CSF_FPELibs_LIB) $(CSF_ThreadLibs_LIB) $(CSF_advapi32_LIB) $(CSF_gdi32_LIB) $(CSF_user32_LIB) $(CSF_kernel32_LIB) $(CSF_TBB_LIB) $(CSF_MotifLibs_LIB) 
+$(STLPort_LIB) $(CSF_SOCKETLibs_LIB) $(CSF_FPELibs_LIB) $(CSF_ThreadLibs_LIB) $(CSF_advapi32_LIB) $(CSF_gdi32_LIB) $(CSF_user32_LIB) $(CSF_kernel32_LIB) $(CSF_TBB_LIB) 
 
 libTKernel_la_SOURCES = \
 @top_srcdir@/drv/Dico/Dico_DictionaryOfInteger_0.cxx \
@@ -389,7 +389,6 @@ libTKernel_la_SOURCES = \
 @top_srcdir@/src/OSD/OSD_File.cxx \
 @top_srcdir@/src/OSD/OSD_FileIterator.cxx \
 @top_srcdir@/src/OSD/OSD_FileNode.cxx \
-@top_srcdir@/src/OSD/OSD_FontMgr.cxx \
 @top_srcdir@/src/OSD/OSD_Function.cxx \
 @top_srcdir@/src/OSD/OSD_Getkey.c \
 @top_srcdir@/src/OSD/OSD_Host.cxx \