Commits

Edd Dawson  committed 6f3cbe1

Updates to reflect changes to doozer.

  • Participants
  • Parent commits a0561cf

Comments (0)

Files changed (1)

 from doozerlib.uniquelist import UniqueList
 
 # Variables
-flags = needvar('pngxx.flags', 'flags', description='list of abstract build flags (see doozer docs)')
-test_o_matic_root = needvar('test_o_matic.root', description='the path to test_o_matic')
+flags = cfgvar('pngxx.flags', 'flags', description='list of abstract build flags (see doozer docs)')
+test_o_matic_root = cfgvar('test_o_matic.root', description='the path to test_o_matic')
 
-imagexx_root = needvar('imagexx.root', description='the path to imagexx')
+imagexx_root = cfgvar('imagexx.root', description='the path to imagexx')
 
-libpng_root         = needvar('libpng.root', description='path to libpng source distribution')
-libpng_flags        = needvar('libpng.flags', 'flags', description='list of abstract build flags (see doozer docs)')
-libpng_build_as_cpp = getvar('libpng.build_as_cplusplus', default=True)
+libpng_root         = cfgvar('libpng.root', description='path to libpng source distribution')
+libpng_flags        = cfgvar('libpng.flags', 'flags', description='list of abstract build flags (see doozer docs)')
+libpng_build_as_cpp = cfgvar('libpng.build_as_cplusplus', default=True, description='compile C files with a C++ compiler')
 
-zlib_root         = needvar('zlib.root', description='path to zlib source distribution')
-zlib_flags        = needvar('zlib.flags', 'flags', description='list of abstract build flags (see doozer docs)')
-zlib_debugspam    = getvar('zlib.debugspam', default=False)
+zlib_root     = cfgvar('zlib.root', description='path to zlib source distribution')
+zlib_flags    = cfgvar('zlib.flags', 'flags', description='list of abstract build flags (see doozer docs)')
+zlib_debuglog = cfgvar('zlib.debuglog', default=False, description='enable additional debug output in zlib')
 
 
 
 tomproj = subproject(test_o_matic_root/'make.py')
 imagexxproj = subproject(imagexx_root/'make.py')
 
+
+
 @target
 def zlib(kit):
     opt = kit.c.opt(*zlib_flags)
-    if zlib_debugspam:
+    if zlib_debuglog:
         opt.defines += ['DEBUG=1']
 
     opt.includes += [zlib_root]