diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2009-02-21 01:08:02 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2009-02-21 01:08:02 +0300 |
| commit | 64dd45ef4371575f3090858cd3b4abbbabed3a2b (patch) | |
| tree | 03a70f264ded81e54e4acc77f7e6e4b52b88ae59 /intern | |
| parent | d56fd6d4cef0230665e0acf299dce4d400a7461d (diff) | |
2.5 / Scons | Building on 64bit Windows
* add preliminary support for building Blender on 64bit Windows with _msvc_. The SConstruct should automatically detect if you are on a 64bit Windows and if you have that 64bit build is assumed. If you're not, 32bit build is assumed.
NOTE: this is still very much wip, so your mileage may vary. Do please report on b25 taskforce ML in case of trouble.
NOTE2: many of the libs are being linked in statically
NOTE3: hopefully I didn't break anything for other build platforms (mingw, linux, osx).
NOTE4: comes after NOTE3
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/ghost/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index dc442b3bb54..9de82ac44fb 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -14,7 +14,7 @@ if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd6', 'irix6'): for f in pf: sources.remove('intern' + os.sep + f + 'Win32.cpp') sources.remove('intern' + os.sep + f + 'Carbon.cpp') -elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross'): +elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'): for f in pf: sources.remove('intern' + os.sep + f + 'X11.cpp') sources.remove('intern' + os.sep + f + 'Carbon.cpp') @@ -27,6 +27,6 @@ else: Exit() incs = '. ../string ' + env['BF_OPENGL_INC'] -if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross'): +if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'): incs = env['BF_WINTAB_INC'] + ' ' + incs env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['intern'], priority = [40] ) |