From 4115bb68a029ff074a406812f02c43ff3f2ca44d Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Fri, 22 Feb 2008 22:37:37 +0000 Subject: [PATCH] misc main-related fixes svn: r8768 --- collects/sgl/doc.txt | 8 +++++--- collects/sgl/main.ss | 2 +- collects/srpersist/info.ss | 2 +- collects/texpict/main.ss | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/collects/sgl/doc.txt b/collects/sgl/doc.txt index 44a990f377..fec9974d29 100644 --- a/collects/sgl/doc.txt +++ b/collects/sgl/doc.txt @@ -214,9 +214,11 @@ gl-vector-norm: gl-vector -> real-number _sgl.ss_ -Use the sgl.ss module by adding (require sgl) to your program. To prefix the -function names with "gl-" use the form (require (prefix gl- sgl)) instead. -The sgl.ss module provides a more Scheme-like interface to the GL functions in +Use the sgl.ss module by adding (require sgl/sgl) to your program. To get it +with all function names prefixed with "gl-" use (require sgl) (which is +actually sgl/main, reproviding everything from sgl.ss with the prefix). Or you +can also use (require (prefix sgl/sgl)) directly instead. The +sgl.ss module provides a more Scheme-like interface to the GL functions in gl.ss. Functions in sgl.ss take symbols instead of integers for GLenum arguments. diff --git a/collects/sgl/main.ss b/collects/sgl/main.ss index 06588b9f7e..96d3d64aac 100644 --- a/collects/sgl/main.ss +++ b/collects/sgl/main.ss @@ -1,3 +1,3 @@ #lang scheme/base -(require "sgl.ss") +(require (prefix-in gl- "sgl.ss")) (provide (all-from-out "sgl.ss")) diff --git a/collects/srpersist/info.ss b/collects/srpersist/info.ss index 80319c9383..f69160d4da 100644 --- a/collects/srpersist/info.ss +++ b/collects/srpersist/info.ss @@ -1,4 +1,4 @@ #lang setup/infotab ;; no .zo compilation necessary, since all the real code is in C++ -(define compile-omit-files '("info.ss" "srpersist.ss")) +(define compile-omit-files '("info.ss" "srpersist.ss" "main.ss")) diff --git a/collects/texpict/main.ss b/collects/texpict/main.ss index a74f886734..22b0c16241 100644 --- a/collects/texpict/main.ss +++ b/collects/texpict/main.ss @@ -1,4 +1,4 @@ #lang scheme/base -(require "calltrace.ss") -(provide (all-from-out "calltrace.ss")) +(require "texpict.ss") +(provide (all-from-out "texpict.ss"))