diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -9,67 +9,33 @@ Quick Install ------------- -### Linux and *BSD -Install FLTK-1.3.4-1 from source: - -``` - > wget http://fltk.org/pub/fltk/1.3.4/fltk-1.3.4-1-source.tar.gz - > tar -zxvf fltk-1.3.4-1-source.tar.gz - > cd fltk-1.3.4-1 - > ./configure --enable-shared --enable-gl - > make - > sudo make install - > fltk-config --version - 1.3.4-1 -``` - -Build the FLTKHS skeleton project: - -``` - > git clone http://github.com/deech/fltkhs-hello-world - > cd fltkhs-hello-world - > stack install - # About 6-8 minutes passes ... - > stack exec fltkhs-hello-world -``` - -### OSX Yosemite only - -Install FLTK-1.3.4-1 from Brew: - -``` - > brew install autoconf - > brew install fltk - > fltk-config --version - 1.3.4-1 -``` -Build the FLTKHS skeleton project: - -``` - > git clone http://github.com/deech/fltkhs-hello-world - > cd fltkhs-hello-world - > stack install - # About 6-8 minutes passes ... - > stack exec fltkhs-hello-world -``` - -### OSX El Capitan only +### Linux, *BSD and OSX +Installing FLTK from source (vs. package mangers) is recommended. Package managers sometimes put headers and libraries in unexpected places +causing `fltkhs` compilation failures. On OSX the `brew` package for the current stable version of FLTK is broken. Furthermore some Linux distributions +only ship the shared libraries which means that executables are less portable. Compiling from source is pretty quick and painless and fixes these problems. -Install the development version of FLTK from Brew: +Install FLTK-1.3.4-1 from source: ``` - > brew install --devel fltk + > wget http://fltk.org/pub/fltk/1.3.4/fltk-1.3.4-1-source.tar.gz + > tar -zxf fltk-1.3.4-1-source.tar.gz + > cd fltk-1.3.4-1 + > ./configure --enable-gl --enable-shared --enable-localjpeg --enable-localzlib --enable-localpng + > make + > sudo make install > fltk-config --version - 1.3.4 + 1.3.4-1 ``` + Build the FLTKHS skeleton project: ``` - > git clone http://github.com/deech/fltkhs-hello-world - > cd fltkhs-hello-world - > stack install - # About 6-8 minutes passes ... - > stack exec fltkhs-hello-world + > brew install autoconf # Only on OSX + > git clone http://github.com/deech/fltkhs-hello-world + > cd fltkhs-hello-world + > stack install + # About 6-8 minutes passes ... + > stack exec fltkhs-hello-world ``` ### Windows diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,8 @@ AC_CONFIG_SRCDIR([c-src/Fl_C.h]) # Checks for programs. -AC_PROG_CXX -AC_PROG_CC +AC_PROG_CC([clang gcc cc]) +AC_PROG_CXX([clang++ g++ c++]) # Checks for libraries. AC_CHECK_PROG(FLTKCONFIG,fltk-config,[fltk-config],[no]) diff --git a/fltkhs.cabal b/fltkhs.cabal --- a/fltkhs.cabal +++ b/fltkhs.cabal @@ -1,5 +1,5 @@ name : fltkhs -version : 0.5.0.3 +version : 0.5.0.4 synopsis : FLTK bindings description: Low level bindings for the FLTK GUI toolkit. For installation and quick start instruction please scroll all the way down to the README. diff --git a/src/Graphics/UI/FLTK/LowLevel/FLTKHS.hs b/src/Graphics/UI/FLTK/LowLevel/FLTKHS.hs --- a/src/Graphics/UI/FLTK/LowLevel/FLTKHS.hs +++ b/src/Graphics/UI/FLTK/LowLevel/FLTKHS.hs @@ -29,10 +29,6 @@ -- $InstallationWindows10 -- - -- *** Windows 7 - -- - -- $InstallationWindows7 - -- * Demos -- -- $Demos @@ -559,8 +555,6 @@ -- The general steps are: -- -- - Brew Install Stack --- - Brew Install FLTK-1.3.4-1 (Yosemite) --- - Brew Install FLTK-1.3.4-1 (El Capitan) -- - Download & install the -- - Verify the install by running `fltkhs-hello-world` -- @@ -571,25 +565,27 @@ -- > brew install haskell-stack -- @ -- --- == Brew Install FLTK-1.3.4-1 (Yosemite) --- +-- == Brew Install Autoconf -- @ -- > brew install autoconf --- > brew install fltk -- @ -- --- Unfortunately 'autoconf' is required to build FLTKHS but has been removed --- for the default XCode install since Yosemite so it is required here. --- --- == Brew Install FLTK-1.3.4-1 (El Capitan) +-- == Compile & Install FLTK from Source. +-- The `brew` package for the current stable release of FLTK is broken. Fortunately installing from source is pretty +-- quick and painless. -- --- @ --- > brew install --devel fltk + -- @ --- Unfortunately the version of Clang bundled with El Capitan does not compile the stable FLTK-1.3.4-1. --- This installs the as-yet unreleased development version. Although FLTKHS only support 1.3.4-1 --- it seems to work. +-- > wget http://fltk.org/pub/fltk/1.3.4/fltk-1.3.4-1-source.tar.gz +-- > tar -zxf fltk-1.3.4-1-source.tar.gz +-- > cd fltk-1.3.4-1 +-- > ./configure --enable-gl --enable-shared --enable-localjpeg --enable-localzlib --enable-localpng +-- > make +-- > sudo make install +-- > fltk-config --version +-- 1.3.4-1 -- +-- -- == Download & Install the FLTKHS Hello World Skeleton -- === Downloading Without Git -- If 'git' is not installed download the latest version of the fltkhs-hello-world application skeleton from @@ -634,7 +630,7 @@ -- $InstallationWindows10 -- --- This install guide has been tested on a Windows 10 and Windows 8. +-- This install guide has been tested on a Windows 7, 8 and 10. -- -- == Install Stack -- Downloading and following the default instructions for the standard should be enough. @@ -671,6 +667,7 @@ -- > pacman -S tar -- > pacman -S unzip -- > pacman -S zip +-- > pacman -S man -- @ -- -- ... and building C/C++ programs: @@ -692,7 +689,7 @@ -- Untar the FLTK archive and enter the directory: -- -- @ --- > tar -zxf fltk-1.3.4-1 +-- > tar -zxf fltk-1.3.4-1-source.tar.gz -- > cd fltk-1.3.4-1 -- @ -- @@ -716,7 +713,7 @@ -- -- @ -- > wget --no-check-certificate https://github.com/deech/fltkhs-hello-world/archive/master.zip --- > unzip fltkhs-hello-world-master.zip +-- > unzip master.zip -- > mv fltkhs-hello-world-master fltkhs-hello-world -- > cd fltkhs-hello-world -- @