diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2009-09-05 03:22:46 +0400 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2009-09-05 03:22:46 +0400 |
commit | fc8ba755bd1f9171064528761934e11ca43918ce (patch) | |
tree | 4cc0732305a4099ac7767c6aa25917b8c1589c80 /source/blender/avi | |
parent | c802d187e5810441545e08dbf1b7d63a71c21f88 (diff) |
* fix linking order.
NOTE: this needs changes to stubs.c, but need to check with ideasman_42 how to fix with cmake. Probably linking order issues, but stubs.c currently generates warnings for msvc (redefinition of funcs) and errors for mingw (same redefinitions). Removing the offending lines from stubs.c fixes that.
Diffstat (limited to 'source/blender/avi')
-rw-r--r-- | source/blender/avi/SConscript | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/avi/SConscript b/source/blender/avi/SConscript index f6e5b787b58..61385958a84 100644 --- a/source/blender/avi/SConscript +++ b/source/blender/avi/SConscript @@ -1,5 +1,4 @@ #!/usr/bin/python -#Import ('extra_includes') Import ('env') sources = env.Glob('intern/*.c') @@ -7,4 +6,4 @@ sources = env.Glob('intern/*.c') incs = '. #/intern/guardedalloc' incs += ' ' + env['BF_JPEG_INC'] -env.BlenderLib ('bf_avi', sources, Split(incs), [], libtype=['core'], priority = [185] ) +env.BlenderLib ('bf_avi', sources, Split(incs), [], libtype=['core'], priority = [190] ) |