Documentation updates (STR #568)

More CMake updates (STR #499)

The Watcom C++ compiler needed a small change (STR #567)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3869 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 35 insertions, 35 deletions

diff --git a/jpeg/CMakeLists.txt b/jpeg/CMakeLists.txt
index 03b33f3e6..66b16d84e 100644
--- a/jpeg/CMakeLists.txt
+++ b/jpeg/CMakeLists.txt
@@ -1,35 +1,35 @@
-PROJECT(FLTKJPEG)

-

-INCLUDE_REGULAR_EXPRESSION("^(jchuff|jconfig|jdct|jdhuff|jerror|jinclude|jmemsys|jmorecfg|jpegint|jpeglib|jversion|jpeg).*$")

-

-INCLUDE_DIRECTORIES(${FLTKJPEG_SOURCE_DIR})

-INCLUDE_DIRECTORIES(${FLTKJPEG_BINARY_DIR})

-

-# memmgr back ends: compile only one of these into a working library

-# (For now, let's use the mode that requires the image fit into memory.

-# This is the recommended mode for Win32 anyway.)

-SET(systemdependent_SRCS jmemnobs.c)

-

-# library object files common to compression and decompression

-SET(common_SRCS

-jcomapi.c jutils.c jerror.c jmemmgr.c

-)

-

-# compression library object files

-SET(compression_SRCS

-jcapimin.c jcapistd.c jctrans.c jcparam.c jdatadst.c jcinit.c

-jcmaster.c jcmarker.c jcmainct.c jcprepct.c jccoefct.c jccolor.c

-jcsample.c jchuff.c jcphuff.c jcdctmgr.c jfdctfst.c jfdctflt.c

-jfdctint.c

-)

-

-# decompression library object files

-SET(decompression_SRCS

-jdapimin.c jdapistd.c jdtrans.c jdatasrc.c jdmaster.c

-jdinput.c jdmarker.c jdhuff.c jdphuff.c jdmainct.c jdcoefct.c

-jdpostct.c jddctmgr.c jidctfst.c jidctflt.c jidctint.c jidctred.c

-jdsample.c jdcolor.c jquant1.c jquant2.c jdmerge.c

-)

-

-ADD_LIBRARY(fltk_jpeg ${systemdependent_SRCS} ${common_SRCS} ${compression_SRCS} ${decompression_SRCS})

-

+PROJECT(FLTKJPEG)
+
+INCLUDE_REGULAR_EXPRESSION("^(jchuff|jconfig|jdct|jdhuff|jerror|jinclude|jmemsys|jmorecfg|jpegint|jpeglib|jversion|jpeg).*$")
+
+INCLUDE_DIRECTORIES(${FLTKJPEG_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${FLTKJPEG_BINARY_DIR})
+
+# memmgr back ends: compile only one of these into a working library
+# (For now, let's use the mode that requires the image fit into memory.
+# This is the recommended mode for Win32 anyway.)
+SET(systemdependent_SRCS jmemnobs.c)
+
+# library object files common to compression and decompression
+SET(common_SRCS
+jcomapi.c jutils.c jerror.c jmemmgr.c
+)
+
+# compression library object files
+SET(compression_SRCS
+jcapimin.c jcapistd.c jctrans.c jcparam.c jdatadst.c jcinit.c
+jcmaster.c jcmarker.c jcmainct.c jcprepct.c jccoefct.c jccolor.c
+jcsample.c jchuff.c jcphuff.c jcdctmgr.c jfdctfst.c jfdctflt.c
+jfdctint.c
+)
+
+# decompression library object files
+SET(decompression_SRCS
+jdapimin.c jdapistd.c jdtrans.c jdatasrc.c jdmaster.c
+jdinput.c jdmarker.c jdhuff.c jdphuff.c jdmainct.c jdcoefct.c
+jdpostct.c jddctmgr.c jidctfst.c jidctflt.c jidctint.c jidctred.c
+jdsample.c jdcolor.c jquant1.c jquant2.c jdmerge.c
+)
+
+ADD_LIBRARY(fltk_jpeg ${systemdependent_SRCS} ${common_SRCS} ${compression_SRCS} ${decompression_SRCS})
+