fixes to support building C++ code in direct, even without python enabled

makepanda/makepanda.py

@@ -1864,7 +1864,7 @@ CreatePandaVersionFiles()
 #
 ##########################################################################################
 
-if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
+if (PkgSkip("DIRECT")==0):
     CopyTree(GetOutputDir()+'/direct', 'direct/src')
     ConditionalWriteFile(GetOutputDir() + '/direct/__init__.py', "")
     if (sys.platform.startswith("win")):
@@ -2097,7 +2097,6 @@ if (PkgSkip("DIRECT")==0):
     CopyAllHeaders('direct/src/showbase')
     CopyAllHeaders('direct/metalibs/direct')
     CopyAllHeaders('direct/src/dcparse')
-    CopyAllHeaders('direct/src/heapq')
 
 if (RUNTIME or RTDIST):
     CopyAllHeaders('direct/src/plugin', skip=["p3d_plugin_config.h"])
@@ -3658,16 +3657,16 @@ if (not RUNTIME and (sys.platform == "win32" or sys.platform == "darwin" or PkgS
 # DIRECTORY: direct/src/directbase/
 #
 
-if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
+if (PkgSkip("DIRECT")==0):
   OPTS=['DIR:direct/src/directbase', 'PYTHON']
   TargetAdd('directbase_directbase.obj', opts=OPTS+['BUILDING:DIRECT'], input='directbase.cxx')
 
-  if (not RTDIST and not RUNTIME):
+  if ((PkgSkip("PYTHON")==0 and not RTDIST and not RUNTIME):
     DefSymbol("BUILDING:PACKPANDA", "IMPORT_MODULE", "direct.directscripts.packpanda")
     TargetAdd('packpanda.obj', opts=OPTS+['BUILDING:PACKPANDA'], input='ppython.cxx')
     TargetAdd('packpanda.exe', input='packpanda.obj')
     TargetAdd('packpanda.exe', opts=['PYTHON'])
-
+  
     DefSymbol("BUILDING:EGGCACHER", "IMPORT_MODULE", "direct.directscripts.eggcacher")
     TargetAdd('eggcacher.obj', opts=OPTS+['BUILDING:EGGCACHER'], input='ppython.cxx')
     TargetAdd('eggcacher.exe', input='eggcacher.obj')
@@ -3677,7 +3676,7 @@ if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
 # DIRECTORY: direct/src/dcparser/
 #
 
-if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
+if (PkgSkip("DIRECT")==0):
   OPTS=['DIR:direct/src/dcparser', 'WITHINPANDA', 'BUILDING:DIRECT', 'BISONPREFIX_dcyy']
   CreateFile(GetOutputDir()+"/include/dcParser.h")
   TargetAdd('dcparser_dcParser.obj', opts=OPTS, input='dcParser.yxx')
@@ -3695,7 +3694,7 @@ if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
 # DIRECTORY: direct/src/deadrec/
 #
 
-if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
+if (PkgSkip("DIRECT")==0):
   OPTS=['DIR:direct/src/deadrec', 'BUILDING:DIRECT']
   TargetAdd('deadrec_composite.obj', opts=OPTS, input='deadrec_composite.cxx')
   IGATEFILES=GetDirectoryContents('direct/src/deadrec', ["*.h", "*_composite.cxx"])
@@ -3707,7 +3706,7 @@ if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
 # DIRECTORY: direct/src/distributed/
 #
 
-if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
+if (PkgSkip("DIRECT")==0):
   OPTS=['DIR:direct/src/distributed', 'DIR:direct/src/dcparser', 'WITHINPANDA', 'BUILDING:DIRECT', 'OPENSSL']
   TargetAdd('distributed_config_distributed.obj', opts=OPTS, input='config_distributed.cxx')
   TargetAdd('distributed_cConnectionRepository.obj', opts=OPTS, input='cConnectionRepository.cxx')
@@ -3721,7 +3720,7 @@ if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
 # DIRECTORY: direct/src/interval/
 #
 
-if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
+if (PkgSkip("DIRECT")==0):
   OPTS=['DIR:direct/src/interval', 'BUILDING:DIRECT']
   TargetAdd('interval_composite.obj', opts=OPTS, input='interval_composite.cxx')
   IGATEFILES=GetDirectoryContents('direct/src/interval', ["*.h", "*_composite.cxx"])
@@ -3733,7 +3732,7 @@ if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
 # DIRECTORY: direct/src/showbase/
 #
 
-if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
+if (PkgSkip("DIRECT")==0):
   OPTS=['DIR:direct/src/showbase', 'BUILDING:DIRECT']
   TargetAdd('showbase_showBase.obj', opts=OPTS, input='showBase.cxx')
   if (sys.platform == "darwin"):
@@ -3747,7 +3746,7 @@ if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
 # DIRECTORY: direct/metalibs/direct/
 #
 
-if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
+if (PkgSkip("DIRECT")==0):
   OPTS=['DIR:direct/metalibs/direct', 'BUILDING:DIRECT']
   TargetAdd('direct_direct.obj', opts=OPTS, input='direct.cxx')
 
@@ -3793,18 +3792,6 @@ if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0 and not RTDIST and not RUNTIME
   TargetAdd('p3dcparse.exe', input=COMMON_PANDA_LIBS_PYSTUB)
   TargetAdd('p3dcparse.exe', opts=['ADVAPI'])
 
-#
-# DIRECTORY: direct/src/heapq/
-#
-
-if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
-  OPTS=['DIR:direct/src/heapq']
-  TargetAdd('heapq_heapq.obj', opts=OPTS, input='heapq.cxx')
-  TargetAdd('libp3heapq.dll', input='heapq_heapq.obj')
-  TargetAdd('libp3heapq.dll', input='libpandaexpress.dll')
-  TargetAdd('libp3heapq.dll', input=COMMON_DTOOL_LIBS)
-  TargetAdd('libp3heapq.dll', opts=['ADVAPI'])
-
 #
 # DIRECTORY: direct/src/plugin/
 #