luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

graphics: minor change to Makefile and configure 

This splits and groups DEPSRCS better so errors are not seen trying to
include files that are not present with no intention to build that
source file.
This commit is contained in:
Darryl L. Miles 2025-10-03 23:34:52 +01:00
parent ed7c18b873
commit bb51ae3deb
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
graphics/Makefile
View File

@ -4,13 +4,16 @@
MODULE = graphics MODULE = graphics
MAGICDIR = .. MAGICDIR = ..
BASE_SRCS = grMain.c grLock.c grDStyle.c grText.c grCMap.c grClip.c \ BASE_SRCS = grMain.c grLock.c grDStyle.c grText.c grCMap.c grClip.c \
grGlyphs.c grNull.c W3Dmain.c grGlyphs.c grNull.c
X11_SRCS = grX11su1.c grX11su2.c grX11su3.c grX11su4.c grX11su5.c X11_SRCS = grX11su1.c grX11su2.c grX11su3.c grX11su4.c grX11su5.c
TK_SRCS = grTk1.c grTk2.c grTk3.c grTk4.c grTk5.c TK_SRCS = grTk1.c grTk2.c grTk3.c grTk4.c grTk5.c
TOGL_SRCS = grTOGL1.c grTOGL2.c grTOGL3.c grTOGL4.c grTOGL5.c TOGL_GL_SRCS = grTOGL1.c grTOGL2.c grTOGL4.c grTOGL5.c
OGL_SRCS = grOGL1.c grOGL2.c grOGL3.c grOGL4.c grOGL5.c TOGL_GLU_SRCS = grTOGL3.c
TCAIRO_SRCS = grTCairo1.c grTCairo2.c grTCairo3.c grTCairo4.c grTCairo5.c THREE_D_GL_SRCS = W3Dmain.c
OGL_GL_SRCS = grOGL1.c grOGL2.c grOGL4.c grOGL5.c
OGL_GLU_SRCS = grOGL3.c
TCAIRO_SRCS = grTCairo1.c grTCairo2.c grTCairo3.c grTCairo4.c grTCairo5.c
GLYPHS = bw.glyphs color.glyphs GLYPHS = bw.glyphs color.glyphs
OUTLINE_FONTS = FreeSerif.pt3 FreeSans.pt3 FreeMono.pt3 OUTLINE_FONTS = FreeSerif.pt3 FreeSans.pt3 FreeMono.pt3
@ -28,19 +31,21 @@ DEPSRCS = ${BASE_SRCS}
ifeq (${MAKE_X11},1) ifeq (${MAKE_X11},1)
DEPSRCS += ${X11_SRCS} ${TK_SRCS} DEPSRCS += ${X11_SRCS} ${TK_SRCS}
endif endif
ifeq (${MAKE_GL},1)
DEPSRCS += ${OGL_GL_SRCS} ${TOGL_GL_SRCS}
ifeq (${MAKE_GLU},1) ifeq (${MAKE_GLU},1)
DEPSRCS += ${TOGL_SRCS} DEPSRCS += ${OGL_GLU_SRCS} ${TOGL_GLU_SRCS}
endif
DEPSRCS += ${THREE_D_SRCS}
endif endif
ifeq (${MAKE_X11},1) ifeq (${MAKE_X11},1)
DEPSRCS += ${TKCOMMON_SRCS} DEPSRCS += ${TKCOMMON_SRCS}
endif
ifeq (${MAKE_GL},1)
DEPSRCS += ${OGL_SRCS}
endif
DEPSRCS += ${X11HELPER_SRCS} ${X11THREAD_SRCS} DEPSRCS += ${X11HELPER_SRCS} ${X11THREAD_SRCS}
endif
ifeq (${MAKE_CAIRO},1) ifeq (${MAKE_CAIRO},1)
DEPSRCS += ${TCAIRO_SRCS} DEPSRCS += ${TCAIRO_SRCS}
endif endif
# Note GR_SRCS is from defs.mak
OBJS = ${BASE_SRCS:.c=.o} ${GR_SRCS:.c=.o} OBJS = ${BASE_SRCS:.c=.o} ${GR_SRCS:.c=.o}
CFLAGS += ${GR_CFLAGS} CFLAGS += ${GR_CFLAGS}
DFLAGS += ${GR_DFLAGS} DFLAGS += ${GR_DFLAGS}

4
scripts/configure.in
View File

@ -1384,7 +1384,7 @@ if test $usingTcl ; then
AC_DEFINE(THREE_D) AC_DEFINE(THREE_D)
gr_dflags="$gr_dflags -DOGL" gr_dflags="$gr_dflags -DOGL"
gr_libs="$gr_libs -lGL ${use_libglu} ${use_libxi} ${use_libxmu} ${use_libxext} -lm" gr_libs="$gr_libs -lGL ${use_libglu} ${use_libxi} ${use_libxmu} ${use_libxext} -lm"
gr_srcs="$gr_srcs \${TOGL_SRCS}" gr_srcs="$gr_srcs \${TOGL_GL_SRCS} \${TOGL_GLU_SRCS} \${THREE_D_GL_SRCS}"
if ! test $usingX11 ; then if ! test $usingX11 ; then
usingX11=1 usingX11=1
gr_dflags="$gr_dflags -DXLIB" gr_dflags="$gr_dflags -DXLIB"
@ -1411,7 +1411,7 @@ else
if test $usingOGL ; then if test $usingOGL ; then
gr_dflags="$gr_dflags -DOGL" gr_dflags="$gr_dflags -DOGL"
gr_libs="$gr_libs -lGL ${use_libglu} ${use_libxi} ${use_libxmu} ${use_libxext} -lm" gr_libs="$gr_libs -lGL ${use_libglu} ${use_libxi} ${use_libxmu} ${use_libxext} -lm"
gr_srcs="$gr_srcs \${OGL_SRCS}" gr_srcs="$gr_srcs \${OGL_GL_SRCS} \${OGL_GLU_SRCS}"
if ! test $usingX11 ; then if ! test $usingX11 ; then
usingX11=1 usingX11=1
gr_libs="$gr_libs -lX11" gr_libs="$gr_libs -lX11"