Skip to content
Snippets Groups Projects
Commit 54593e69 authored by duane's avatar duane
Browse files

see 4.2.devel.21 changelog entry for Tue Nov 23 12:02:05 1993

parent b9a66eff
No related branches found
No related tags found
No related merge requests found
Tue Nov 23 12:02:05 1993 Duane Rettig (duane at clay)
(for 4.2.devel.21 merge):
* climn-2.0/Makefile.hpprism: Add default for MAIN_OBJ
* clim-2.0/tk/xm-init.lisp: Change to initialization from georgej
* clim-2.0/demo/ico.lisp: Use excl::array-base instead of ah_data
from cer: Tue Nov 23 11:57:29 PST 1993
Makefile.defs Make it point to dcl-devel
......
......@@ -201,7 +201,7 @@ train-xm: FORCE
(load \"misc/dev-load-1.lisp\") \
(load-it 'motif-clim :load-composer nil) \
$(TRAIN_LISP) \
(clim-user::generate-pretty-test-report :file \"$(REPORT_FILE)\")" | \
(clim-test::generate-pretty-test-report :file \"$(REPORT_FILE)\")" | \
$(CL) $(CLOPTS) -batch -backtrace-on-error
train-ol: FORCE
......@@ -212,12 +212,12 @@ train-ol: FORCE
(load \"misc/dev-load-1.lisp\") \
(load-it 'openlook-clim :load-composer nil) \
$(TRAIN_LISP) \
(clim-user::generate-pretty-test-report :file \"$(REPORT_FILE)\")" | \
(clim-test::generate-pretty-test-report :file \"$(REPORT_FILE)\")" | \
$(CL) $(CLOPTS) -batch -backtrace-on-error
generate_test_report:
@$(ECHO) "\
(clim-user::generate-pretty-test-report :file \"$(REPORT_FILE)\") \
(clim-test::generate-pretty-test-report :file \"$(REPORT_FILE)\") \
(exit) \
" | $(CLIM) $(CLOPTS) -batch -backtrace-on-error
......@@ -228,7 +228,7 @@ profile : FORCE
benchmark:
$(ECHO) "\
(clim-user::benchmark-clim $(BENCHMARK_FILE)) \
(clim-test::benchmark-clim $(BENCHMARK_FILE)) \
" | $(CLIM) $(CLOPTS) -batch -backtrace-on-error
testps :
......@@ -354,6 +354,10 @@ stub-x.c : $(UNDEFS) misc/make-stub-file
stub-xt.c : $(XT_UNDEFS) misc/make-stub-file
misc/make-stub-file "void ___lisp_load_xt_stub ()" $(XT_UNDEFS) > stub-xt.c
# To keep make from complaining about syntax. This is in the wrong place,
# because the HOST defaults to sun4 always.
MAIN_OBJ = mainxm.o
include $(C_OBJECT_MAKEFILE)
......
......@@ -26,4 +26,7 @@ CLIMOBJS=$(GENERIC_PUBLIC_OBJS) $(XM_PUBLIC_OBJS) $(XM_LICENSED_OBJS)
CLIMFASLS= $(CLIM_XM_FASLS) $(CLIM_GENERIC_FASLS)
INSTALLED_CLIMOBJS=$(GENERIC_PUBLIC_OBJS) $(XM_PUBLIC_OBJS) $(XM_LICENSED_OBJS)
# To keep make from complaining about syntax:
MAIN_OBJ = mainxm.o
include Makefile.generic
......@@ -387,7 +387,7 @@
(defun calculate-ico (ico-x ico-y do-edges do-faces edge-point-list face-point-list)
(declare (integer ico-x ico-y)
(optimize (safety 0) (speed 3)))
(let (#+allegro (v2-fill (cdr (excl::ah_data v2)))
(let (#+allegro (v2-fill (excl::array-base v2))
(v3-seq v3-seq)
(v2 v2)
(drawn drawn)
......@@ -400,7 +400,7 @@
#+allegro (simple-vector v2-fill))
;; Clear the drawn array
#+allegro (fill (cdr (excl::ah_data drawn-fill)) nil)
#+allegro (fill (excl::array-base drawn-fill) nil)
#-allegro (fill drawn-fill nil)
;; Rotate vertices
......
;; -*- mode: common-lisp; package: tk -*-
;;
;; -[Wed Sep 15 10:56:05 1993 by layer]-
;; -[Fri Nov 19 00:56:06 1993 by duane]-
;;
;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved.
;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA All rights reserved.
......@@ -35,7 +35,7 @@
#+svr4
(unless (ff::symbol-in-main-symbol-table-p "XCreateColormap")
(unless (ff::symbol-in-main-symbol-table-p "xt_toolkit_initialize")
(defun reinitialize-toolkit ()
(xt_toolkit_initialize)
(setup-error-handlers)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment