* Moved makefile options to jconfig.inc

This commit is contained in:
michael 2004-02-07 23:34:51 +00:00
parent 46d241a666
commit 59a791ced2
10 changed files with 16 additions and 10 deletions

View File

@ -208,7 +208,6 @@ override PACKAGE_VERSION=1.9.2
override TARGET_UNITS+=jmorecfg jpeglib jdeferr jerror jcomapi jinclude rdcolmap cdjpeg jdapimin jmemmgr jutils jmemnobs jdmarker jdinput jdapistd jdmaster jdcolor jdsample jdpostct jddctmgr jdct jidctfst jidctint jidctflt jidctred jdphuff jdhuff jdcoefct jdmainct jquant2 jquant1 jdmerge jdatasrc wrbmp wrppm wrtarga
override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
override INSTALL_FPCPACKAGE=y
override COMPILER_OPTIONS+=-Sdg
ifdef REQUIRE_UNITSDIR
override UNITSDIR+=$(REQUIRE_UNITSDIR)
endif

View File

@ -6,9 +6,6 @@
name=pasjpeg
version=1.9.2
[compiler]
options=-Sdg
[target]
units=jmorecfg jpeglib jdeferr jerror jcomapi jinclude rdcolmap cdjpeg \
jdapimin jmemmgr jutils jmemnobs jdmarker jdinput jdapistd jdmaster \

View File

@ -8,6 +8,8 @@ Unit JcCoefCt;
interface
{$I jconfig.inc}
uses
jmorecfg,
jinclude,
@ -16,7 +18,6 @@ uses
jutils,
jpeglib;
{$I jconfig.inc}
{ We use a full-image coefficient buffer when doing Huffman optimization,
and also for writing multiple-scan JPEG files. In all cases, the DCT

View File

@ -9,6 +9,8 @@ Unit JcMaster;
interface
{$I jconfig.inc}
uses
jmorecfg,
jinclude,
@ -17,7 +19,6 @@ uses
jutils,
jpeglib;
{$I jconfig.inc}
{ Initialize master compression control. }

View File

@ -108,3 +108,8 @@
{$undef RGB_RED_IS_0} { BGR byte order in JQUANT2 }
{$endif}
{$endif}
{$IFDEF FPC}
{$MODE DELPHI}
{$GOTO ON}
{$ENDIF}

View File

@ -10,6 +10,7 @@ Unit JcpHuff;
interface
{$I jconfig.inc}
uses
jmorecfg,
jinclude,
@ -20,7 +21,6 @@ uses
jcomapi,
jchuff; { Declarations shared with jchuff.c }
{$I jconfig.inc}
{ Module initialization routine for progressive Huffman entropy encoding. }

View File

@ -9,6 +9,7 @@ Unit JDCoefCt;
Also, the input side (only) is used when reading a file for transcoding. }
{ Original: jdcoefct.c ; Copyright (C) 1994-1997, Thomas G. Lane. }
{$I jconfig.inc}
interface
@ -20,7 +21,6 @@ uses
jutils,
jpeglib;
{$I jconfig.inc}
{GLOBAL}
procedure jinit_d_coef_controller (cinfo : j_decompress_ptr;

View File

@ -12,6 +12,8 @@ Unit JdPostCt;
An integrated upsample/convert/quantize process would replace this module
entirely. }
{$I jconfig.inc}
interface
uses
@ -22,7 +24,6 @@ uses
jutils,
jpeglib;
{$I jconfig.inc}
{ Initialize postprocessing controller. }

View File

@ -9,6 +9,7 @@ Unit Jerror;
{ Source: jerror.c; Copyright (C) 1991-1996, Thomas G. Lane. }
{ note: format_message still contains a hack }
{$i jconfig.inc}
interface
uses

View File

@ -8,10 +8,11 @@ Unit JQuant1;
interface
{$I jconfig.inc}
uses
jpeglib;
{$I jconfig.inc}
{GLOBAL}
procedure jinit_1pass_quantizer (cinfo : j_decompress_ptr);