bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

==SCons==

Browse Source 
* add REL_CFLAGS and REL_CCFLAGS when not building debug. This adds NDEBUG
  to compile on Win32
* fix path to makesdna binary
This commit is contained in:
Nathan Letwory 2006-02-04 15:44:34 +00:00
parent 0884402f2b
commit c0234bd9ec
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/win32-vc-config.py
View File

@ -132,8 +132,8 @@ BF_OPENGL_LIB_STATIC = [ BF_OPENGL + '/lib/libGL.a', BF_OPENGL + '/lib/libGLU.a'
CCFLAGS = ['/nologo', '/Og', '/Ot', '/Ob1', '/Op', '/G6','/EHsc', '/J', '/W3', '/Gd', '/MT']
CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-DUSE_OPENAL', '-DFTGL_LIBRARY_STATIC']
REL_CFLAGS = []
REL_CCFLAGS = []
REL_CFLAGS = ['-O2', '-DNDEBUG']
REL_CCFLAGS = ['-O2', '-DNDEBUG']
##BF_DEPEND = 'true'
##
##AR = ar

15
source/blender/makesdna/intern/SConscript
View File

@ -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')

2
tools/Blender.py
View File

@ -275,6 +275,8 @@ class BlenderEnvironment(SConsEnvironment):
lenv.Append(CPPDEFINES=['GAMEBLENDER=1'])
if lenv['BF_DEBUG']:
lenv.Append(CCFLAGS = lenv['BF_DEBUG_FLAGS'], CXXFLAGS = lenv['BF_DEBUG_FLAGS'])
else:
lenv.Append(CCFLAGS = lenv['REL_CFLAGS'], CXXFLAGS = lenv['REL_CCFLAGS'])
if lenv['BF_PROFILE']:
lenv.Append(CCFLAGS = lenv['BF_PROFILE_FLAGS'], CXXFLAGS = lenv['BF_PROFILE_FLAGS'])
if compileflags: