Cygwin is only supported with the autotools build system

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@279 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/BUILDING.txt b/BUILDING.txt
index 7ede3d60702c41ee84809eeede5093bbdf995b5e..59ff8e0ee69e4bde2085453e90780cbcf984f1e5 100644 (file)
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -1,5 +1,5 @@
 *******************************************************************************
-**     Building on Unix Platforms
+**     Building on Unix Platforms (including Cygwin)
 *******************************************************************************
 
 
@@ -50,8 +50,8 @@ Building libjpeg-turbo
 ======================
 
 The following procedure will build libjpeg-turbo on Linux, FreeBSD, 32-bit
-OS X, and Solaris/x86 systems (on Solaris, this generates a 32-bit library.
-See below for 64-bit build instructions.)
+OS X, Cygwin, and Solaris/x86 systems (on Solaris, this generates a 32-bit
+library.  See below for 64-bit build instructions.)
 
   cd {source_directory}
   autoreconf -fiv
@@ -69,10 +69,12 @@ This will generate the following files under .libs/
 
   libjpeg.so.{version} (Linux, Solaris)
   libjpeg.{version}.dylib (OS X)
+  cygjpeg-{version}.dll (Cygwin)
       Shared library for libjpeg-turbo
 
   libjpeg.so (Linux, Solaris)
   libjpeg.dylib (OS X)
+  libjpeg.dll.a (Cygwin)
       Development stub for libjpeg-turbo shared library
 
   libturbojpeg.a
@@ -82,8 +84,26 @@ This will generate the following files under .libs/
   libturbojpeg.dylib (OS X)
       Shared library and development stub for TurboJPEG/OSS
 
+  cygturbojpeg.dll (Cygwin)
+      Shared library for TurboJPEG/OSS
+
+  libturbojpeg.dll.a (Cygwin)
+      Development stub for TurboJPEG/OSS shared library
+
 {version} is 62.0.0, 7.0.0, or 8.0.2, depending on whether libjpeg v6b
-(default), v7, or v8b emulation is enabled.
+(default), v7, or v8b emulation is enabled.  If using Cygwin, {version} is
+62, 7, or 8.
+
+
+libjpeg v7 or v8b Emulation
+---------------------------
+
+Add --with-jpeg7 to the configure command line to build a version of
+libjpeg-turbo that is compatible with libjpeg v7.  Add --with-jpeg8 to the
+configure command to build a version of libjpeg-turbo that is compatible with
+libjpeg v8b.  See README-turbo.txt for more information on libjpeg v7 and v8b
+emulation.
+
 
 
 ========================
@@ -221,8 +241,15 @@ To build a 64-bit version of libjpeg-turbo using Sun Studio, add
 to the configure command line.
 
 
+MinGW Build on Cygwin
+---------------------
+
+Use CMake (see recipes below)
+
+
+
 *******************************************************************************
-**     Building on Windows (Visual C++, MinGW, or Cygwin)
+**     Building on Windows (Visual C++ or MinGW)
 *******************************************************************************
 
 
@@ -255,7 +282,7 @@ Build Requirements
 
 ... OR ...
 
--- MinGW or Cygwin
+-- MinGW
 
    GCC v4.1 or later recommended for best performance
 
@@ -371,32 +398,6 @@ This will generate the following files under {build_directory}
 v8b emulation is enabled.
 
 
-Cygwin
-------
-
-  cd {build_directory}
-  cmake -G "Unix Makefiles" {source_directory}
-  make
-
-This will generate the following files under {build_directory}
-
-  libjpeg.a
-      Static link library for libjpeg-turbo
-  sharedlib/cygjpeg-{version}.dll
-      DLL for libjpeg-turbo
-  sharedlib/libjpeg.dll.a
-      Import library for libjpeg-turbo DLL
-  libturbojpeg.a
-      Static link library for TurboJPEG/OSS
-  cygturbojpeg.dll
-      DLL for TurboJPEG/OSS
-  libturbojpeg.dll.a
-      Import library for TurboJPEG/OSS DLL
-
-{version} is 62, 7, or 8, depending on whether libjpeg v6b (default), v7, or
-v8b emulation is enabled.
-
-
 Debug Build
 -----------
 
@@ -411,7 +412,7 @@ libjpeg v7 or v8b Emulation
 Add "-DWITH_JPEG7=1" to the cmake command line to build a version of
 libjpeg-turbo that is compatible with libjpeg v7.  Add "-DWITH_JPEG8=1" to the
 cmake command to build a version of libjpeg-turbo that is compatible with
-libjpeg v8.  See README-turbo.txt for more information on libjpeg v7 and v8b
+libjpeg v8b.  See README-turbo.txt for more information on libjpeg v7 and v8b
 emulation.
 
 
@@ -428,7 +429,7 @@ to the cmake command line.
 
 For example,
 
-  cmake -G"NMake Makefiles" -DCMAKE_BUILD_TYPE=Release \
+  cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=c:\libjpeg-turbo {source_directory}
   nmake install
 
@@ -447,7 +448,7 @@ Build Recipes
 
   cd {build_directory}
   CC=/usr/bin/x86_64-w64-mingw32-gcc CXX=/usr/bin/x86_64-w64-mingw32-g++ \
-    cmake -G"Unix Makefiles" -DCMAKE_AR=/usr/bin/x86_64-w64-mingw32-ar \
+    cmake -G "Unix Makefiles" -DCMAKE_AR=/usr/bin/x86_64-w64-mingw32-ar \
     -DCMAKE_RANLIB=/usr/bin/x86_64-w64-mingw32-ranlib {source_directory}
   make
 
@@ -461,7 +462,7 @@ mingw64-x86_64-gcc-g++ packages (and their dependencies) must be installed.
 
   cd {build_directory}
   CC=/usr/bin/i686-w64-mingw32-gcc CXX=/usr/bin/i686-w64-mingw32-g++ \
-    cmake -G"Unix Makefiles" -DCMAKE_AR=/usr/bin/i686-w64-mingw32-ar \
+    cmake -G "Unix Makefiles" -DCMAKE_AR=/usr/bin/i686-w64-mingw32-ar \
     -DCMAKE_RANLIB=/usr/bin/i686-w64-mingw32-ranlib {source_directory}
   make
 
@@ -479,7 +480,7 @@ toolchain (which is faster than the Cygwin version):
   cd {build_directory}
   CC={mingw-w64_binary_path}/x86_64-w64-mingw32-gcc \
     CXX={mingw-w64_binary_path}/x86_64-w64-mingw32-g++ \
-    cmake -G"MSYS Makefiles" \
+    cmake -G "MSYS Makefiles" \
     -DCMAKE_AR={mingw-w64_binary_path}/x86_64-w64-mingw32-ar \
     -DCMAKE_RANLIB={mingw-w64_binary_path}/x86_64-w64-mingw32-ranlib \
     {source_directory}
@@ -492,7 +493,7 @@ MinGW Build on Linux
   cd {build_directory}
   CC={mingw_binary_path}/i386-mingw32-gcc \
     CXX={mingw_binary_path}/i386-mingw32-g++ \
-    cmake -G"Unix Makefiles" -DCMAKE_AR={mingw_binary_path}/i386-mingw32-ar \
+    cmake -G "Unix Makefiles" -DCMAKE_AR={mingw_binary_path}/i386-mingw32-ar \
     -DCMAKE_RANLIB={mingw_binary_path}/i386-mingw32-ranlib \
     -DCMAKE_SYSTEM_NAME=Windows {source_directory}
   make
@@ -534,6 +535,10 @@ make udmg
   fork can be made backward compatible as well by using the instructions in
   the "Build Recipes" section.  OS X 10.4 compatibility SDK required.
 
+make cygwinpkg
+
+  Build a Cygwin binary package.
+
 
 Windows
 -------
@@ -543,7 +548,7 @@ If using NMake:
   cd {build_directory}
   nmake installer
 
-If using MinGW or Cygwin:
+If using MinGW:
 
   cd {build_directory}
   make installer