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

For the assembler build, make sure platform_settings is accessed from self, likely preventing a compiling error

Browse source
This commit is contained in:
Chris Taylor 2013-04-05 09:12:33 +08:00
parent 264f2aa8db
commit b750415db6
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.txt
View file

@ -1,5 +1,9 @@
D1X-Rebirth Changelog
20130405
--------
SConstruct: For the assembler build, make sure platform_settings is accessed from self, likely preventing a compiling error
20130117
--------
main/render.c: Fix click-selection in the editor for OpenGL implementations that insist on point blending

2
SConstruct
View file

@ -196,7 +196,7 @@ class DXXProgram:
if (self.user_settings.asm == 1) and (self.user_settings.opengl == 0):
print "%s: including: ASSEMBLER" % self.PROGRAM_NAME
env.Replace(AS = 'nasm')
env.Append(ASCOM = ' -f ' + str(platform_settings.osasmdef) + ' -d' + str(platform_settings.osdef) + ' -Itexmap/ ')
env.Append(ASCOM = ' -f ' + str(self.platform_settings.osasmdef) + ' -d' + str(self.platform_settings.osdef) + ' -Itexmap/ ')
self.common_sources += asm_sources
else:
env.Append(CPPDEFINES = ['NO_ASM'])