diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2004-01-21 12:05:17 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2004-01-21 12:05:17 +0300 |
| commit | 314f4db5e4e36b26bf97a3653b4617d9dc85c63d (patch) | |
| tree | d910f07655d378e2761a82f1edc40cddfd5acf5e /SConstruct | |
| parent | 1652884463afa64ec000462e7a23d3267f980b25 (diff) | |
- (win32) moved the .res addition to source_files to after the first use of source_files, so the addition makes sense.
- (win32) set the path for ode_include to the prebuilt library.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 68eb4e51c64..d6a08313147 100644 --- a/SConstruct +++ b/SConstruct @@ -198,11 +198,10 @@ elif sys.platform == 'win32': extra_includes += ['#../lib/windows/openal/include'] sdl_include = '#../lib/windows/sdl/include' sdl_cflags = '' - source_files += ['source/icons/winblender.res'] link_env.RES(['source/icons/winblender.rc']) window_system = 'WIN32' solid_include = '#../lib/windows/solid/include' - ode_include = '#extern/ode/dist/include/ode' + ode_include = '#../lib/windows/ode/include' # Python lib name python_include = '#../lib/windows/python/include/python2.2' python_libpath = '#../lib/windows/python/lib' @@ -379,6 +378,9 @@ else: source_files = ['source/creator/buildinfo.c', 'source/creator/creator.c'] +if sys.platform == 'win32': + source_files += ['source/icons/winblender.res'] + include_paths = ['#/intern/guardedalloc', '#/source/blender/makesdna', '#/source/blender/blenkernel', |