RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add JPEG combined srcs

This commit is contained in:
cxgeorge 2002-02-06 23:35:08 +00:00
parent d3796c992b
commit 0506954928
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dtool/pptempl/Global.pp
View File

@ -303,12 +303,12 @@
$[PRECOMPILED_HEADER] \
$[if $[ne $[NO_COMBINED_SOURCES],], $[INCLUDED_SOURCES], $[get_combined_sources]] \
$[if $[HAVE_CRYPTO],$[IF_CRYPTO_SOURCES]] \
$[if $[HAVE_JPEG],$[IF_JPEG_SOURCES]] \
$[if $[HAVE_TIFF],$[IF_TIFF_SOURCES]] \
$[if $[HAVE_FFTW],$[IF_FFTW_SOURCES]] \
$[if $[HAVE_NURBSPP],$[IF_NURBSPP_SOURCES]] \
$[if $[HAVE_ZLIB], $[IF_ZLIB_SOURCES] $[if $[ne $[NO_COMBINED_SOURCES],], $[IF_ZLIB_INCLUDED_SOURCES], $[IF_ZLIB_COMBINED_SOURCES]]] \
$[if $[HAVE_NET], $[IF_NET_SOURCES] $[if $[ne $[NO_COMBINED_SOURCES],], $[IF_NET_INCLUDED_SOURCES], $[IF_NET_COMBINED_SOURCES]]] \
$[if $[HAVE_JPEG], $[IF_JPEG_SOURCES] $[if $[ne $[NO_COMBINED_SOURCES],], $[IF_JPEG_INCLUDED_SOURCES], $[IF_JPEG_COMBINED_SOURCES]]] \
$[if $[HAVE_ZLIB], $[IF_ZLIB_SOURCES] $[if $[ne $[NO_COMBINED_SOURCES],], $[IF_ZLIB_INCLUDED_SOURCES], $[IF_ZLIB_COMBINED_SOURCES]]] \
$[if $[HAVE_NET], $[IF_NET_SOURCES] $[if $[ne $[NO_COMBINED_SOURCES],], $[IF_NET_INCLUDED_SOURCES], $[IF_NET_COMBINED_SOURCES]]] \
$[if $[HAVE_IPC],$[IF_IPC_SOURCES]] \
$[if $[HAVE_PYTHON],$[IF_PYTHON_SOURCES]]
@ -317,16 +317,16 @@
$[PRECOMPILED_HEADER] \
$[if $[ne $[NO_COMBINED_SOURCES],], $[INCLUDED_SOURCES], $[get_combined_sources]] \
$[IF_CRYPTO_SOURCES] \
$[IF_JPEG_SOURCES] \
$[IF_TIFF_SOURCES] \
$[IF_FFTW_SOURCES] \
$[IF_NURBSPP_SOURCES] \
$[if $[HAVE_JPEG], $[IF_JPEG_SOURCES] $[if $[ne $[NO_COMBINED_SOURCES],], $[IF_JPEG_INCLUDED_SOURCES], $[IF_JPEG_COMBINED_SOURCES]]] \
$[if $[HAVE_ZLIB], $[IF_ZLIB_SOURCES] $[if $[ne $[NO_COMBINED_SOURCES],], $[IF_ZLIB_INCLUDED_SOURCES], $[IF_ZLIB_COMBINED_SOURCES]]] \
$[if $[HAVE_NET], $[IF_NET_SOURCES] $[if $[ne $[NO_COMBINED_SOURCES],], $[IF_NET_INCLUDED_SOURCES], $[IF_NET_COMBINED_SOURCES]]] \
$[IF_IPC_SOURCES] \
$[IF_PYTHON_SOURCES]
#defer included_sources $[INCLUDED_SOURCES] $[if $[HAVE_ZLIB],$[IF_ZLIB_INCLUDED_SOURCES]] $[if $[HAVE_NET],$[IF_NET_INCLUDED_SOURCES]] $[if $[USE_SINGLE_COMPOSITE_SOURCEFILE], $[COMBINED_SOURCES]]
#defer included_sources $[INCLUDED_SOURCES] $[if $[HAVE_ZLIB],$[IF_ZLIB_INCLUDED_SOURCES]] $[if $[HAVE_NET],$[IF_NET_INCLUDED_SOURCES]] $[if $[USE_SINGLE_COMPOSITE_SOURCEFILE], $[COMBINED_SOURCES]] $[if $[HAVE_JPEG],$[IF_JPEG_INCLUDED_SOURCES]]
// This variable returns the set of sources that are to be
// interrogated for the current target.

11
panda/src/pnmimagetypes/Sources.pp
View File

@ -25,10 +25,15 @@
pnmFileTypeSoftImage.cxx pnmFileTypeTIFF.cxx \
pnmFileTypeTGA.cxx pnmFileTypeYUV.cxx
#define IF_JPEG_SOURCES \
pnmFileTypeJPG.cxx pnmFileTypeJPG.h \
#define IF_JPEG_INCLUDED_SOURCES \
pnmFileTypeJPG.cxx \
pnmFileTypeJPGReader.cxx pnmFileTypeJPGWriter.cxx
#define IF_JPEG_SOURCES \
pnmFileTypeJPG.h
#define IF_JPEG_COMBINED_SOURCES \
$[TARGET]_composite3.cxx
#define INSTALL_HEADERS \
config_pnmimagetypes.h

5
panda/src/pnmimagetypes/pnmimagetypes_composite3.cxx Normal file
View File

@ -0,0 +1,5 @@
#include "pnmFileTypeJPG.cxx"
#include "pnmFileTypeJPGReader.cxx"
#include "pnmFileTypeJPGWriter.cxx"