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

use composite build for IF_NET and IF_ZLIB

This commit is contained in:
cxgeorge 2001-07-02 01:58:25 +00:00
parent dfbf81a53e
commit 01d620867c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dtool/pptempl/Global.pp
View File

@ -308,9 +308,9 @@
$[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 $[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_NET],$[IF_NET_SOURCES]] \
$[if $[HAVE_PYTHON],$[IF_PYTHON_SOURCES]]
#defer all_sources \
@ -322,12 +322,12 @@
$[IF_TIFF_SOURCES] \
$[IF_FFTW_SOURCES] \
$[IF_NURBSPP_SOURCES] \
$[IF_ZLIB_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_NET_SOURCES] \
$[IF_PYTHON_SOURCES]
#defer included_sources $[INCLUDED_SOURCES]
#defer included_sources $[INCLUDED_SOURCES] $[if $[HAVE_ZLIB],$[IF_ZLIB_INCLUDED_SOURCES]] $[if $[HAVE_NET],$[IF_NET_INCLUDED_SOURCES]]
// This variable returns the set of sources that are to be
// interrogated for the current target.