kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

SCons updates

Browse Source 
* Updates to the cygwin build.
  the dna.c file used to be generated with a full path. Cygwin doesn't like
  this. The problem was with some cflags and linkflags that are used to build
  makesdna.exe
  Hos nicely pointed this out and proposed a solution.
  Now, these flags are only added to the command when the platform != 'cygwin'.
* Updated some variables in SConstruct.
This commit is contained in:
Michel Selten 2004-04-11 21:11:18 +00:00
parent c78184e331
commit 450fdbfd82
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -236,7 +236,7 @@ elif sys.platform == 'cygwin':
opengl_include = ['/usr/include']
# SDL specific stuff.
sdl_env.ParseConfig ('sdl-config --cflags --libs')
sdl_cflags = sdl_env.Dictionary()['CCFLAGS']
sdl_cflags = []
sdl_include = sdl_env.Dictionary()['CPPPATH']
sdl_libpath = sdl_env.Dictionary()['LIBPATH']
sdl_lib = sdl_env.Dictionary()['LIBS']

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

@ -1,4 +1,5 @@
# Import the C flags set in the SConstruct file
import sys
Import ('cflags')
Import ('defines')
Import ('user_options_dict')
@ -14,9 +15,10 @@ makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc',
makesdna_tool.Replace (CC = user_options_dict['HOST_CC'])
makesdna_tool.Replace (PATH = user_options_dict['PATH'])
makesdna_tool.Append (CCFLAGS = cflags)
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 (LINKFLAGS = user_options_dict['PLATFORM_LINKFLAGS'])
makesdna_tool.Append (LIBPATH = '#'+user_options_dict['BUILD_DIR']+'/lib')
makesdna_tool.Append (LIBS = 'blender_guardedalloc')
makesdna_tool.Program (target = '#'+user_options_dict['BUILD_DIR']+'makesdna', source = source_files)