mirror of https://github.com/CGAL/cgal
adopted to new html-converter.
This commit is contained in:
parent
4650ac7da4
commit
30ff38837e
|
|
@ -30,7 +30,7 @@
|
||||||
\newcommand{\msvc}[1]{\textsc{Microsoft}~Visual~\texttt{C++}~{\rm #1}}
|
\newcommand{\msvc}[1]{\textsc{Microsoft}~Visual~\texttt{C++}~{\rm #1}}
|
||||||
|
|
||||||
%% macro for CGAL release number
|
%% macro for CGAL release number
|
||||||
\newcommand{\cgalrelease}{1.1}
|
\newcommand{\cgalrelease}{1.2}
|
||||||
|
|
||||||
%% macro for CGAL directory
|
%% macro for CGAL directory
|
||||||
\newcommand{\cgaldir}{\texttt{CGAL-\cgalrelease}}
|
\newcommand{\cgaldir}{\texttt{CGAL-\cgalrelease}}
|
||||||
|
|
@ -277,7 +277,7 @@ A menu similar to the following will appear on your screen.
|
||||||
{\scriptsize \label{pic:main-menu}
|
{\scriptsize \label{pic:main-menu}
|
||||||
\begin{alltt}
|
\begin{alltt}
|
||||||
****************************************************************
|
****************************************************************
|
||||||
** CGAL 1.1 Installation Main Menu **
|
** CGAL 1.2 Installation Main Menu **
|
||||||
** ------------------------------- **
|
** ------------------------------- **
|
||||||
** **
|
** **
|
||||||
** OS: sparc_SunOS-5.5 **
|
** OS: sparc_SunOS-5.5 **
|
||||||
|
|
@ -343,7 +343,7 @@ bug is \textit{not} present. On the other hand \texttt{no} resp.
|
||||||
{\scriptsize
|
{\scriptsize
|
||||||
\begin{verbatim}
|
\begin{verbatim}
|
||||||
****************************************************************
|
****************************************************************
|
||||||
** CGAL 1.1 Installation Compiler Menu **
|
** CGAL 1.2 Installation Compiler Menu **
|
||||||
** ----------------------------------- **
|
** ----------------------------------- **
|
||||||
** **
|
** **
|
||||||
** OS: sparc_SunOS-5.5 **
|
** OS: sparc_SunOS-5.5 **
|
||||||
|
|
@ -407,7 +407,7 @@ from compiler or linker).
|
||||||
\begin{verbatim}
|
\begin{verbatim}
|
||||||
****************************************************************
|
****************************************************************
|
||||||
** **
|
** **
|
||||||
** Compiling CGAL 1.1 **
|
** Compiling CGAL 1.2 **
|
||||||
** ------------------ **
|
** ------------------ **
|
||||||
** **
|
** **
|
||||||
****************************************************************
|
****************************************************************
|
||||||
|
|
@ -826,7 +826,7 @@ compiler. To achieve this, the first section of each makefile
|
||||||
contains an include statement that looks as follows:
|
contains an include statement that looks as follows:
|
||||||
|
|
||||||
\begin{verbatim}
|
\begin{verbatim}
|
||||||
CGAL_MAKEFILE = /users/jannes/CGAL-1.1/make/makefile_<CGAL-OS description>
|
CGAL_MAKEFILE = /users/jannes/CGAL-1.2/make/makefile_<CGAL-OS description>
|
||||||
include $(CGAL_MAKEFILE)
|
include $(CGAL_MAKEFILE)
|
||||||
\end{verbatim}
|
\end{verbatim}
|
||||||
|
|
||||||
|
|
@ -878,7 +878,7 @@ have consequences for the makefile variables \texttt{CGAL\_CXX} and
|
||||||
\texttt{CXXFLAGS}.
|
\texttt{CXXFLAGS}.
|
||||||
|
|
||||||
\section{Compiling a \cgal\ application}
|
\section{Compiling a \cgal\ application}
|
||||||
The directory \texttt{CGAL-1.1/examples} contains a small program
|
The directory \texttt{CGAL-1.2/examples} contains a small program
|
||||||
(example.C) and a sample makefile with some comments. The
|
(example.C) and a sample makefile with some comments. The
|
||||||
\texttt{CGAL\_MAKEFILE} variable in this makefile (see section
|
\texttt{CGAL\_MAKEFILE} variable in this makefile (see section
|
||||||
\ref{sec:makefiles}) is automatically substituted by the
|
\ref{sec:makefiles}) is automatically substituted by the
|
||||||
|
|
@ -1017,17 +1017,17 @@ this. You have to compile these files yourself and add them to the
|
||||||
custom linker flags during the installation of CGAL, or enter them
|
custom linker flags during the installation of CGAL, or enter them
|
||||||
manually in the makefiles.
|
manually in the makefiles.
|
||||||
|
|
||||||
\section{Upgrading a \cgal\ 1.0 installation}
|
\section{Upgrading a \cgal\ 1.0/1.1 installation}
|
||||||
In case you have \cgal\ 1.0 installed on your system, you might like
|
In case you have \cgal\ 1.0/1.1 installed on your system, you might
|
||||||
to reuse your configuration files. Simply use the following commands
|
like to reuse your configuration files. Simply use the following
|
||||||
to put them into the right place:
|
commands to put them into the right place:
|
||||||
\begin{verbatim}
|
\begin{verbatim}
|
||||||
cp -r <OLD_CGAL_DIR>/config/install <NEW_CGAL_DIR>/config
|
cp -r <OLD_CGAL_DIR>/config/install <NEW_CGAL_DIR>/config
|
||||||
\end{verbatim}
|
\end{verbatim}
|
||||||
where \texttt{<OLD\_CGAL\_DIR>} is your \cgal\ 1.0 root directory
|
where \texttt{<OLD\_CGAL\_DIR>} is your \cgal\ 1.0/1.1 root directory
|
||||||
(e.g. \texttt{/pub/local/CGAL-1.0}) and\\
|
(e.g. \texttt{/pub/local/CGAL-1.0}) and\\
|
||||||
\texttt{<NEW\_CGAL\_DIR>} is the root directory of your new \cgal\
|
\texttt{<NEW\_CGAL\_DIR>} is the root directory of your new \cgal\
|
||||||
installation (e.g. {\tt /pub/local/CGAL-1.1}).
|
installation (e.g. {\tt /pub/local/CGAL-1.2}).
|
||||||
|
|
||||||
It is \textbf{strongly} recommended to rerun all tests using the
|
It is \textbf{strongly} recommended to rerun all tests using the
|
||||||
option \texttt{A} from the main menu.
|
option \texttt{A} from the main menu.
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue