scsh-conservatory
/
scx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build with xft support.

This commit is contained in:
mainzelm 2003-12-02 12:10:28 +00:00
parent abdae75b90
commit 8c463b59fd
6 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
c/Makefile.am
View File

@ -1,10 +1,15 @@
SUBDIRS = xlib SUBDIRS = xlib libs
EXTRA_DIST= \ libsys_LTLIBRARIES = libscx.la
xt/resource.c \
xt/widget.c \ libscx_la_SOURCES =
libs/xrender.c \
libs/xft.c \ libscx_la_LIBADD = xlib/libscxx11.la libs/libscxxft.la
libs/xft.h \ # EXTRA_DIST= \
libs/xpm.c \ # xt/resource.c \
libs/xrender.h # xt/widget.c \
# libs/xrender.c \
# libs/xft.c \
# libs/xft.h \
# libs/xpm.c \
# libs/xrender.h

10
c/libs/Makefile.am Normal file
View File

@ -0,0 +1,10 @@
INCLUDES = -I@top_srcdir@/c/xlib -I@top_srcdir@/c/libs -I@x_includes@ \
-I@top_srcdir@/c -I@scsh_includes@
noinst_LTLIBRARIES = libscxxft.la
libscxxft_la_SOURCES = \
xft.c xrender.c
libscxxft_la_LIBADD = $(X_LIBS) -lXft
libscxxft_la_LDFLAGS= -avoid-version -module

8
c/xlib/Makefile.am
View File

@ -1,13 +1,13 @@
INCLUDES = -I@top_srcdir@/c/xlib -I@top_srcdir@/c/libs -I@x_includes@ \ INCLUDES = -I@top_srcdir@/c/xlib -I@top_srcdir@/c/libs -I@x_includes@ \
-I@top_srcdir@/c -I@scsh_includes@ -I@top_srcdir@/c -I@scsh_includes@
libsys_LTLIBRARIES = libscx.la noinst_LTLIBRARIES = libscxx11.la
libscx_la_SOURCES = \ libscxx11_la_SOURCES = \
client.c colormap.c cursor.c display.c error.c event-types.c \ client.c colormap.c cursor.c display.c error.c event-types.c \
event.c font.c gcontext.c grab.c graphics.c init.c key.c \ event.c font.c gcontext.c grab.c graphics.c init.c key.c \
pixmap.c property.c region.c text.c types.c util.c visual.c window.c \ pixmap.c property.c region.c text.c types.c util.c visual.c window.c \
wm.c xlib.h wm.c xlib.h
libscx_la_LIBADD = $(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS) -lX11 libscxx11_la_LIBADD = $(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS) -lX11
libscx_la_LDFLAGS= -avoid-version -module libscxx11_la_LDFLAGS= -avoid-version -module

2
configure.in
View File

@ -58,4 +58,4 @@
AC_SUBST(x_libraries) AC_SUBST(x_libraries)
AC_SUBST(extra_objects) AC_SUBST(extra_objects)
AC_OUTPUT([Makefile c/Makefile c/xlib/Makefile scheme/Makefile]) AC_OUTPUT([Makefile c/Makefile c/xlib/Makefile c/libs/Makefile scheme/Makefile])

4
scheme/Makefile.am
View File

@ -46,11 +46,13 @@ CLEANFILES= load-scx.scm
load-scx.scm: $(srcdir)/load-scx.scm.in load-scx.scm: $(srcdir)/load-scx.scm.in
sed -e "s|@scxschemedir@|`pwd`/$(srcdir)|g" \ sed -e "s|@scxschemedir@|`pwd`/$(srcdir)|g" \
-e "s|@scxhost@||g" \ -e "s|@scxhost@||g" \
-e "s|@scxlibdir@|`pwd`/../c/xlib/.libs|g" $< > $@ -e "s|@scxlibdir@|`pwd`/../c/xlib/.libs|g" \
-e "s|@scxload_xft_packages@|$(load_xft_packages)|g" $< > $@
install-data-hook: install-data-hook:
sed -e "s|@scxschemedir@|$(schemedir)|g" \ sed -e "s|@scxschemedir@|$(schemedir)|g" \
-e "s|@scxhost@|(host)|g" \ -e "s|@scxhost@|(host)|g" \
-e "s|@scxlibdir@|$(libdir)|g" \ -e "s|@scxlibdir@|$(libdir)|g" \
-e "s|@scxload_xft_packages@|$(load_xft_packages)|g" \
$(srcdir)/load-scx.scm.in \ $(srcdir)/load-scx.scm.in \
> $(DESTDIR)/$(schemedir)/load-scx.scm > $(DESTDIR)/$(schemedir)/load-scx.scm

8
scheme/load-scx.scm.in
View File

@ -9,9 +9,15 @@
(run '(let ((initializer-name "scx_init_xlib") (run '(let ((initializer-name "scx_init_xlib")
(module-file (string-append "@scxlibdir@/" @scxhost@ "/libscx.so"))) (module-file (string-append "@scxlibdir@/" @scxhost@ "/libscx.so")))
(dynamic-load module-file) (dynamic-load module-file)
(call-external (get-external initializer-name)))) (call-external (get-external initializer-name))
(if (string=? "@scxload_xft_packages@" "yes")
(begin
(call-external (get-external "scx_xft_init"))
(call-external (get-external "scx_xrender_init"))))))
(config) (config)
(load "@scxschemedir@/xlib/xlib-interfaces.scm") (load "@scxschemedir@/xlib/xlib-interfaces.scm")
(load "@scxschemedir@/xlib/xlib-packages.scm") (load "@scxschemedir@/xlib/xlib-packages.scm")
(load "@scxschemedir@/libs/libs-interfaces.scm")
(load "@scxschemedir@/libs/libs-packages.scm")