forked from bartvdbraak/blender
SCons updates
* 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:
parent
c78184e331
commit
450fdbfd82
@ -236,7 +236,7 @@ elif sys.platform == 'cygwin':
|
|||||||
opengl_include = ['/usr/include']
|
opengl_include = ['/usr/include']
|
||||||
# SDL specific stuff.
|
# SDL specific stuff.
|
||||||
sdl_env.ParseConfig ('sdl-config --cflags --libs')
|
sdl_env.ParseConfig ('sdl-config --cflags --libs')
|
||||||
sdl_cflags = sdl_env.Dictionary()['CCFLAGS']
|
sdl_cflags = []
|
||||||
sdl_include = sdl_env.Dictionary()['CPPPATH']
|
sdl_include = sdl_env.Dictionary()['CPPPATH']
|
||||||
sdl_libpath = sdl_env.Dictionary()['LIBPATH']
|
sdl_libpath = sdl_env.Dictionary()['LIBPATH']
|
||||||
sdl_lib = sdl_env.Dictionary()['LIBS']
|
sdl_lib = sdl_env.Dictionary()['LIBS']
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
# Import the C flags set in the SConstruct file
|
import sys
|
||||||
|
|
||||||
Import ('cflags')
|
Import ('cflags')
|
||||||
Import ('defines')
|
Import ('defines')
|
||||||
Import ('user_options_dict')
|
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 (CC = user_options_dict['HOST_CC'])
|
||||||
makesdna_tool.Replace (PATH = user_options_dict['PATH'])
|
makesdna_tool.Replace (PATH = user_options_dict['PATH'])
|
||||||
|
|
||||||
|
if sys.platform != 'cygwin':
|
||||||
makesdna_tool.Append (CCFLAGS = cflags)
|
makesdna_tool.Append (CCFLAGS = cflags)
|
||||||
makesdna_tool.Append (CPPDEFINES = defines)
|
|
||||||
makesdna_tool.Append (LINKFLAGS = user_options_dict['PLATFORM_LINKFLAGS'])
|
makesdna_tool.Append (LINKFLAGS = user_options_dict['PLATFORM_LINKFLAGS'])
|
||||||
|
makesdna_tool.Append (CPPDEFINES = defines)
|
||||||
makesdna_tool.Append (LIBPATH = '#'+user_options_dict['BUILD_DIR']+'/lib')
|
makesdna_tool.Append (LIBPATH = '#'+user_options_dict['BUILD_DIR']+'/lib')
|
||||||
makesdna_tool.Append (LIBS = 'blender_guardedalloc')
|
makesdna_tool.Append (LIBS = 'blender_guardedalloc')
|
||||||
makesdna_tool.Program (target = '#'+user_options_dict['BUILD_DIR']+'makesdna', source = source_files)
|
makesdna_tool.Program (target = '#'+user_options_dict['BUILD_DIR']+'makesdna', source = source_files)
|
||||||
|
Loading…
Reference in New Issue
Block a user