From 0098d1f09f25956a04d93e54f0e5ca35f1ac1757 Mon Sep 17 00:00:00 2001 From: seub Date: Mon, 12 Nov 2012 23:54:40 +0100 Subject: [PATCH] help updated --- CirclePackings.pro.user | 4 ++-- doc/index.html | 21 ++++++++++++--------- doc/index.html~ | 23 +++++++++++++---------- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/CirclePackings.pro.user b/CirclePackings.pro.user index a5dec0d..b76d42a 100644 --- a/CirclePackings.pro.user +++ b/CirclePackings.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -76,7 +76,7 @@ Qt4ProjectManager.MakeStep false - -j8 + -j 8 2 diff --git a/doc/index.html b/doc/index.html index d9ef2ad..fc7a095 100644 --- a/doc/index.html +++ b/doc/index.html @@ -196,19 +196,22 @@

Linux (or UNIX) users:

the sources. Note that installing the package will only work on Debian-based distributions (Debian, Ubuntu, Mint...).

Install the package (Debian-based distributions):

-

Download and install this package +

Download and install this package (32 bits, works on all systems but is slower) - or this package (64 bits systems only).

+ or this package (64 bits systems only).

-

Installing the package can be done by - opening a terminal, stepping into the folder containing the package (using cd) and typing: +

To install the package, you may use your favorite package manager (such as Logitech on Ubuntu), usually + just double-clicking on the deb file will do. This should automatically install the dependencies.

+ +

Alternatively, you may open a terminal, + step into the folder containing the package (using cd) and type:

- sudo dpkg -i CirclePackings-32.deb -

-

You will be prompted to install libqt4-dev if not already installed on your system. + sudo dpkg -i <name of the deb file> +

+

You will be prompted to install a certain number of dependencies (libraries) if they are not already installed on your system. This can be done by typing:

- sudo apt-get install libqt4-dev + sudo apt-get install libc6 libgcc1 libqtcore4 libqtgui4 libstdc++6

Compile from the sources:

@@ -235,7 +238,7 @@

Compile from the sources:

./CirclePackings
  • Creating a shortcut, setting the application's icon, etc: I'm afraid that's out of our scope. You need to find out how to do this on your system by yourself. For example, you can use this guide - for Ubuntu with unity. + for Ubuntu with Unity.

    Getting Started

    diff --git a/doc/index.html~ b/doc/index.html~ index a258361..a884212 100644 --- a/doc/index.html~ +++ b/doc/index.html~ @@ -196,19 +196,22 @@ the sources. Note that installing the package will only work on Debian-based distributions (Debian, Ubuntu, Mint...).

    Install the package (Debian-based distributions):

    -

    Download and install this package +

    Download and install this package (32 bits, works on all systems but is slower) - or this package (64 bits systems only).

    + or this package (64 bits systems only).

    -

    Installing the package can be done by - opening a terminal, stepping into the folder containing the package (using cd) and typing: +

    To install the package, you may use your favorite package manager (such as Logitech on Ubuntu), usually + just double-clicking on the deb file will do. This should automatically install the dependencies.

    + +

    Alternatively, you may open a terminal, + step into the folder containing the package (using cd) and type:

    - sudo dpkg -i CirclePackings-32.deb -

    -

    You will be prompted to install libqt4-dev if not already installed on your system. + sudo dpkg -i <name of the deb file> +

    +

    You will be prompted to install a certain number of dependencies (libraries) if they are not already installed on your system. This can be done by typing:

    - sudo apt-get install libqt4-dev + sudo apt-get install libc6 libgcc1 libqtcore4 libqtgui4 libstdc++6

    Compile from the sources:

    @@ -458,8 +461,8 @@

    If the computation doesn't seem to go anywhere, just clicking the "Stop" button should do. The program will still show you the result of its computations, you so might see some total nonsense.

    -

    Note that the speed of computation will highly depend on your hardware (obvisously). In particular, having several logical cores will definitely - speed it up.

    +

    Note that the speed of computation will depend on your hardware (obvisously). In particular, having several logical cores will definitely + speed it up. Also, it seems that Linux does a better job than Windows, and 64 bits systems are faster than 32 bits systems.

    The interface is slow and lagging / freezing...

    We haven't tried the program on many computers yet, but it's possible that some features are demanding in terms of performances, especially if