Commit Graph

96 Commits

Author SHA1 Message Date
Kester Maddock
d5fde6c48b Added #!/usr/bin/python standard script identifier to the start of SConscript files.
Makes text editors identify SConscripts as Python, and syntax highlight properly.
2004-05-16 13:07:20 +00:00
Kent Mein
2620ee4dc2 Shortened up the Makefile since freebsd,linux and solaris do the
same stuff:
Basically use this instead of seperate sections for each platform.
  ifeq ($(OS),$(findstring $(OS), "linux freebsd solaris"))

Kent
2004-05-04 16:26:52 +00:00
Hans Lambermont
dcb83e27a2 - use SDL sound on FreeBSD too.
- add solid include path to unix common makefile ... this is not FreeBSD
  specific, so I'm a bit confused as this wasn't corrected before.
2004-04-30 17:50:48 +00:00
Kester Maddock
ccc0e30fff Enable doppler on platforms other than WIN32. 2004-04-17 01:14:35 +00:00
Stefan Gartner
837da93f19 enable openal support for os x and linux-powerpc
as there is a conflict between openal and sdl (when compiled with cdrom
support), i had to disable support for cd playing using sdl on os x
for the time being.
2004-04-14 13:00:36 +00:00
Joseph Gilbert
b9659a072a - MSVC 6 compiler include paths update 2004-04-10 21:32:35 +00:00
Simon Clitherow
efe556f132 cleaning up MSVC 6 project files -- fixed a couple of stray *.obj
file paths.
2004-04-09 17:30:00 +00:00
Nathan Letwory
9dea66a835 Major update for Visual Studio .Net project files. Both Release and Debug modes have been sanitised (ie. use .lib instead of .a). This update also makes the structure similar to the msvc6 projectfiles.
The new blender.sln is now found in directory projectfiles_vc7\\blender.

Update to the INSTALL file will follow soon.
2004-04-07 18:17:37 +00:00
Kester Maddock
1a8deeb85b Fix only looped sounds play on platforms other than Windows/Apple. 2004-04-04 09:34:58 +00:00
Chris Want
dc2d6b035a Fixes to projectfiles:
* Added SDL CD stuff to Open AL project (/me lazy)
* Made ketsji project find the python headers
* Added noise stuff to python project
2004-04-03 23:46:33 +00:00
Kester Maddock
2ccb9cf785 Added CD Audio support for OpenAL.
Updated Scons & Makefiles to cope
2004-04-02 13:15:18 +00:00
Nathan Letwory
8771b2eb98 - [SCons] Take out redundant 'defines' usage. _LIB is not needed for SoundSystem. This stops SCons from complaining on Windows when building. 2004-03-02 21:34:41 +00:00
Michel Selten
70a4ead0ae SCons updates
* Blender static now links. By default this option is disabled on all
  platforms. Simply set the option in config.opts to 'true'.
* Added the following flags to config.opts:
  - HOST_CC.    This is the C compiler for the host platform. This value is the
                same as TARGET_CC when not cross compiling.
  - HOST_CXX.   This is the C++ compiler for the host platform. This value is
                the same as TARGET_CXX when not cross compiling.
  - TARGET_CC.  This is the C compiler for the target platform.
  - TARGET_CXX. This is the C++ compiler for the target platform.
  - TARGET_AR.  This is the linker command for linking libraries.
  - PATH        This is the standard search path
  All SConscript files have been updated to reflect these changes. Now it's
  possible to change only the root SConstruct file, and all compiler specific
  variables are passed automatically to all SConscript files. Of course, this
  does not apply to makesdna because there the host and target platform is
  different from all other libraries.
  To pass a variable that applies to all platforms, all we now have to do is
  set the correct value in library_env


Note: as usual, to get the latest options in the config.opts file, first
      remove your version.
2004-02-29 21:40:48 +00:00
Michel Selten
d4b27baa2b SCons updates
* OpenAL support is now available on Linux. By default this feature is
  disabled since it is only necessary when building the game engine. And the
  game engine is disabled by default as well, so...
* Added 3 configurable options to config.opts. These apply to OpenAL settings.

NOTE: remove your current config.opts file to get the new options. (remember
      your current settings though ;) )

2nd NOTE: All options* are now configurable via the config.opts file. If the
          default settings for your platform are not correct, you should be
          able to only update the config.opts file.
  * FMOD is still not available - and I do not know if it is necessary to
    enable this feature.
2004-02-23 16:18:28 +00:00
Kent Mein
8134398de4 removed an extra ;
Found it with Sun's compiler.

Kent
2004-02-23 15:31:27 +00:00
Michel Selten
9330e553e8 SCons updates
* libraries are now generated in [BUILD_DIR]/lib
* passed the user_options to all libraries now.
  This means I could remove a couple of Export/Import lines.
* Changed the order in source/blender/src/SConscript and
  source/gameengine/SConscript.
  All libraries are now sorted alphabetically. This has no impact on the build
  process.
2004-02-15 19:25:32 +00:00
Nathan Letwory
a66108134c - Added the SConscripts for ftfont and quicktime
- [win32] python_include was missing, there was a double python_libpath. Corrected
- [win32] the soundsystem SConscript broke the win32 build.
2004-01-05 18:17:23 +00:00
Wouter van Heyst
57a7dfe5a5 - Revert to NaN makefiles 2004-01-05 00:06:11 +00:00
Alejandro Conty Estevez
eff07b8329 Basic initial yafray integration by Eeshlo.
Materials are exported the best we can do by now. It will look almost as in
blender except for the missing procedural textures and some minor issues.
You have to tweak normal modulation amount to get the desired result cause
is not the same in yafray.

We added a panel in render space to adjust some yafray settings (GI and so)

Also we export transparency and reflection using new raytracing settings,
but that will be changed and improved soon.

Remember that you have to set YFexport path in user defaults and yafray must
be on path (version 0.0.6)

We added the "yafray" button to activate all this stuff in the render window.
Panel and settings are only shown when checked.

So now when activated the code calls yafray export instead of the internal
renderer and finally the resulting image is loaded back into render window's
buffer. So animation is also possible and results can be saved using blender
usual scheme.
2004-01-04 22:10:36 +00:00
Michel Selten
d3e1fc8870 SCons build system files added.
You'll need SCons (www.scons.org) to build.
Platforms currently working:
* Linux (me)
  - options for quicktime, openal and international disabled
  - uses the system libs and include files for building - no option to build
    with the precompiled libraries yet.
* Windows (jesterKing)
  - builds with quicktime (optional)
  - builds with openal (optional)
  - builds with international support (optional)
  - Use the DOS box to build
  - builds with precompiled libraries
* Irix (Hos)
  - Uses default Irix compiler
  - Not all optimization levels correct yet
  - options for quicktime, openal and international disabled
  - builds with precompiled libraries
* Cygwin (me)
  - has a problem in the linking stage
  - uses free build tools (gcc)
  - options for quicktime, openal and international disabled
  - uses the system libs and include files for building - no option to build
    with the precompiled libraries yet.
* MacOS (sgefant)
  - builds with quicktime (optional)
  - options for openal and international disabled
  - builds a nice bundle
  - builds with precompiled libraries

Thanks to IanWill for a bugfix in the Linux build.
Note: This is a work in progress. A lot still has to be done - for example the
      optional parts are only to be enabled by directly setting 'true' or
      'false' in the SConstruct file. This needs to be moved to a user config
      file. Also, the .o/.obj files are stored in the source tree. This needs
      to be fixed as well.
      The game engine is not yet built.
2004-01-04 21:11:59 +00:00
Daniel Dunbar
7303944ea9 - update VC7 projectfiles 2004-01-02 23:35:21 +00:00
Robert Wenzlaff
9b032d6c2a Fixes Makefile for intern/SoundSystem/intern. 2003-10-21 23:27:08 +00:00
Hans Lambermont
1bbf616b59 Finally add spike's FreeBSD suggestions. Tnxto Chris for forwarding. 2003-10-05 19:37:16 +00:00
Michel Selten
357b070120 * Fix bug #390 - auto/gcc compile fails on irix:openal
OpenAL is now a configurable option again. The trick was to update the
  SND_DependKludge not to #define/#undef anything when the auto* tools are
  used.
2003-09-16 19:28:29 +00:00
Chris Want
d58a5fa269 Added the variable NAN_NO_OPENAL to force building without
openal. Set NAN_NO_OPENAL to true for this behavior.
Also removed a comment about EXPYTHON, which is obsolete.
2003-07-27 17:09:19 +00:00
Simon Clitherow
20ee6b2b66 - updated intern project files to include soundsystem (MSVC 6) 2003-07-20 19:51:03 +00:00
Chris Want
ae512b137c Changed some occurances of the lib 'soundsystem' to 'SoundSystem'
(seems half of the references were one way, the other half were
the other way). Also made irix link to $(OCGDIR)/intern/*SoundSystem/*
instead of $(OCGDIR)/gameengine/*SoundSystem/*
2003-07-17 02:36:56 +00:00
Kent Mein
6dcc5b030e Further fixes to the old makefiles.
Kent
2003-07-16 19:53:53 +00:00
Kent Mein
8dd015e9b0 Hopefully update for NaN Makefiles for the moving of SoundSystem.
I need to get openal working on my machine before I can test it so
if it doesn't work feel free to fix it.  Hopefully this will be
the majority of the stuff though.

Kent
2003-07-16 19:00:04 +00:00
Michel Selten
05cec80893 * Updated the auto* build system to compile again.
SoundSystem has been moved from source/gameengine to intern. This was needed
  because functionality from SoundSystem was needed by
  source/blender/src/editsound.c.
* Removed the option for the openal check in configure.ac. It's needed now by
  SoundSystem
* Removed the functionality for checking if 'noaudio' was provied on the
  commandline. Now audio is default on.
2003-07-16 18:23:50 +00:00
Chris Want
14b4ed4e8d Jacques patch for initializing m_context as NULL 2003-07-01 00:53:26 +00:00
Chris Want
924a849755 Support for building bf-blender under windows with gcc (huge thanks to
Florian Eggenburger).

Full instructions are in doc/README.windows-gcc.

Main differences from Florian's patch:

- the 'lib' dir should now be the same level as the 'blender' dir (rather
than being a subdir of 'blender'). This is consistent with the other
platforms that bf-blender supports (tuhopuu will also adopt this convention
hopefully soon).

- the script 'free_windows-env.mk' is no longer needed ... see the
docs about how this is overcome (again, tuhopuu will hopefully
also follow this route soon).

- the dlltool dir has it's own Makefile that builds all of the
needed stub libraries from the dll's in cvs.
2003-05-24 20:04:37 +00:00
Frank van Beek
e20e2c0201 - build and link against OpenAL instead of FMod on windows
Note: this needs to be changed in the projectfiles as well
2003-02-09 20:51:14 +00:00
Stefan Gartner
5b8aee77a2 don't use fmod on darwin 2003-02-09 20:15:39 +00:00
Frank van Beek
8dcdf3bf0b - replaced #elif with more correct version:
< #elif _WIN32
---
> #elif defined(_WIN32)
2003-01-04 18:17:50 +00:00
Frank van Beek
38e5b5899c - on windows alcGetError() has no arguments. On other platforms it does. 2003-01-04 16:46:49 +00:00
Kent Mein
f1c4f705a1 Removed the config.h thing from the .h's in the source dir.
So we should be all set now :)

Kent
--
mein@cs.umn.edu
2002-12-27 13:11:01 +00:00
Kent Mein
e5341714b6 Shrunk the hack so it didn't get used in newer versions of OpenAL which
seems to be working.

Kent

(diff follows)

Index: SND_OpenALDevice.cpp
===================================================================
RCS file: /cvs01/blender/source/gameengine/SoundSystem/openal/SND_OpenALDevice.cpp,v
retrieving revision 1.4
diff -u -r1.4 SND_OpenALDevice.cpp
--- SND_OpenALDevice.cpp        2002/11/25 15:29:57     1.4
+++ SND_OpenALDevice.cpp        2002/12/20 19:26:04
@@ -59,7 +59,7 @@
 #include <fcntl.h>

 /* untill openal gets unified we need this hack for non-windows systems */
-#ifndef WIN32
+#if !defined(WIN32) && !defined(ALC_MAJOR_VERSION)
2002-12-20 19:27:39 +00:00
Kent Mein
cd4a60f536 sgefants patch to remove the License Key stuff.
(I noticed its not completely gone yet from the blender/source dir)
But its a big step in the right direction if it doesn't enable
all of the functionatlity already...

(Using cscope for LICENSE_KEY_VALID still turns up some stuff)

Kent
--
mein@cs.umn.edu
2002-12-06 19:48:37 +00:00
Kent Mein
209a2ede2c Last of the config.h mods...
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

added to these files.

Kent
--
mein@cs.umn.edu
2002-11-25 15:29:57 +00:00
Kent Mein
d0e346d544 updated .c files to include:
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

Just need to finish cpp files now :)

Kent
--
mein@cs.umn.edu
2002-11-25 12:02:15 +00:00
Kent Mein
b9a19f1ea7 Did all of the .h's in source
(adding)
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

also the Makefile.in's were from previous patch adding
the system depend stuff to configure.ac

Kent
--
mein@cs.umn.edu
2002-11-25 11:16:17 +00:00
Kent Mein
716caf4d37 - ALenum alc_error = alcGetError(); // openal_2.14+
+               ALenum alc_error = alcGetError(NULL);   // openal_2.14+


Fix to get it to work with latest version of openal.

Kent
--
mein@cs.umn.edu
2002-11-12 15:26:05 +00:00
Maarten Gribnau
bd39a84c8b Added fmod sound for OSX and fixed some endian problems in
gameengine/SoundSystem to get it to work.
Maarten (mail@maartengribnau.com)
2002-11-04 21:50:33 +00:00
Kent Mein
01bff70383 fixed spacing in the headers to get rid of some warnings and some other
little minor spacing issues.
2002-10-30 02:07:20 +00:00
Hans Lambermont
12315f4d0e Initial revision 2002-10-12 11:37:38 +00:00