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

Merge branch 'master' into work 

Conflicts:
	defs.mak
	scripts/config.log
	scripts/config.status
	scripts/defs.mak

Merged using local version (ours)
This commit is contained in:
Chuan Chen 2017-08-25 14:23:08 -04:00
parent 2aaa1667ac 228e32b5f3
commit 405738d27a
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scmos/Makefile
View File

@ -18,7 +18,7 @@ MAGICDIR = ..
include ${MAGICDIR}/defs.mak include ${MAGICDIR}/defs.mak
SC_M4 = ${M4} SC_M4 = ${M4}
SC_CPP = ${CPP} -I./extract_template SC_CPP = ${MCPP} -I./extract_template
FILES = mos.7bit.dstyle mos.7bit.std.cmap \ FILES = mos.7bit.dstyle mos.7bit.std.cmap \
mos.24bit.dstyle mos.24bit.std.cmap \ mos.24bit.dstyle mos.24bit.std.cmap \

6
scripts/configure vendored
View File

@ -628,6 +628,7 @@ OA_LIBS
OA OA
MAGIC_REVISION MAGIC_REVISION
MAGIC_VERSION MAGIC_VERSION
MCPP
LD_RUN_PATH LD_RUN_PATH
SHLIB_CFLAGS SHLIB_CFLAGS
DEPEND_FLAG DEPEND_FLAG
@ -4124,11 +4125,11 @@ if test "x${PYTHON3}" == "x"; then
if test "$CPP" = "$CC -E" ; then if test "$CPP" = "$CC -E" ; then
CPP="$CPP -x c" MCPP="$CPP -x c"
fi fi
else else
CPP="${MAGICDIR}/scripts/preproc.py" MCPP="\${MAGICDIR}/scripts/preproc.py"
fi fi
@ -8213,6 +8214,7 @@ fi
ac_config_files="$ac_config_files defs.mak" ac_config_files="$ac_config_files defs.mak"

5
scripts/configure.in
View File

@ -46,11 +46,11 @@ if test "x${PYTHON3}" == "x"; then
dnl directory. dnl directory.
if test "$CPP" = "$CC -E" ; then if test "$CPP" = "$CC -E" ; then
CPP="$CPP -x c" MCPP="$CPP -x c"
fi fi
else else
CPP="${MAGICDIR}/scripts/preproc.py" MCPP="\${MAGICDIR}/scripts/preproc.py"
fi fi
dnl check if the linker is a GNU linker dnl check if the linker is a GNU linker
@ -1751,6 +1751,7 @@ AC_SUBST(CFLAGS)
AC_SUBST(DEPEND_FLAG) AC_SUBST(DEPEND_FLAG)
AC_SUBST(SHLIB_CFLAGS) AC_SUBST(SHLIB_CFLAGS)
AC_SUBST(LD_RUN_PATH) AC_SUBST(LD_RUN_PATH)
AC_SUBST(MCPP)
AC_SUBST(MAGIC_VERSION) AC_SUBST(MAGIC_VERSION)
AC_SUBST(MAGIC_REVISION) AC_SUBST(MAGIC_REVISION)

1
scripts/defs.mak.in
View File

@ -51,6 +51,7 @@ ARFLAGS = crv
LINK = ld -r LINK = ld -r
LD = @LD@ LD = @LD@
M4 = @M4@ M4 = @M4@
MCPP = @MCPP@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SHDLIB_EXT = @SHDLIB_EXT@ SHDLIB_EXT = @SHDLIB_EXT@
LDDL_FLAGS = ${LDFLAGS} @LDDL_FLAGS@ LDDL_FLAGS = ${LDFLAGS} @LDDL_FLAGS@