Browse Source

don't build multimon without dx

David Rose 24 years ago
parent
commit
2c582536b4
2 changed files with 21 additions and 16 deletions
  1. 13 10
      panda/src/framework/Sources.pp
  2. 8 6
      panda/src/testbed/Sources.pp

+ 13 - 10
panda/src/framework/Sources.pp

@@ -16,17 +16,20 @@
 #end static_lib_target
 
 
-#begin static_lib_target
-  #define TARGET framework_multimon
-  #define LOCAL_LIBS \
-    putil collide loader sgmanip chan text chancfg cull \
-    pnmimage pnmimagetypes event wdxdisplay
+#if $[HAVE_DX]
+  #begin static_lib_target
+    #define TARGET framework_multimon
+    #define LOCAL_LIBS \
+      putil collide loader sgmanip chan text chancfg cull \
+      pnmimage pnmimagetypes event wdxdisplay
 
-  #define SOURCES \
-    config_framework.cxx config_framework.h framework_multimon.cxx framework.h
+    #define SOURCES \
+      config_framework.cxx config_framework.h framework_multimon.cxx framework.h
 
-  #define INSTALL_HEADERS \
-    framework.h
+    #define INSTALL_HEADERS \
+      framework.h
+
+  #end static_lib_target
+#endif
 
-#end static_lib_target
 

+ 8 - 6
panda/src/testbed/Sources.pp

@@ -35,14 +35,16 @@
   #define LOCAL_LIBS $[LOCAL_LIBS] pandagl pandadx
 #end test_bin_target
 
-#begin test_bin_target
-  #define TARGET demo_multimon
+#if $[HAVE_DX]
+  #begin test_bin_target
+    #define TARGET demo_multimon
 
-  #define SOURCES \
-    demo.cxx
+    #define SOURCES \
+      demo.cxx
 
-  #define LOCAL_LIBS $[LOCAL_LIBS] pandadx framework_multimon
-#end test_bin_target
+    #define LOCAL_LIBS $[LOCAL_LIBS] pandadx framework_multimon
+  #end test_bin_target
+#endif
 
 #begin test_bin_target
   #define TARGET downloader