diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-04 18:44:34 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-04 18:44:34 +0300 |
| commit | c0234bd9ecb0c7ab1065dfe4ebaf779fe8d99426 (patch) | |
| tree | 7ed89bffbd72d38cdfac59288d3c20d410702045 /source/blender/makesdna/intern/SConscript | |
| parent | 0884402f2bd52365ddd964d677f3fceaa92e91f9 (diff) | |
==SCons==
* add REL_CFLAGS and REL_CCFLAGS when not building debug. This adds NDEBUG
to compile on Win32
* fix path to makesdna binary
Diffstat (limited to 'source/blender/makesdna/intern/SConscript')
| -rw-r--r-- | source/blender/makesdna/intern/SConscript | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index 2e18528aaa4..e0e06cd0f23 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -2,39 +2,30 @@ import sys import os -#Import ('cflags') -#Import ('defines') Import ('env') cflags = '' defines = [] root_build_dir=env['BF_BUILDDIR'] -# TODO: make sure the makesdna program does not get installed on the system. source_files = ['makesdna.c'] makesdna_tool = env.Copy() dna = env.Copy() makesdna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesdna/\\"" ') -#makesdna_tool = Environment (ENV = os.environ, CCFLAGS='-DBASE_HEADER="\\"source/blender/makesdna/\\"" ') makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc', '../../makesdna']) -#makesdna_tool.Replace (CC = user_options_dict['HOST_CC']) -#makesdna_tool.Replace (PATH = user_options_dict['PATH']) - if sys.platform != 'cygwin': makesdna_tool.Append (CCFLAGS = cflags) - #makesdna_tool.Append (LINKFLAGS = user_options_dict['PLATFORM_LINKFLAGS']) makesdna_tool.Append (CPPDEFINES = defines) makesdna_tool.Append (LIBPATH = '#'+root_build_dir+'/lib') makesdna_tool.Append (LIBS = 'blender_guardedalloc') -makesdna_tool.Program (target = '#'+root_build_dir+'makesdna', source = source_files) +makesdna_tool.Program (target = '#'+root_build_dir+os.sep+'makesdna', source = source_files) -#dna = Environment (ENV = os.environ) dna_dict = dna.Dictionary() -makesdna_name = root_build_dir+'makesdna' + dna_dict['PROGSUFFIX'] +makesdna_name = root_build_dir+'/makesdna' + dna_dict['PROGSUFFIX'] dna.Depends ('dna.c', '#'+makesdna_name) -dna.Command ('dna.c', '', root_build_dir+"makesdna $TARGET") +dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna $TARGET") obj = 'intern/dna.c' Return ('obj') |