TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove duplicate object addition in SConstruct

Browse source
This commit is contained in:
Kp 2013-08-24 20:54:29 +00:00
parent 1abcfcb844
commit 20fdaa3fa7
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
SConstruct
View file

@ -520,7 +520,6 @@ class DXXCommon(LazyObjectConstructor):
# Acquire environment object...
self.env = Environment(ENV = os.environ, tools = platform.tools)
self.platform_settings.adjust_environment(self, self.env)
self.sources += self.platform_settings.platform_sources
def process_user_settings(self):
env = self.env
@ -886,6 +885,8 @@ class DXXProgram(DXXCommon):
@property
def objects_common(self):
objects_common = self.__objects_common
if (self.user_settings.use_udp == 1):
objects_common = objects_common + self.objects_use_udp
return objects_common + self.platform_settings.platform_objects
def __init__(self,prefix):
self.variables = Variables('site-local.py', ARGUMENTS)
@ -959,8 +960,6 @@ class DXXProgram(DXXCommon):
message(self, "building with Software Renderer")
objects.extend(static_archive_construction.objects_arch_sdl)
objects.extend(self.objects_similar_arch_sdl)
if (self.user_settings.use_udp == 1):
objects.extend(self.objects_use_udp)
if (self.user_settings.editor == 1):
objects.extend(self.objects_editor)
objects.extend(static_archive_construction.objects_editor)