Commit Graph

64 Commits

Author SHA1 Message Date
Chris Want
9c18b6cff7 While building with gcc on Irix one is confronted by the message:
---------------------------->8----------------------------------------------
g++ -DHAVE_CONFIG_H -I. -I../../../blender/intern/bsp -I../.. -I../../../blender/intern/container -I../../../blender/intern/moto/include -I../../../blender/intern/memutil -I/usr/freeware/include -g -funsigned-char -c ../../../blender/intern/bsp/intern/BSP_CSGMesh.cpp -MT BSP_CSGMesh.lo -MD -MP -MF .deps/BSP_CSGMesh.TPlo  -DPIC -o .libs/BSP_CSGMesh.lo
/usr/freeware/lib/gcc-lib/mips-sgi-irix6.5/3.0.4/include/g++/bits/stl_iterator.h: In
   constructor `std::__normal_iterator<_Iterator,
   _Container>::__normal_iterator(const std::__normal_iterator<_Iter,
   _Container>&) [with _Iter = const BSP_MFace*, _Iterator = BSP_MFace*,
   _Container = std::vector<BSP_MFace, std::allocator<BSP_MFace> >]':
../../../blender/intern/bsp/intern/BSP_CSGMesh.cpp:270:   instantiated from here
/usr/freeware/lib/gcc-lib/mips-sgi-irix6.5/3.0.4/include/g++/bits/stl_iterator.h:474: cannot
   convert `const BSP_MFace* const' to `BSP_MFace*' in initialization
*** Error code 1 (bu21)
*** Error code 1 (bu21)
*** Error code 1 (bu21)
*** Error code 1 (bu21)
---------------------------->8----------------------------------------------

The line in question that causes the error is the middle one in this group:

	vector<BSP_MFace>::const_iterator f_it_end = FaceSet().end();
	vector<BSP_MFace>::const_iterator f_it_begin = FaceSet().begin();
	vector<BSP_MFace>::iterator f_it = FaceSet().begin();

Dropping the 'const_' from that middle line enables gcc to compile the
file correctly (this is also consistent with what is going on with other
parts of the file, i.e., stuff that is returned from a begin() method is
declared as vector<BSP_MFace>::iterator instead of
vector<BSP_MFace>::const_iterator.

But I'll be honest: I have no idea what this code does, so if somebody with
better C++ skills wants to check it, then please do.

This change was also tested to compile and run on debian linux/x86
(well, booleans are broken right now, so I wasn't able to do too much
testing).

Chris
2002-12-29 15:59:51 +00:00
f0d39af87b Replaced old doxygen config file with two new ones:
ghost_all.cfg to generate doxygen documentation for all of ghost.
ghost_interface.cfg to generate docs for the interface only.
Maarten
2002-12-28 22:33:48 +00:00
b2824fe23a Removed those extra CVS tag lines in the header files of ghost (now I know what
Gilles meant) and added some extra doxygen tags I had lying around.
Removed the cocoa file since it was rubbish.
Maarten
2002-12-28 22:26:45 +00:00
Chris Want
9e3c814e72 Reverted changes to bsp code so that the code will compile
under gcc 3.x. A better solution should be found as this
breaks booleans.

Chris
2002-12-28 17:55:24 +00:00
Chris Want
7c96971152 Reverting change to decimation to fix compatibility with
gcc 3.x (a better solution should be found)
2002-12-28 17:45:46 +00:00
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
f78de74b20 WooHoo me again ;)
I took out the following from the includes in the intern dir that still had
it:
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif

Kent
--
mein@cs.umn.edu
2002-12-26 18:25:17 +00:00
Chris Want
331fffaecb Sorry, Kent the indexing changes to this file turn out to be broken
too -- a user reported crashing while using decimation and rolling back
the modifications between rev 1.2 and rev 1.3 for this file fixed it.

Regards,
Chris
2002-12-25 21:42:56 +00:00
Chris Want
f8b3f65d85 Some changes made to the bsp code in early November
(to stop gcc compiler warnings) caused segfaults when
performing intersections (and possibly while doing other
boolean operations). I felt it was best to revert these
changes (I also got rid of the DOS line terminators in
the files). Some more info about the matter can be found
in the first 10 or so posts for Novembor on the old
mailing list:

http://www.soze.com/mailman/private/bf-committers/2002-November/date.html

Chris (Merry Christmas!)
2002-12-25 08:35:08 +00:00
a609ff51e8 Removed fixed path for Python excutable.
The README will explain how to set an option in MSVC to make it find
python.
Maarten
2002-12-22 23:02:21 +00:00
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
782a5b573d Back at it ;)
Removed an unused var...
Here is the cvs diff.

Kent

Index: bsp/intern/BSP_CSGUserData.cpp
===================================================================
RCS file: /cvs01/blender/intern/bsp/intern/BSP_CSGUserData.cpp,v
retrieving revision 1.4
diff -u -r1.4 BSP_CSGUserData.cpp
--- BSP_CSGUserData.cpp 2002/11/25 09:52:48     1.4
+++ BSP_CSGUserData.cpp 2002/12/20 09:37:58
@@ -79,7 +79,6 @@
        int record_index
 ){
        if (m_width) {
-               int output = Size();
                IncSize();
2002-12-20 09:39:02 +00:00
45c360dfc4 -static void SleepTillEvent(Display *display, GHOST_TUns64 maxSleep) {
+static void SleepTillEvent(Display *display, GHOST_TInt64 maxSleep) {

maxSleep is checked against -1 so it needs to have a sign.
This could even fix some stability problems since -1 is passed in sometimes
in the code.

Kent
--
mein@cs.umn.edu
2002-12-19 20:08:12 +00:00
d9df4b8feb Fixed this warning:
IK_QSegment.h: In constructor `IK_QSegment::IK_QSegment(MT_Point3,
   MT_Matrix3x3, double, MT_ExpMap)':
IK_QSegment.h:271: warning: member initializers for `MT_Scalar
   IK_QSegment::m_length'
IK_QSegment.h:270: warning:   and `MT_ExpMap IK_QSegment::m_q'
IK_QSegment.cpp:56: warning:   will be re-ordered to match declaration order
IK_QSegment.h: In constructor `IK_QSegment::IK_QSegment()':
IK_QSegment.h:271: warning: member initializers for `MT_Scalar
   IK_QSegment::m_length'
IK_QSegment.h:270: warning:   and `MT_ExpMap IK_QSegment::m_q'
IK_QSegment.cpp:73: warning:   will be re-ordered to match declaration order

Kind of goofy its just the order of which 2 private vars are defined.

Kent
--
mein@cs.umn.edu
2002-12-19 20:06:07 +00:00
8b9b761e97 Created a Makefile and got it actually to compile :)
Kent
--
mein@cs.umn.edu
2002-12-16 12:02:24 +00:00
cca22768dc Added extra libs for solaris
(-l/usr/openwin/lib -lglut etc...)

Kent
--
mein@cs.umn.edu
2002-12-16 11:18:31 +00:00
a5b42eb626 Fixed the files so they compile...
Had to add an argument to Create_window... (it was missing the sterio flag)

Also cleaned up some variable overloading warnings...
(i.e. window shadows previous def)

Kent
2002-12-16 10:57:08 +00:00
4a9377a861 Gilles's patch to get rid of the the same identifier warnings
Kent
--
mein@cs.umn.edu
2002-12-14 15:38:45 +00:00
cfceb16f4a Corrected intern lib names so blendercreator.dsp can find them.
Previous commit broke this. --aphex
2002-12-14 12:31:17 +00:00
0c1e935175 And the rest! ;) --aphex 2002-12-12 21:16:46 +00:00
12a587bd58 Modified the intern MSVC project files to make them more
Win9x/ME-friendly.

This shouldn't break the NT/2000/XP builds, but let me know if it does!

--aphex
2002-12-12 21:13:47 +00:00
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
671a355e9f Got rid of unused files in intern/iksolver
(removed them from cvs and from the Makefile.am)

Kent
--
mein@cs.umn.edu
2002-12-03 12:11:07 +00:00
644e4d7c1c I added
#include <stdlib.h>
To fix a problem with a machine not being able to find malloc

Kent
2002-12-02 09:48:10 +00:00
3ee75a90d2 These freeze changes give working frozen Python code on Windows.
Maarten
2002-12-01 22:58:29 +00:00
d48f993c55 Removed non-existing Tools from the Blender module.
This allowed me to get Python working in Blender.
Maarten
2002-12-01 21:24:45 +00:00
86ac000694 Reverting to version 1.3 - michel 2002-11-30 15:34:57 +00:00
0f4b24cc3c added -f option to the rm command. (Clean target) - michel 2002-11-30 15:00:47 +00:00
61ab941edb Autotools-specific freeze_ac.py and makemakefile_ac.py. Original makemakefile.py reverted for sake of original build system. Makefile.am modified accordingly. 2002-11-30 05:43:14 +00:00
651fa32eaa Bunch of small fixes emailed to me from phaethon
Kent
--
mein@cs.umn.edu
2002-11-29 17:07:58 +00:00
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
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
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
0fbadc8eb7 Yes I did it again ;)
added the following 3 lines to everything in the intern dir:
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

Kent
--
mein@cs.umn.edu
2002-11-25 09:53:07 +00:00
8328f6d5a7 removed our licensing info as requested :)
Kent
--
mein@cs.umn.edu
2002-11-20 14:43:09 +00:00
8efde305eb --- IK_JacobianSolver.cpp 2002/10/13 16:07:40 1.2
+++ IK_JacobianSolver.cpp       2002/11/19 18:47:33
@@ -134,7 +134,7 @@
        m_svd_w = 0;
        m_svd_v = 0;

-       TNT::SVD(m_svd_u,m_svd_w,m_svd_v);
+       TNT::SVD_a(m_svd_u,m_svd_w,m_svd_v);

        // invert the SVD and compute inverse


Fix for why it wasn't building with configure

Kent
--
mein@cs.umn.edu
2002-11-19 18:48:07 +00:00
fdb2036beb Some more clean up in the intern MSVC project files.
Renamed the bmfont project files and updated them.
Maarten
2002-11-14 22:43:55 +00:00
c57ca3c86a Changed module name utils to util so that freeze will find the quaternions
etc. there.
Maarten
2002-11-14 16:50:24 +00:00
a46e70f0e6 Fixed problem with the main intern MSVC project.
Maarten
2002-11-14 08:23:57 +00:00
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
e0d9272376 Made a dependency so that the MSVC intern project file will actually call the
batch file that freezes the Blender Python code.
I had to add a dummy.cpp file to the freeze directory to make MSVC
understand it should call the batch file in a post build step. If someone else
has a better idea, feel free to change it!
Maarten
2002-11-11 22:48:06 +00:00
f8843ee7e9 - python $(PYFLAGS) freeze.py -d -x os -x pprint -x Blender -I $(SRCDIR) -o $(TARGETDIR) $(SRCDIR)/VRMLmain.py
+       python $(PYFLAGS) freeze.py -d -x os -x pprint -I $(SRCDIR) -o $(TARGETDIR) $(SRCDIR)/VRMLmain.py


Freeze the Blender module
(I got this from some other people on #blendersauce and truthfully I have
no idea if this is correct or not so if someone else could look at it
that would be great)

Kent
--
mein@cs.umn.edu
2002-11-11 21:26:19 +00:00
57ef60d081 Added another project to freeze Blender Python code from the main intern
MSVC workspace. It is not finished completely but it works (through a
batchfile).
Maarten
2002-11-10 23:54:39 +00:00
f21dd64460 Added almost all projects in intern to the main MSVC project for intern (in
intern/make/msvc_6_0. Changed paths in all these files to build to
lib/windows and use obj/window/intern for object files and other temporary
stuff.
Added project files for guardedalloc and blenkey (in keymaker directory).
blenkey still assumes openssl being installed in lib/windows.
The only thing not automated is is the frozen Python stuff.

Maarten
2002-11-08 23:34:53 +00:00
54c3daf2e3 Updated MSVC GHOST project like the string project and added it to the
intern MSVC workspace
Maarten
2002-11-08 16:18:56 +00:00
c7be06468e New MSVC workspace were I will add all the intern MSVC projects so that
they can all be build and installed in one go.
Maarten
2002-11-08 16:07:13 +00:00
2c35a94396 Fixed the MSVC project file so that it creates the lib/windows directories to
install the libraries into. Also, the objects are now build in the right directories.
Maarten
2002-11-08 16:00:26 +00:00
7325eff128 Added extra ranlib on libary files after being copied to the lib tree for OSX only.
This saves other OSX developers the trouble of manually running ranlib.
This is not a good solution (because I don't know the correct one) but it works.
Maarten
2002-11-07 22:41:42 +00:00
e46a6d2611 I autmated the rest of building libfrozen.a
I also moved it so that it gets put in:
 $(OCGDIR)/blender/bpython/$(DEBUG_DIR)libfrozen.a

and removed the stuff from the readme on how to do it by hand.

(I made one other small change and that was to comment
out the ssr target on solaris and freebsd in source/Makefile
I forgot to commit it yesterday)

Kent
--
mein@cs.umn.edu
2002-11-07 17:47:15 +00:00
2c183d2da7 Updated it so intern/python/freeze is combined into intern's Makefile
also updated the readme so its not an extra step anymore.

Kent
--
mein@cs.umn.edu
2002-11-06 21:19:23 +00:00