Commit Graph

175 Commits

Author SHA1 Message Date
f026266e18 merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.
[[Split portion of a mixed commit.]]
2009-05-23 03:24:15 +00:00
df46549325 == Sequencer ==
Added include compiler switches for windows to make pthread.h accessible
and reverted Joshua's patch.
(Joshua: the prefetch buffering has _nothing_ to do with FFMPEG!)

If this still does not fix the problem, please send an email to me!

I also fixed 
source\blender\src\sequence.c(1405) : error C2275: 'PrefetchThread'

GCC is way to gracefully in latest versions... :)
2007-10-02 12:36:53 +00:00
31fd60f94c mscv6 turning off GE 2006-11-21 08:54:36 +00:00
885d40c30d =ID Properties MSVC Project Files Update=
This commit updates the MSVC project files (both sets of them) to build
with ID Properties.  Please test!
2006-11-17 06:28:55 +00:00
c6f9720eb6 msvc6 adding DNA_customdata_types.h to project 2006-11-12 16:13:07 +00:00
eeaf053853 msvc6 still compiles nicely 2006-11-07 10:00:33 +00:00
65677de02c msvc6 adding transform_snap to project 2006-10-30 08:39:38 +00:00
653a35b267 msvc6 still builds :) 2006-08-30 07:43:54 +00:00
40ef1c9f96 keeping up MSVC6 project build 2006-08-17 07:45:41 +00:00
5498f4989f part 3
MSVC6
dude set proper deps ! :)
2006-06-16 22:43:39 +00:00
6da2bb1823 part 2
MSVC6
Defensive way not to interfere with other (crystal) build systems
so .. i can maintain building bullet for blender on MSVC6 without spitting in
the "whateverbulletteamthinkstobenice" soup
2006-06-16 22:20:36 +00:00
1d5136f57e bullet + GE happy on msvc6 again :)
phew .. setting 'include pathes'  in VS6 is real pain
2006-06-15 21:22:22 +00:00
06ee80635c happy msvc6 compiling/debugging again
remember no GE for msvc6
2006-06-14 21:57:41 +00:00
1e23c080de Happy msvc6 again .. however some new std::std::strings in El'Beem
i'll give it to nils later on
2006-05-12 22:00:27 +00:00
0a3e6a771f msvc6 .. adding mofifiers for happy PY complie
still no GE and still std::std::string in El'Beem
2006-04-28 07:31:27 +00:00
70c7865e85 msvc6 project linking with shell32.lib to see SHGetFolderPath()
removing dead files in el'beem however the "std::std::string" problem is still there
still no GE
2006-04-18 08:56:55 +00:00
3c666e751f msvc6 projects to build at all / still no GE 2006-04-13 13:55:33 +00:00
ca6aca0c07 restoring minimum debug build on msvc6 projects
-no GE
-no OpenExr / hum.. may be that's why storing a PNG does not crash
2006-03-14 08:49:41 +00:00
4e6d43a2cb msvc6 projects building debug 2006-02-28 09:07:13 +00:00
a040e208ee mscv6 projects again
no GE right now ( need to adapt to erwins file reshuffle
so may be i wait a bit until he has his mind made up )
elbeem is running when you remove the extra std:: at some places
well the msvc6 preprocessor is not very smart
--> std:: is not a member of std:: :)
so i guess there is a "using namespace std" somewhere
2006-02-28 08:31:33 +00:00
daefa2afc6 ...umm msvc6 projects again 2006-02-09 19:31:50 +00:00
1d787c9e93 msvc6 projects that will compile when MEM_Allocator.h is fixed 2006-02-09 14:17:26 +00:00
eee7393e1c 1. making RenderData, xrect, yrect parameters in AviCodec calls
2. fixing MSVC6 projects to build
2006-01-29 17:46:19 +00:00
1ae7fb0c99 doing MSCV6 project woodoo ( preparing orange --> bf migration )
NOTE to Ton and Hos
PLEASE do not try to merge any ot the MSVC6 project files (*.dsw ,*dsp)
I have a plan to get it done with a minimum of pain
thanks
ole
2006-01-26 22:05:39 +00:00
b7808ebf3e MSVC6 projects
adding libtiff files to compile
2005-11-23 21:11:36 +00:00
2e71e17873 MSVC6 project file service :)
adding new files to project IMB_radiance_hdr.h radiance_hdr.c
2005-11-21 23:26:44 +00:00
40237b6e57 some more msvc6 magic 2005-11-16 23:39:49 +00:00
d776d387d9 adding some msvc6 magic to bullet part 2 2005-11-16 23:38:18 +00:00
e25b7c519e special service for msvc6 projects
post build step for booleans --> copy boolop.lib to lib folder _foo_/lib/windows..

enabeling bullet for GE
wants to link with _foo_/lib/windows/bullet/lib/bullet3.lib
you have to build it with continuous.dsw in exten/bullet and copy it manually there
since bullet is exten i think no automagic in place here
2005-11-11 20:15:16 +00:00
0093857b4f fixing msvc6 projects to compile again 2005-11-09 19:29:04 +00:00
bbb2ab39a0 added editipo_lib.c editipo_mods.c to project 2005-10-10 18:21:31 +00:00
ad915277a0 msvc6 project file suite complete again 2005-10-10 17:27:17 +00:00
38ee277db1 adding mesh.c .h files to project 2005-10-04 20:07:21 +00:00
8e3796f8d6 hum .. blender.dsp would link to
blender_elbeem.lib  in
,..\..\..\lib\windows\elbeem\lib
if it was there
2005-09-30 21:00:34 +00:00
5f767d1627 the usual missing files / include path setting game
So the linker only misses performElbeemSimulation(..)
I can't create El'Beem.lib with msvc6 as discussed in ML
If you comment off the 2 calls in fluidsim.c
blender compiles with msvc6 projects again
with the complete fluid UI but simulation won't run
2005-09-23 10:41:11 +00:00
42ee04702c having a "mini gimp" in image editor
{ hope it does not break builds .. mscv6 .. scons works fine here }
2005-09-09 22:31:23 +00:00
9d2f0fe302 make MSVC6 projects happy :
add key.h + .c to project
2005-09-09 21:15:00 +00:00
1ac5239764 help MSVC6 projects for edgehash files 2005-08-23 21:49:30 +00:00
d1285d0229 adding time line stuff 2005-08-06 22:00:21 +00:00
d02d09da84 Python 2.4 for MSVC 6.0 projectfiles. 2005-08-02 23:20:33 +00:00
a2c4044b27 zlib.lib update. some includes too. 2005-07-28 08:33:17 +00:00
a9d7042da9 help mscv6 to find
LOD_decimation.h for BKE_blenderkernel

BPY_python
waves good bye yo wave.c + .h
2005-07-26 07:00:32 +00:00
8d3987466d build.c + .h going
point.c + .h coming
/me wonders if there ara any MSVC6er
2005-07-25 14:12:28 +00:00
360b494fc8 Project Files (MSVC 6.0) update:
- drawarmature.c
	- modifier.c, BKE_modifier.h
	- DNA_modifier_types.h
2005-07-19 23:52:21 +00:00
1ec178ecc7 MSVC 6.0 projectfiles update for the removal of IKA files. 2005-07-04 23:32:59 +00:00
6e6d92039c Adding lorem.c file to BL_src.dsp MSVC 6.0 projectfile.
Note to intrr: pressing the lorem bug crashes here too, will trace later.
2005-06-18 00:37:41 +00:00
764e1a3033 MSVC 6.0 projectfiles small cleaning.
DNA_makesdna.dsp was missing DNA_meshdata_types.h

BL_src.dsp was missing most of the BIF and BDR and BSE includes
2005-06-10 00:23:42 +00:00
abae9376c8 added font.c and font.h to MSCV6 project 2005-05-23 21:40:19 +00:00
dcae3d2058 MSVC 6.0 Projectfile changes for the timeline in BL_src.dsp (adding new files mostly).
BPY_python.dsp need some changes too (adding Font.c and Font.h) but I've got other changes in there that I can't commit, so someone else will have to update.
2005-05-09 09:53:55 +00:00
6d99044373 added DNA_object_force.h to DNA_makesdna project
to make it look nicer in MSVC6
2005-05-02 18:16:19 +00:00