From 5ac3ccb6f6c9a8804eba291154a6dc1fdb8fb114 Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 6 Oct 2017 14:54:36 +0200 Subject: [PATCH] Remove pointless direct/metalibs directory --- direct/metalibs/direct/direct.cxx | 10 ---------- makepanda/makepanda.py | 7 +------ 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 direct/metalibs/direct/direct.cxx diff --git a/direct/metalibs/direct/direct.cxx b/direct/metalibs/direct/direct.cxx deleted file mode 100644 index 41594bf60d..0000000000 --- a/direct/metalibs/direct/direct.cxx +++ /dev/null @@ -1,10 +0,0 @@ -/** - * @file direct.cxx - * @author drose - * @date 2000-05-18 - */ - -// This is a dummy file whose sole purpose is to give the compiler something -// to compile when making libdirect.so in NO_DEFER mode, which generates an -// empty library that itself links with all the other shared libraries that -// make up libdirect. diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 5912388cda..696cc33857 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -3148,7 +3148,6 @@ if (PkgSkip("DIRECT")==0): CopyAllHeaders('direct/src/distributed') CopyAllHeaders('direct/src/interval') CopyAllHeaders('direct/src/showbase') - CopyAllHeaders('direct/metalibs/direct') CopyAllHeaders('direct/src/dcparse') if (RUNTIME or RTDIST): @@ -5213,10 +5212,6 @@ if (PkgSkip("DIRECT")==0): # if (PkgSkip("DIRECT")==0): - OPTS=['DIR:direct/metalibs/direct', 'BUILDING:DIRECT'] - TargetAdd('p3direct_direct.obj', opts=OPTS, input='direct.cxx') - - TargetAdd('libp3direct.dll', input='p3direct_direct.obj') TargetAdd('libp3direct.dll', input='p3directbase_directbase.obj') TargetAdd('libp3direct.dll', input='p3showbase_showBase.obj') if GetTarget() == 'darwin': @@ -5228,7 +5223,7 @@ if (PkgSkip("DIRECT")==0): TargetAdd('libp3direct.dll', input=COMMON_PANDA_LIBS) TargetAdd('libp3direct.dll', opts=['ADVAPI', 'OPENSSL', 'WINUSER', 'WINGDI']) - OPTS=['DIR:direct/metalibs/direct', 'PYTHON'] + OPTS=['PYTHON'] TargetAdd('direct_module.obj', input='libp3dcparser.in') TargetAdd('direct_module.obj', input='libp3showbase.in') TargetAdd('direct_module.obj', input='libp3deadrec.in')