diff options
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/SConscript | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index c64779289c0..f136f2661ff 100644 --- a/SConstruct +++ b/SConstruct @@ -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'] diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index ef9ddb05a32..0acc20d9fbe 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -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) |