Bladeren bron

Fix 2D debug templates linking

Mounir Tohami 2 weken geleden
bovenliggende
commit
af404ff584
6 gewijzigde bestanden met toevoegingen van 18 en 17 verwijderingen
  1. 5 12
      servers/SCsub
  2. 2 1
      servers/navigation_2d/SCsub
  3. 5 1
      servers/navigation_3d/SCsub
  4. 2 1
      servers/physics_2d/SCsub
  5. 2 1
      servers/physics_3d/SCsub
  6. 2 1
      servers/xr/SCsub

+ 5 - 12
servers/SCsub

@@ -14,18 +14,11 @@ SConscript("display/SCsub")
 SConscript("movie_writer/SCsub")
 SConscript("rendering/SCsub")
 SConscript("text/SCsub")
-
-if not env["disable_navigation_2d"]:
-    SConscript("navigation_2d/SCsub")
-if not env["disable_physics_2d"]:
-    SConscript("physics_2d/SCsub")
-
-if not env["disable_navigation_3d"]:
-    SConscript("navigation_3d/SCsub")
-if not env["disable_physics_3d"]:
-    SConscript("physics_3d/SCsub")
-if not env["disable_xr"]:
-    SConscript("xr/SCsub")
+SConscript("navigation_2d/SCsub")
+SConscript("physics_2d/SCsub")
+SConscript("navigation_3d/SCsub")
+SConscript("physics_3d/SCsub")
+SConscript("xr/SCsub")
 
 lib = env.add_library("servers", env.servers_sources)
 

+ 2 - 1
servers/navigation_2d/SCsub

@@ -3,4 +3,5 @@ from misc.utility.scons_hints import *
 
 Import("env")
 
-env.add_source_files(env.servers_sources, "*.cpp")
+if not env["disable_navigation_2d"]:
+    env.add_source_files(env.servers_sources, "*.cpp")

+ 5 - 1
servers/navigation_3d/SCsub

@@ -3,4 +3,8 @@ from misc.utility.scons_hints import *
 
 Import("env")
 
-env.add_source_files(env.servers_sources, "*.cpp")
+if not env["disable_navigation_3d"]:
+    env.add_source_files(env.servers_sources, "*.cpp")
+else:
+    if env.debug_features:
+        env.add_source_files(env.servers_sources, "navigation_server_3d.cpp")

+ 2 - 1
servers/physics_2d/SCsub

@@ -3,4 +3,5 @@ from misc.utility.scons_hints import *
 
 Import("env")
 
-env.add_source_files(env.servers_sources, "*.cpp")
+if not env["disable_physics_2d"]:
+    env.add_source_files(env.servers_sources, "*.cpp")

+ 2 - 1
servers/physics_3d/SCsub

@@ -3,4 +3,5 @@ from misc.utility.scons_hints import *
 
 Import("env")
 
-env.add_source_files(env.servers_sources, "*.cpp")
+if not env["disable_physics_3d"]:
+    env.add_source_files(env.servers_sources, "*.cpp")

+ 2 - 1
servers/xr/SCsub

@@ -3,4 +3,5 @@ from misc.utility.scons_hints import *
 
 Import("env")
 
-env.add_source_files(env.servers_sources, "*.cpp")
+if not env["disable_xr"]:
+    env.add_source_files(env.servers_sources, "*.cpp")