add JPEG combined srcs

dtool/pptempl/Global.pp

@@ -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.

panda/src/pnmimagetypes/Sources.pp

@@ -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

panda/src/pnmimagetypes/pnmimagetypes_composite3.cxx

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