Commit Graph

226 Commits

Author SHA1 Message Date
Guillermo S. Romero
59cfe81085 Reorder library linking. 2010-11-11 06:22:55 +00:00
Guillermo S. Romero
1de1d6537e Fully disable AUD's FFTW3 usage. 2010-10-24 00:09:23 +00:00
Guillermo S. Romero
41a3f5863d Add include directive so buildinfo compilation can find defines, see r32271. 2010-10-03 16:30:10 +00:00
Guillermo S. Romero
d03c94d8d9 Group all AUD libs, duplicate one to avoid linker error. 2010-08-17 01:50:47 +00:00
Ton Roosendaal
dc3ca6dcda More makefiles for new audaspace commit.
Jorg: you have added an include Python.h in the AUD api.h. I'm not
sure if it's smart to have this, it makes all AUD code depend on
resolving the Python path.
2010-08-16 17:07:59 +00:00
Guillermo S. Romero
95aa8cfa4a Update address in license block. 2010-08-10 21:22:26 +00:00
Stefan Gartner
d50cc7826f == Makefiles ==
* add support for LCMS (disabled by default, set WITH_LCMS to true to enable it)
 * fixed typo that prevented TIFF support to be properly enabled
 * enable ray optimization by default (scons and cmake already did this)
 * fixed building with libsndfile on darwin (disabled by default)
 * quicktime: use audaspace headers from $(NAN_AUDASPACE)/include instead of intern
 * gameengine: add -DWITH_FFMPEG to compiler flags when building with ffmpeg support
2010-08-04 08:42:18 +00:00
Campbell Barton
957976882d build options to disable image formats WITH_CINEON, WITH_HDR.
- updated cmake, make & scons.
- renamed CMake build options WITH_TIFF -> WITH_IMAGE_TIFF, same for DDS, OPENJPEG etc.
2010-08-03 11:25:34 +00:00
Diego Borghetti
63335f2d10 Fix Makefile for new getUserDir system. 2010-07-05 14:32:15 +00:00
Guillermo S. Romero
32ce3e3433 Change couple of strings.
Clearly mention SVN version being built and more direct POVRay error.
2010-06-12 23:09:01 +00:00
Guillermo S. Romero
8e4cbaa0c7 Modifiers moved, adjust accordingly. 2010-04-12 01:23:55 +00:00
Kent Mein
86facbd682 Change order of linking slightly so things link.
Kent
2010-01-22 16:28:16 +00:00
Stefan Gartner
9da2c0c6c2 add OpenCOLLADA support to Makefiles
add "export WITH_OPENCOLLADA=true" to user-def.mk to enable it
2010-01-10 09:11:48 +00:00
Stefan Gartner
1f33d574c2 OS X Makefiles:
* added some new variables (mostly the same as with scons):
  - USE_COCOA: use Cocoa for ghost (defaults to true)
  - MACOSX_ARCHITECTURE: can be ppc, ppc64, i386, x86_64. By default this is the host architecture
    (ppc for PowerPC Macs, i386 for Intel Macs). In theory this allows to cross compile blender for
    a different architecture, though cross compilation only works on Intel Macs, because makesdna
    and makesrna are built for the target architecture.
    For a 64 bit build, set MACOSX_ARCHITECTURE to x86_64 (Intel) or ppc64 (PowerPC).
  - MACOSX_MIN_VERS: minimum OS X version to run blender on (10.4 for 32 bit builds, 10.5 for 64 bit    builds)
  - MACOSX_DEPLOYMENT_TARGET: needed by the linker to create an Application targeted for a specific
    OS version (defaults to 10.4 for 32 bit builds, 10.5 for 64 bit builds)
  - MACOSX_SDK: path to a specific SDK. currently not used 
  - USE_QTKIT: use QTKit instead of QuickTime (defaults to true for 64 bit builds, as using QTKit
    is mandatory in that case))
 * use the same compiler flags as scons
 * default compiler now is gcc-4.0 when building for 10.4 and gcc-4.2 when building for 10.5
 * extract $(LCGDIR)/release/python_$(MACOSX_ARCHITECTURE).zip to Application bundle. This might
   break building on 10.4, to fix that, rename $(LCGDIR)/release/python.zip 

When compiling blender, only MACOSX_ARCHITECTURE might be of interest, as it allows doing 64 bit
builds (or 32 bit PowerPC builds on Intel). All other variables are then set to reasonable defaults.
For current users of the Makefile system, this commit shouldn't change much.
2010-01-03 20:35:13 +00:00
Guillermo S. Romero
42154ad226 Add audaspace/fftw to Makefile system. 2009-12-28 23:40:20 +00:00
Kent Mein
fcaad00bda Some fixes to get blender compiling on solaris.
Kent
2009-12-17 17:42:26 +00:00
Guillermo S. Romero
e68dff3e76 Move libpython.a to COMLIB (before was PULIB). 2009-12-09 17:53:52 +00:00
Guillermo S. Romero
3e2766bc2e Add FFTW3 support to Makefiles, make OpenJpeg use OS lib for Linux.
And handful of whitespace clean ups.
2009-11-09 20:08:19 +00:00
Brecht Van Lommel
1196947a98 Fix makefiles for modifiers commit. 2009-11-05 18:17:18 +00:00
Guillermo S. Romero
9e38ec2506 Add raytrace subdir to Makefiles.
The makefile is a copy of the source one, not tuned, just to unbreak build.
This raises some questions: why separate dirs? why each build system takes
a different approach (different libs vs all source files into one)?
2009-10-06 17:01:00 +00:00
Diego Borghetti
53f0c3b018 Fix link problem: Rename libed_preview -> libed_render 2009-09-29 20:26:06 +00:00
Guillermo S. Romero
da5ff2ca98 Add directives to support multi dir lib. 2009-09-25 22:38:15 +00:00
Kent Mein
72c4c9da7a Fixing up Makefiles, its not fully working but its closer...
Kent
2009-09-25 18:47:43 +00:00
Guillermo S. Romero
abe48562b8 Remove smoke from COMLIB, already in PULIB. 2009-09-10 00:32:59 +00:00
Diego Borghetti
9781320716 Add Makefile for sound ops. 2009-08-28 15:54:15 +00:00
Diego Borghetti
1e50c17f91 Update makefile for libed_gpencil. 2009-08-26 17:13:20 +00:00
Diego Borghetti
9202aaa2dc Update Makefiles for audaspace.
This add support for: sdl, ffmpeg, openal, jack and sndfile.
We have new options:
	WITH_OPENAL, default false
	WITH_JACK, default false
	WITH_SNDFILE, default false

and with this:
	NAN_OPENAL, default /usr

	NAN_JACK, default /usr
	NAN_JACKCFLAGS, default -I$(NAN_JACK)/include/jack
	NAN_JACKLIBS, default $(NAN_JACK)/lib/libjack.a

	NAN_SNDFILE, default /usr
	NAN_SNDFILECFLAGS, default -I$(NAN_SNDFILE)/include
	NAN_SNDFILELIBS, default $(NAN_SNDFILE)/lib/libsndfile.

Also add two new option on source/Makefile for jack and sndfile libs,
but only for linux, so let me know for other OS.
2009-08-21 22:56:26 +00:00
Diego Borghetti
1772a0a62f Add unsigned char buffer to BLF_draw_buffer and update makefiles for lzo and lzma.
I rename the original makefile of lzo (Makefile.bak) and a new one.
Also four new option for user-def.mk:
	WITH_LZO, default true
	WITH_LZMA, default true
	NAN_LZO, default extern/lzo
	NAN_LZMA, default extern/lzma

It's easy add support for system libs (using lzo and lzma from OS) but I don't
know if it have much sense.

Note that I can't test the "unsigned char" buffer because the OGL animation
is not working (right ?), but is the same code that for float also the new
Makefile work fine here (Linux), but maybe need some tweak on other OS.
2009-08-20 18:34:14 +00:00
Diego Borghetti
94511c6729 Missing libed_userpref in source/Makefile 2009-08-18 17:01:59 +00:00
Guillermo S. Romero
3458642935 Add debug support like other libs. 2009-08-16 22:35:22 +00:00
Joilnen Leite
f04da8e7f5 Changed to able compile libsamplerate properly 2009-08-14 00:14:20 +00:00
Ton Roosendaal
3ba949b050 Added libsamplerate.a in Makefile
The structure for names where this lib is could need fix... 
will need feedback from other make users.

Also Python lib in svn is wrong, intel lib???
2009-08-11 18:39:27 +00:00
Joerg Mueller
a27cc1adf0 2.5 audio cleanup:
* Removed CD Actuator
* Removed bSample and bSoundListener
* Removed SoundSystem
* Removed -noaudio parameter
2009-08-10 15:39:11 +00:00
Guillermo S. Romero
5fddab3fd8 Add initial support in Makefiles for audaspace.
Note: removed hardcoded path in include directive. Check other build systems.
2009-08-10 01:56:54 +00:00
Campbell Barton
59bfe91f21 remove makefile cruft, mostly BGE related references to SUMO, Fuzzics, Blenkey etc.
also remove define MOZ_NOT_NET that was being used all over for telling the plugin to link against mozilla (not netscape)
2009-08-04 03:13:36 +00:00
Ton Roosendaal
466435553f 2.5
Makefile fix to link smoke lib
2009-07-30 18:41:19 +00:00
Ton Roosendaal
3d70e21c17 2.5
Makefile fix: added metaball.a lib
2009-07-29 18:03:25 +00:00
Guillermo S. Romero
2b99cdd5ca Add Makefile build support for Console Space Type (added in r21611). 2009-07-16 03:11:21 +00:00
Ton Roosendaal
b69f952acc 2.5
Makefile still had libradioisty.a
2009-07-08 17:49:14 +00:00
Campbell Barton
8ead648fd1 Spring Cleaning
* removed radiosity render code, DNA and RNA (left in radio render pass options), we'll get GI to replace this probably, better allow baking to vertex colors for people who used this.
* removed deprecated solid physics library, sumo integrations and qhull, a dependency
* removed ODE, was no longer being build or supported
* remove BEOS and AMIGA defines and references in Makefiles.
2009-06-21 16:18:38 +00:00
Brecht Van Lommel
89d2559e6d 2.5
* Update cmake and makefiles to link python generic.
* Fix game engine building for cmake and makefiles.
* Fix compile error with py 3.x, due to 2.x compat fix.
2009-06-18 19:25:58 +00:00
Ton Roosendaal
2d40b8d56f 2.5
Added SpaceLogic, to restore the old logic buttons into.
In future it can be used for a more advanced logic editor, with
states, behaviour, whatever. We'll see!

This commit only adds the backend for new space. Committed this
now as reference for when we need another space type. It's still
not well plugin-able (dynamic space types), but my idea is to just
have a new SpacePlugIn for this, with a neat small API to define
all relevant callbacks.

Also note the icon for the spacetype is wrong still.
2009-06-16 13:09:36 +00:00
Brecht Van Lommel
c8b4cf9206 2.50:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19820:HEAD

Notes:
* Game and sequencer RNA, and sequencer header are now out of date
  a bit after changes in trunk.
* I didn't know how to port these bugfixes, most likely they are
  not needed anymore.
  * Fix "duplicate strip" always increase the user count for ipo.
  * IPO pinning on sequencer strips was lost during Undo.
2009-06-08 20:08:19 +00:00
Ton Roosendaal
7c4fccd684 2.5
Cleanup commit:

- Yafray removed. Also did cmake/scons files, but didn't compile with it,
  so test would be appreciated :)
- Removed old crap from Windows release dir, should be checked on
  further by windows release builder later.
2009-06-01 12:10:30 +00:00
Diego Borghetti
405cf80eb8 Big, big commit!!
1) Remove WITH_FREETYPE2 from code, so now blender always need freetype2
2) Remove the old bmfont
3) Remove ftfont and bFTGL library
4) Implement a new BLF_draw_default function for place that still need/use
   the old BMF api.

I try to update both, scons and cmake, but I only can test with make, so
hope all work fine.

MSVC is broken, but I don't have Windows, things to search and fix are
any reference to WITH_FREETYPE2, FTGL and BMFONT (take in care that
blenkernel also have a BKE_bmfont.h, this don't have anything to do with bmfont).
        Always have to link/include the freetype2 library
        Remove any reference to libbmfont
        Remove any reference to libftfont
        Remove any reference to libbftgl (or libbFTGL)
2009-05-05 23:10:32 +00:00
Brecht Van Lommel
874c29cea8 2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19323:HEAD
Notes:
* blenderbuttons and ICON_SNAP_PEEL_OBJECT were not merged.
2009-04-20 15:06:46 +00:00
Diego Borghetti
34dfeb7d50 Remove ftfont from Makefile, it's not there anymore. 2009-04-16 15:01:51 +00:00
Campbell Barton
688db0f251 [#18260] FMOD Removal
from Jorg Muller (nexyon)

also removed references to CVS in install
2009-03-24 09:09:10 +00:00
Kent Mein
80319e5b51 Added BF_PROFILE (same name as in scons files) option.
Set it to true to build with -pg

Also I added CCFLAGS to final link of targets.  Not sure why it wasn't there before.

Kent
2009-03-23 19:52:49 +00:00
Chris Want
77e0199dc3 Makefile updates for Blender 2.5 (from GSR) 2009-03-19 01:50:45 +00:00