From 2a85e250157ae8f97d72194fa1f236553c52caab Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 7 Apr 2013 17:03:58 +0000 Subject: [PATCH] Move Darwin version handling into DarwinPlatformSettings --- SConstruct | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SConstruct b/SConstruct index ebecd994e..6f310df39 100644 --- a/SConstruct +++ b/SConstruct @@ -112,6 +112,11 @@ class DXXProgram: user_settings.asm = 0 self.lflags = os.environ["LDFLAGS"] if os.environ.has_key('LDFLAGS') else '' def adjust_environment(self,program,env): + VERSION = str(program.VERSION_MAJOR) + '.' + str(program.VERSION_MINOR) + if (program.VERSION_MICRO): + VERSION += '.' + str(program.VERSION_MICRO) + env['VERSION_NUM'] = VERSION + env['VERSION_NAME'] = program.PROGRAM_NAME + ' v' + VERSION env.Append(CPPDEFINES = ['HAVE_STRUCT_TIMESPEC', 'HAVE_STRUCT_TIMEVAL', '__unix__']) env.Append(CPPPATH = [os.path.join(program.srcdir, '../physfs'), os.path.join(os.getenv("HOME"), 'Library/Frameworks/SDL.framework/Headers'), '/Library/Frameworks/SDL.framework/Headers']) self.platform_sources = [os.path.join(program.srcdir, f) for f in ['arch/cocoa/SDLMain.m', 'arch/carbon/messagebox.c']] @@ -190,11 +195,6 @@ class DXXProgram: elif sys.platform == 'darwin': print "%s: compiling on Mac OS X" % self.PROGRAM_NAME platform = self.DarwinPlatformSettings - VERSION = str(self.VERSION_MAJOR) + '.' + str(self.VERSION_MINOR) - if (self.VERSION_MICRO): - VERSION += '.' + str(self.VERSION_MICRO) - env['VERSION_NUM'] = VERSION - env['VERSION_NAME'] = self.PROGRAM_NAME + ' v' + VERSION else: print "%s: compiling on *NIX" % self.PROGRAM_NAME platform = self.LinuxPlatformSettings