From 51cbe1fb720cb5c66ebcce41cd1837e10869d9e0 Mon Sep 17 00:00:00 2001 From: David Rose Date: Tue, 11 Nov 2008 23:31:09 +0000 Subject: [PATCH] clean up Sources.pp files --- panda/metalibs/panda/Sources.pp | 12 ++++++------ panda/src/dxgsg8/Sources.pp | 2 +- panda/src/dxgsg9/Sources.pp | 2 +- panda/src/glgsg/Sources.pp | 2 +- panda/src/glstuff/Sources.pp | 2 +- panda/src/gsgmisc/Sources.pp | 14 -------------- panda/src/mesadisplay/Sources.pp | 2 +- panda/src/tinydisplay/Sources.pp | 2 +- 8 files changed, 12 insertions(+), 26 deletions(-) delete mode 100644 panda/src/gsgmisc/Sources.pp diff --git a/panda/metalibs/panda/Sources.pp b/panda/metalibs/panda/Sources.pp index 4dab6829a0..7f151728b0 100644 --- a/panda/metalibs/panda/Sources.pp +++ b/panda/metalibs/panda/Sources.pp @@ -11,12 +11,12 @@ #define COMPONENT_LIBS \ recorder pgraph pgraphnodes pipeline \ pvrpn grutil chan pstatclient \ - char chat collide cull device \ - dgraph display event gobj graph gsgbase \ - gsgmisc light linmath mathutil movies net nativenet\ - parametrics pnm \ - pnmimagetypes pnmimage sgattrib sgmanip sgraph sgraphutil \ - switchnode pnmtext text tform tiff lerp loader putil \ + char collide cull device \ + dgraph display event gobj gsgbase \ + linmath mathutil movies net nativenet\ + parametrics \ + pnmimagetypes pnmimage \ + pnmtext text tform lerp putil \ audio pgui pandabase helix #define LOCAL_LIBS \ diff --git a/panda/src/dxgsg8/Sources.pp b/panda/src/dxgsg8/Sources.pp index 3dfd4ff1f7..729fcf1d58 100644 --- a/panda/src/dxgsg8/Sources.pp +++ b/panda/src/dxgsg8/Sources.pp @@ -9,7 +9,7 @@ #begin lib_target #define TARGET dxgsg8 #define LOCAL_LIBS \ - gsgmisc gsgbase gobj display windisplay \ + gsgbase gobj display windisplay \ putil linmath mathutil pnmimage event #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/panda/src/dxgsg9/Sources.pp b/panda/src/dxgsg9/Sources.pp index 0aeef154db..2fc6dfdaee 100755 --- a/panda/src/dxgsg9/Sources.pp +++ b/panda/src/dxgsg9/Sources.pp @@ -9,7 +9,7 @@ #begin lib_target #define TARGET dxgsg9 #define LOCAL_LIBS \ - gsgmisc gsgbase gobj display windisplay \ + gsgbase gobj display windisplay \ putil linmath mathutil pnmimage event #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/panda/src/glgsg/Sources.pp b/panda/src/glgsg/Sources.pp index c19048c62e..bceb3df39f 100644 --- a/panda/src/glgsg/Sources.pp +++ b/panda/src/glgsg/Sources.pp @@ -5,7 +5,7 @@ #begin lib_target #define TARGET glgsg #define LOCAL_LIBS \ - glstuff gsgmisc gsgbase gobj display \ + glstuff gsgbase gobj display \ putil linmath mathutil pnmimage #define SOURCES \ diff --git a/panda/src/glstuff/Sources.pp b/panda/src/glstuff/Sources.pp index 6860b381c5..67c5365c55 100644 --- a/panda/src/glstuff/Sources.pp +++ b/panda/src/glstuff/Sources.pp @@ -7,7 +7,7 @@ #begin lib_target #define TARGET glstuff #define LOCAL_LIBS \ - gsgmisc gsgbase gobj display \ + gsgbase gobj display \ putil linmath mathutil pnmimage \ effects diff --git a/panda/src/gsgmisc/Sources.pp b/panda/src/gsgmisc/Sources.pp deleted file mode 100644 index 1b30bab0d9..0000000000 --- a/panda/src/gsgmisc/Sources.pp +++ /dev/null @@ -1,14 +0,0 @@ -// Now that we have removed GeomIssuer, there's nothing left in this -// directory. -#define BUILD_DIRECTORY - -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m - -#begin lib_target - #define TARGET gsgmisc - #define LOCAL_LIBS \ - putil gobj gsgbase mathutil - -#end lib_target - diff --git a/panda/src/mesadisplay/Sources.pp b/panda/src/mesadisplay/Sources.pp index 6092929990..41e8116c1f 100644 --- a/panda/src/mesadisplay/Sources.pp +++ b/panda/src/mesadisplay/Sources.pp @@ -8,7 +8,7 @@ #begin lib_target #define TARGET mesadisplay #define LOCAL_LIBS \ - glstuff gsgmisc gsgbase gobj display \ + glstuff gsgbase gobj display \ putil linmath mathutil pnmimage #define SOURCES \ diff --git a/panda/src/tinydisplay/Sources.pp b/panda/src/tinydisplay/Sources.pp index 086b8e3201..caef08ae7a 100644 --- a/panda/src/tinydisplay/Sources.pp +++ b/panda/src/tinydisplay/Sources.pp @@ -13,7 +13,7 @@ #begin lib_target #define TARGET tinydisplay #define LOCAL_LIBS \ - gsgmisc gsgbase gobj display \ + gsgbase gobj display \ putil linmath mathutil pnmimage windisplay #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx