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

Merge branch 'work' into tomerge

This commit is contained in:
Tim Edwards 2017-09-15 11:24:43 -04:00
parent 5ae258f561 536e198ee8
commit bf5bb09f50
7 changed files with 66 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
defs.mak
View File

@ -8,7 +8,7 @@
SHELL = /bin/sh SHELL = /bin/sh
prefix = /home/tim/cad prefix = /usr/local
exec_prefix = ${prefix} exec_prefix = ${prefix}
bindir = ${exec_prefix}/bin bindir = ${exec_prefix}/bin
libdir = ${exec_prefix}/lib libdir = ${exec_prefix}/lib
@ -61,14 +61,14 @@ LIB_SPECS = -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6
WISH_EXE = /usr/bin/wish WISH_EXE = /usr/bin/wish
TCL_LIB_DIR = /usr/lib TCL_LIB_DIR = /usr/lib
MAGIC_VERSION = 8.2 MAGIC_VERSION = 8.2
MAGIC_REVISION = 22 MAGIC_REVISION = 24
CC = gcc CC = gcc
CPP = gcc -E CPP = gcc -E
CXX = g++ CXX = g++
CPPFLAGS = -I. -I${MAGICDIR} CPPFLAGS = -I. -I${MAGICDIR}
DFLAGS = -DCAD_DIR=\"${LIBDIR}\" -DBIN_DIR=\"${BINDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"22\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DNDEBUG -DGCORE=\"/bin/gcore\" DFLAGS = -DCAD_DIR=\"${LIBDIR}\" -DBIN_DIR=\"${BINDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"24\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DNDEBUG -DGCORE=\"/bin/gcore\"
DFLAGS += -DSHDLIB_EXT=\".so\" DFLAGS += -DSHDLIB_EXT=\".so\"
CFLAGS = -g -m64 -fPIC -Wimplicit-int -fPIC CFLAGS = -g -m64 -fPIC -Wimplicit-int -fPIC
@ -80,9 +80,9 @@ DEPEND_FLAG = -MM
EXEEXT = EXEEXT =
GR_CFLAGS = GR_CFLAGS =
GR_DFLAGS = -DX11 -DXLIB -DCAIRO -DNDEBUG GR_DFLAGS = -DX11 -DXLIB -DOGL -DCAIRO -DNDEBUG
GR_LIBS = -lX11 -lcairo -lfontconfig -lfreetype ${X11_LDFLAGS} GR_LIBS = -lX11 -lGL -lGLU -lXi -lXmu -lXext -lm -lcairo -lfontconfig -lfreetype -lstdc++ ${X11_LDFLAGS}
GR_SRCS = ${TK_SRCS} ${TCAIRO_SRCS} ${TKCOMMON_SRCS} GR_SRCS = ${TK_SRCS} ${TOGL_SRCS} ${TCAIRO_SRCS} ${TKCOMMON_SRCS}
GR_HELPER_SRCS = GR_HELPER_SRCS =
GR_HELPER_PROG = GR_HELPER_PROG =

4
graphics/grTCairo1.c
View File

@ -1136,11 +1136,11 @@ MagWindow *w;
tcairodata = (TCairoData *)w->w_grdata2; tcairodata = (TCairoData *)w->w_grdata2;
if (tcairodata->backing_surface != NULL) if (tcairodata->backing_surface != NULL)
cairo_destroy_surface(tcairodata->backing_surface); cairo_surface_destroy(tcairodata->backing_surface);
if (tcairodata->backing_context != NULL) if (tcairodata->backing_context != NULL)
cairo_destroy(tcairodata->backing_context); cairo_destroy(tcairodata->backing_context);
if (tcairodata->surface != NULL) if (tcairodata->surface != NULL)
cairo_destroy_surface(tcairodata->surface); cairo_surface_destroy(tcairodata->surface);
if (tcairodata->context != NULL) if (tcairodata->context != NULL)
cairo_destroy(tcairodata->context); cairo_destroy(tcairodata->context);
freeMagic(w->w_grdata2); freeMagic(w->w_grdata2);

56
scripts/config.log
View File

@ -4,7 +4,7 @@ running configure, to aid debugging if configure makes a mistake.
It was created by configure, which was It was created by configure, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ ./configure --without-opengl --prefix=/home/tim/cad $ ./configure
## --------- ## ## --------- ##
## Platform. ## ## Platform. ##
@ -125,7 +125,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "22" | #define MAGIC_REVISION "24"
| /* end confdefs.h. */ | /* end confdefs.h. */
| #include <ac_nonexistent.h> | #include <ac_nonexistent.h>
configure:3472: result: gcc -E configure:3472: result: gcc -E
@ -146,7 +146,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "22" | #define MAGIC_REVISION "24"
| /* end confdefs.h. */ | /* end confdefs.h. */
| #include <ac_nonexistent.h> | #include <ac_nonexistent.h>
configure:3592: checking for g++ configure:3592: checking for g++
@ -302,7 +302,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "22" | #define MAGIC_REVISION "24"
| #define STDC_HEADERS 1 | #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
@ -343,7 +343,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "22" | #define MAGIC_REVISION "24"
| #define STDC_HEADERS 1 | #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
@ -433,7 +433,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "22" | #define MAGIC_REVISION "24"
| #define STDC_HEADERS 1 | #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
@ -506,7 +506,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "22" | #define MAGIC_REVISION "24"
| #define STDC_HEADERS 1 | #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
@ -602,6 +602,24 @@ configure:6630: checking for wish executable
configure:6658: result: /usr/bin/wish configure:6658: result: /usr/bin/wish
configure:6664: checking for tclsh executable configure:6664: checking for tclsh executable
configure:6690: result: /usr/bin/tclsh configure:6690: result: /usr/bin/tclsh
configure:7395: checking GL/gl.h usability
configure:7395: gcc -c -g conftest.c >&5
configure:7395: $? = 0
configure:7395: result: yes
configure:7395: checking GL/gl.h presence
configure:7395: gcc -E conftest.c
configure:7395: $? = 0
configure:7395: result: yes
configure:7395: checking for GL/gl.h
configure:7395: result: yes
configure:7413: checking for glXCreateContext in -lGL
configure:7438: gcc -o conftest -g -lm conftest.c -lGL >&5
configure:7438: $? = 0
configure:7447: result: yes
configure:7463: checking for gluNewTess in -lGLU
configure:7488: gcc -o conftest -g -lm conftest.c -lGLU -lGL >&5
configure:7488: $? = 0
configure:7497: result: yes
configure:7548: checking cairo/cairo.h usability configure:7548: checking cairo/cairo.h usability
configure:7548: gcc -c -g conftest.c >&5 configure:7548: gcc -c -g conftest.c >&5
configure:7548: $? = 0 configure:7548: $? = 0
@ -613,7 +631,7 @@ configure:7548: result: yes
configure:7548: checking for cairo/cairo.h configure:7548: checking for cairo/cairo.h
configure:7548: result: yes configure:7548: result: yes
configure:7566: checking for cairo_user_to_device in -lcairo configure:7566: checking for cairo_user_to_device in -lcairo
configure:7591: gcc -o conftest -g -lm conftest.c -lcairo >&5 configure:7591: gcc -o conftest -g -lm conftest.c -lcairo -lGLU -lGL >&5
configure:7591: $? = 0 configure:7591: $? = 0
configure:7600: result: yes configure:7600: result: yes
configure:8381: creating ./config.status configure:8381: creating ./config.status
@ -680,6 +698,7 @@ ac_cv_func_setenv=yes
ac_cv_func_shmat=yes ac_cv_func_shmat=yes
ac_cv_func_vfork=yes ac_cv_func_vfork=yes
ac_cv_have_x='have_x=yes ac_x_includes='\'''\'' ac_x_libraries='\'''\''' ac_cv_have_x='have_x=yes ac_x_includes='\'''\'' ac_x_libraries='\'''\'''
ac_cv_header_GL_gl_h=yes
ac_cv_header_cairo_cairo_h=yes ac_cv_header_cairo_cairo_h=yes
ac_cv_header_dirent_h=yes ac_cv_header_dirent_h=yes
ac_cv_header_inttypes_h=yes ac_cv_header_inttypes_h=yes
@ -697,6 +716,8 @@ ac_cv_header_sys_stat_h=yes
ac_cv_header_sys_types_h=yes ac_cv_header_sys_types_h=yes
ac_cv_header_unistd_h=yes ac_cv_header_unistd_h=yes
ac_cv_host=x86_64-unknown-linux-gnu ac_cv_host=x86_64-unknown-linux-gnu
ac_cv_lib_GLU_gluNewTess=yes
ac_cv_lib_GL_glXCreateContext=yes
ac_cv_lib_ICE_IceConnectionNumber=yes ac_cv_lib_ICE_IceConnectionNumber=yes
ac_cv_lib_Xext_XextFindDisplay=yes ac_cv_lib_Xext_XextFindDisplay=yes
ac_cv_lib_Xi_XOpenDevice=yes ac_cv_lib_Xi_XOpenDevice=yes
@ -738,7 +759,7 @@ CPPFLAGS=''
CSH='/bin/csh' CSH='/bin/csh'
CXX='g++' CXX='g++'
CXXFLAGS='-g -O2' CXXFLAGS='-g -O2'
DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"22\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -Dlinux=1 -DSYSV=1 -DISC=1' DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"24\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1'
DEPEND_FLAG='-MM' DEPEND_FLAG='-MM'
ECHO_C='' ECHO_C=''
ECHO_N='printf' ECHO_N='printf'
@ -758,11 +779,11 @@ LDDL_FLAGS='-shared -Wl,-soname,$@ -Wl,--version-script=${MAGICDIR}/magic/symbol
LDFLAGS='' LDFLAGS=''
LD_RUN_PATH='' LD_RUN_PATH=''
LIBOBJS='' LIBOBJS=''
LIBS='-lcairo ' LIBS='-lcairo -lGLU -lGL '
LIB_SPECS=' -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6' LIB_SPECS=' -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6'
LTLIBOBJS='' LTLIBOBJS=''
M4='/bin/m4' M4='/bin/m4'
MAGIC_REVISION='22' MAGIC_REVISION='24'
MAGIC_VERSION='8.2' MAGIC_VERSION='8.2'
MCPP='${MAGICDIR}/scripts/preproc.py' MCPP='${MAGICDIR}/scripts/preproc.py'
OA='' OA=''
@ -810,11 +831,11 @@ exec_prefix='${prefix}'
extra_defs=' -DCAD_DIR=\"${LIBDIR}\" -DBIN_DIR=\"${BINDIR}\" -DTCL_DIR=\"${TCLDIR}\"' extra_defs=' -DCAD_DIR=\"${LIBDIR}\" -DBIN_DIR=\"${BINDIR}\" -DTCL_DIR=\"${TCLDIR}\"'
extra_libs=' ${MAGICDIR}/ext2sim/libext2sim.o ${MAGICDIR}/ext2spice/libext2spice.o ${MAGICDIR}/calma/libcalma.o ${MAGICDIR}/cif/libcif.o ${MAGICDIR}/plot/libplot.o ${MAGICDIR}/lef/liblef.o ${MAGICDIR}/extflat/libextflat.o ${MAGICDIR}/garouter/libgarouter.o ${MAGICDIR}/mzrouter/libmzrouter.o ${MAGICDIR}/router/librouter.o ${MAGICDIR}/irouter/libirouter.o ${MAGICDIR}/grouter/libgrouter.o ${MAGICDIR}/gcr/libgcr.o ${MAGICDIR}/tcltk/libtcltk.o' extra_libs=' ${MAGICDIR}/ext2sim/libext2sim.o ${MAGICDIR}/ext2spice/libext2spice.o ${MAGICDIR}/calma/libcalma.o ${MAGICDIR}/cif/libcif.o ${MAGICDIR}/plot/libplot.o ${MAGICDIR}/lef/liblef.o ${MAGICDIR}/extflat/libextflat.o ${MAGICDIR}/garouter/libgarouter.o ${MAGICDIR}/mzrouter/libmzrouter.o ${MAGICDIR}/router/librouter.o ${MAGICDIR}/irouter/libirouter.o ${MAGICDIR}/grouter/libgrouter.o ${MAGICDIR}/gcr/libgcr.o ${MAGICDIR}/tcltk/libtcltk.o'
gr_cflags='' gr_cflags=''
gr_dflags=' -DX11 -DXLIB -DCAIRO' gr_dflags=' -DX11 -DXLIB -DOGL -DCAIRO'
gr_hprog='' gr_hprog=''
gr_hsrcs='' gr_hsrcs=''
gr_libs=' -lX11 -lcairo -lfontconfig -lfreetype' gr_libs=' -lX11 -lGL -lGLU -lXi -lXmu -lXext -lm -lcairo -lfontconfig -lfreetype -lstdc++'
gr_srcs=' ${TK_SRCS} ${TCAIRO_SRCS} ${TKCOMMON_SRCS}' gr_srcs=' ${TK_SRCS} ${TOGL_SRCS} ${TCAIRO_SRCS} ${TKCOMMON_SRCS}'
host='x86_64-unknown-linux-gnu' host='x86_64-unknown-linux-gnu'
host_alias='' host_alias=''
host_cpu='x86_64' host_cpu='x86_64'
@ -833,7 +854,7 @@ mandir='${datarootdir}/man'
modules=' ext2sim ext2spice calma cif plot lef garouter grouter irouter mzrouter router gcr tcltk' modules=' ext2sim ext2spice calma cif plot lef garouter grouter irouter mzrouter router gcr tcltk'
oldincludedir='/usr/include' oldincludedir='/usr/include'
pdfdir='${docdir}' pdfdir='${docdir}'
prefix='/home/tim/cad' prefix='/usr/local'
program_transform_name='s,x,x,' program_transform_name='s,x,x,'
programs=' net2ir tcltk' programs=' net2ir tcltk'
psdir='${docdir}' psdir='${docdir}'
@ -863,7 +884,7 @@ unused=' readline lisp'
#define PACKAGE_BUGREPORT "" #define PACKAGE_BUGREPORT ""
#define PACKAGE_URL "" #define PACKAGE_URL ""
#define MAGIC_VERSION "8.2" #define MAGIC_VERSION "8.2"
#define MAGIC_REVISION "22" #define MAGIC_REVISION "24"
#define STDC_HEADERS 1 #define STDC_HEADERS 1
#define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_TYPES_H 1
#define HAVE_SYS_STAT_H 1 #define HAVE_SYS_STAT_H 1
@ -895,9 +916,12 @@ unused=' readline lisp'
#define LEF_MODULE 1 #define LEF_MODULE 1
#define ROUTE_MODULE 1 #define ROUTE_MODULE 1
#define USE_NEW_MACROS 1 #define USE_NEW_MACROS 1
#define HAVE_LIBGL 1
#define HAVE_LIBGLU 1
#define VECTOR_FONTS 1 #define VECTOR_FONTS 1
#define HAVE_LIBCAIRO 1 #define HAVE_LIBCAIRO 1
#define MAGIC_WRAPPER 1 #define MAGIC_WRAPPER 1
#define THREE_D 1
#define linux 1 #define linux 1
#define SYSV 1 #define SYSV 1
#define ISC 1 #define ISC 1

20
scripts/config.status
View File

@ -417,7 +417,7 @@ $config_files
Report bugs to the package provider." Report bugs to the package provider."
ac_cs_config="'--without-opengl' '--prefix=/home/tim/cad' 'CFLAGS=-g'" ac_cs_config="'CFLAGS=-g'"
ac_cs_version="\ ac_cs_version="\
config.status config.status
configured by ./configure, generated by GNU Autoconf 2.69, configured by ./configure, generated by GNU Autoconf 2.69,
@ -496,7 +496,7 @@ if $ac_cs_silent; then
fi fi
if $ac_cs_recheck; then if $ac_cs_recheck; then
set X /bin/sh './configure' '--without-opengl' '--prefix=/home/tim/cad' 'CFLAGS=-g' $ac_configure_extra_args --no-create --no-recursion set X /bin/sh './configure' 'CFLAGS=-g' $ac_configure_extra_args --no-create --no-recursion
shift shift
$as_echo "running CONFIG_SHELL=/bin/sh $*" >&6 $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
CONFIG_SHELL='/bin/sh' CONFIG_SHELL='/bin/sh'
@ -588,7 +588,7 @@ S["INSTALL_TARGET"]="install-tcl"
S["ALL_TARGET"]="tcl" S["ALL_TARGET"]="tcl"
S["OA_LIBS"]="" S["OA_LIBS"]=""
S["OA"]="" S["OA"]=""
S["MAGIC_REVISION"]="22" S["MAGIC_REVISION"]="24"
S["MAGIC_VERSION"]="8.2" S["MAGIC_VERSION"]="8.2"
S["SCPP"]="gcc -E -x c" S["SCPP"]="gcc -E -x c"
S["MCPP"]="${MAGICDIR}/scripts/preproc.py" S["MCPP"]="${MAGICDIR}/scripts/preproc.py"
@ -597,8 +597,8 @@ S["SHLIB_CFLAGS"]="-Wimplicit-int -fPIC"
S["DEPEND_FLAG"]="-MM" S["DEPEND_FLAG"]="-MM"
S["gr_hprog"]="" S["gr_hprog"]=""
S["gr_hsrcs"]="" S["gr_hsrcs"]=""
S["gr_srcs"]=" ${TK_SRCS} ${TCAIRO_SRCS} ${TKCOMMON_SRCS}" S["gr_srcs"]=" ${TK_SRCS} ${TOGL_SRCS} ${TCAIRO_SRCS} ${TKCOMMON_SRCS}"
S["gr_dflags"]=" -DX11 -DXLIB -DCAIRO" S["gr_dflags"]=" -DX11 -DXLIB -DOGL -DCAIRO"
S["gr_cflags"]="" S["gr_cflags"]=""
S["rl_libs"]="" S["rl_libs"]=""
S["rl_defs"]="" S["rl_defs"]=""
@ -616,7 +616,7 @@ S["extra_libs"]=" ${MAGICDIR}/ext2sim/libext2sim.o ${MAGICDIR}/ext2spice/libext2
"ter/librouter.o ${MAGICDIR}/irouter/libirouter.o ${MAGICDIR}/grouter/libgrouter.o ${MAGICDIR}/gcr/libgcr.o ${MAGICDIR}/tcltk/libtcltk.o" "ter/librouter.o ${MAGICDIR}/irouter/libirouter.o ${MAGICDIR}/grouter/libgrouter.o ${MAGICDIR}/gcr/libgcr.o ${MAGICDIR}/tcltk/libtcltk.o"
S["SCRIPTS"]="" S["SCRIPTS"]=""
S["PACKAGE"]="magic" S["PACKAGE"]="magic"
S["gr_libs"]=" -lX11 -lcairo -lfontconfig -lfreetype" S["gr_libs"]=" -lX11 -lGL -lGLU -lXi -lXmu -lXext -lm -lcairo -lfontconfig -lfreetype -lstdc++"
S["TCL_LIB_DIR"]="/usr/lib" S["TCL_LIB_DIR"]="/usr/lib"
S["TCLSH_EXE"]="/usr/bin/tclsh" S["TCLSH_EXE"]="/usr/bin/tclsh"
S["WISH_EXE"]="/usr/bin/wish" S["WISH_EXE"]="/usr/bin/wish"
@ -669,16 +669,16 @@ S["build"]="x86_64-unknown-linux-gnu"
S["target_alias"]="" S["target_alias"]=""
S["host_alias"]="" S["host_alias"]=""
S["build_alias"]="" S["build_alias"]=""
S["LIBS"]="-lcairo " S["LIBS"]="-lcairo -lGLU -lGL "
S["ECHO_T"]="" S["ECHO_T"]=""
S["ECHO_N"]="-n" S["ECHO_N"]="-n"
S["ECHO_C"]="" S["ECHO_C"]=""
S["DEFS"]="-DPACKAGE_NAME=\\\"\\\" -DPACKAGE_TARNAME=\\\"\\\" -DPACKAGE_VERSION=\\\"\\\" -DPACKAGE_STRING=\\\"\\\" -DPACKAGE_BUGREPORT=\\\"\\\" -DPACKAGE_URL=\\\"\\\" -DMAGIC_VERSION="\ S["DEFS"]="-DPACKAGE_NAME=\\\"\\\" -DPACKAGE_TARNAME=\\\"\\\" -DPACKAGE_VERSION=\\\"\\\" -DPACKAGE_STRING=\\\"\\\" -DPACKAGE_BUGREPORT=\\\"\\\" -DPACKAGE_URL=\\\"\\\" -DMAGIC_VERSION="\
"\\\"8.2\\\" -DMAGIC_REVISION=\\\"22\\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHA"\ "\\\"8.2\\\" -DMAGIC_REVISION=\\\"24\\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHA"\
"VE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_U"\ "VE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_U"\
"NSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE"\ "NSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE"\
"_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -"\ "_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -"\
"DUSE_NEW_MACROS=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -Dlinux=1 -DSYSV=1 -DISC=1" "DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1"
S["mandir"]="${datarootdir}/man" S["mandir"]="${datarootdir}/man"
S["localedir"]="${datarootdir}/locale" S["localedir"]="${datarootdir}/locale"
S["libdir"]="${exec_prefix}/lib" S["libdir"]="${exec_prefix}/lib"
@ -699,7 +699,7 @@ S["libexecdir"]="${exec_prefix}/libexec"
S["sbindir"]="${exec_prefix}/sbin" S["sbindir"]="${exec_prefix}/sbin"
S["bindir"]="${exec_prefix}/bin" S["bindir"]="${exec_prefix}/bin"
S["program_transform_name"]="s,x,x," S["program_transform_name"]="s,x,x,"
S["prefix"]="/home/tim/cad" S["prefix"]="/usr/local"
S["exec_prefix"]="${prefix}" S["exec_prefix"]="${prefix}"
S["PACKAGE_URL"]="" S["PACKAGE_URL"]=""
S["PACKAGE_BUGREPORT"]="" S["PACKAGE_BUGREPORT"]=""

12
scripts/defs.mak
View File

@ -8,7 +8,7 @@
SHELL = /bin/sh SHELL = /bin/sh
prefix = /home/tim/cad prefix = /usr/local
exec_prefix = ${prefix} exec_prefix = ${prefix}
bindir = ${exec_prefix}/bin bindir = ${exec_prefix}/bin
libdir = ${exec_prefix}/lib libdir = ${exec_prefix}/lib
@ -61,14 +61,14 @@ LIB_SPECS = -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6
WISH_EXE = /usr/bin/wish WISH_EXE = /usr/bin/wish
TCL_LIB_DIR = /usr/lib TCL_LIB_DIR = /usr/lib
MAGIC_VERSION = 8.2 MAGIC_VERSION = 8.2
MAGIC_REVISION = 22 MAGIC_REVISION = 24
CC = gcc CC = gcc
CPP = gcc -E CPP = gcc -E
CXX = g++ CXX = g++
CPPFLAGS = -I. -I${MAGICDIR} CPPFLAGS = -I. -I${MAGICDIR}
DFLAGS = -DCAD_DIR=\"${LIBDIR}\" -DBIN_DIR=\"${BINDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"22\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DNDEBUG -DGCORE=\"/bin/gcore\" DFLAGS = -DCAD_DIR=\"${LIBDIR}\" -DBIN_DIR=\"${BINDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"24\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DNDEBUG -DGCORE=\"/bin/gcore\"
DFLAGS += -DSHDLIB_EXT=\".so\" DFLAGS += -DSHDLIB_EXT=\".so\"
CFLAGS = -g -m64 -fPIC -Wimplicit-int -fPIC CFLAGS = -g -m64 -fPIC -Wimplicit-int -fPIC
@ -80,9 +80,9 @@ DEPEND_FLAG = -MM
EXEEXT = EXEEXT =
GR_CFLAGS = GR_CFLAGS =
GR_DFLAGS = -DX11 -DXLIB -DCAIRO -DNDEBUG GR_DFLAGS = -DX11 -DXLIB -DOGL -DCAIRO -DNDEBUG
GR_LIBS = -lX11 -lcairo -lfontconfig -lfreetype ${X11_LDFLAGS} GR_LIBS = -lX11 -lGL -lGLU -lXi -lXmu -lXext -lm -lcairo -lfontconfig -lfreetype -lstdc++ ${X11_LDFLAGS}
GR_SRCS = ${TK_SRCS} ${TCAIRO_SRCS} ${TKCOMMON_SRCS} GR_SRCS = ${TK_SRCS} ${TOGL_SRCS} ${TCAIRO_SRCS} ${TKCOMMON_SRCS}
GR_HELPER_SRCS = GR_HELPER_SRCS =
GR_HELPER_PROG = GR_HELPER_PROG =

2
tcltk/ext2sim.sh
View File

@ -15,7 +15,7 @@ for i in $@; do
esac esac
done done
# #
eval /home/tim/cad/lib/magic/tcl/magicdnull -dnull -noconsole -nowrapper $mgargs <<EOF eval /usr/local/lib/magic/tcl/magicdnull -dnull -noconsole -nowrapper $mgargs <<EOF
drc off drc off
box 0 0 0 0 box 0 0 0 0
ext2sim $esargs ext2sim $esargs

2
tcltk/ext2spice.sh
View File

@ -15,7 +15,7 @@ for i in $@; do
esac esac
done done
# #
eval /home/tim/cad/lib/magic/tcl/magicdnull -dnull -noconsole -nowrapper $mgargs <<EOF eval /usr/local/lib/magic/tcl/magicdnull -dnull -noconsole -nowrapper $mgargs <<EOF
drc off drc off
box 0 0 0 0 box 0 0 0 0
ext2spice $esargs ext2spice $esargs