瀏覽代碼

use combined srcs

cxgeorge 24 年之前
父節點
當前提交
8b2099b7ba
共有 3 個文件被更改,包括 29 次插入8 次删除
  1. 14 8
      panda/src/shader/Sources.pp
  2. 7 0
      panda/src/shader/shader_composite1.cxx
  3. 8 0
      panda/src/shader/shader_composite2.cxx

+ 14 - 8
panda/src/shader/Sources.pp

@@ -6,16 +6,22 @@
   #define TARGET shader
   #define TARGET shader
   #define LOCAL_LIBS \
   #define LOCAL_LIBS \
     putil express display graph sgattrib light sgraphutil
     putil express display graph sgattrib light sgraphutil
+    
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx    
 
 
   #define SOURCES \
   #define SOURCES \
-    casterShader.I casterShader.cxx casterShader.h config_shader.cxx \
-    config_shader.h outlineShader.cxx outlineShader.h \
-    planarReflector.cxx planarReflector.h projtexShader.cxx \
-    projtexShader.h projtexShadower.cxx projtexShadower.h shader.I \
-    shader.cxx shader.h shaderTransition.I shaderTransition.cxx \
-    shaderTransition.h spheretexHighlighter.cxx spheretexHighlighter.h \
-    spheretexReflector.cxx spheretexReflector.h spheretexShader.cxx \
-    spheretexShader.h spotlightShader.cxx spotlightShader.h
+     casterShader.I casterShader.h config_shader.h outlineShader.h  \
+     planarReflector.h projtexShader.h projtexShadower.h shader.I  \
+     shader.h shaderTransition.I shaderTransition.h  \
+     spheretexHighlighter.h spheretexReflector.h  \
+     spheretexShader.h spotlightShader.h  \
+
+  #define INCLUDED_SOURCES  \
+     casterShader.cxx config_shader.cxx outlineShader.cxx  \
+     planarReflector.cxx projtexShader.cxx projtexShadower.cxx  \
+     shader.cxx shaderTransition.cxx spheretexHighlighter.cxx  \
+     spheretexReflector.cxx spheretexShader.cxx  \
+     spotlightShader.cxx 
 
 
   #define INSTALL_HEADERS \
   #define INSTALL_HEADERS \
     casterShader.I casterShader.h outlineShader.h planarReflector.h \
     casterShader.I casterShader.h outlineShader.h planarReflector.h \

+ 7 - 0
panda/src/shader/shader_composite1.cxx

@@ -0,0 +1,7 @@
+
+#include "casterShader.cxx"
+#include "config_shader.cxx"
+#include "planarReflector.cxx"
+#include "projtexShader.cxx"
+#include "projtexShadower.cxx"
+#include "spotlightShader.cxx"

+ 8 - 0
panda/src/shader/shader_composite2.cxx

@@ -0,0 +1,8 @@
+
+#include "shader.cxx"
+#include "outlineShader.cxx"
+#include "shaderTransition.cxx"
+#include "spheretexHighlighter.cxx"
+#include "spheretexReflector.cxx"
+#include "spheretexShader.cxx"
+