Commit Graph

36 Commits

Author SHA1 Message Date
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
Benoit Bolsee
61a83d2fba Add MSVC90 project files - part 3. Extern and Intern projects are merged in projectfiles_vc9\blender\blender.sln solution, you just need to open that solution to compile everything with VS2008. 2008-11-10 21:22:22 +00:00
Andrea Weikert
fced2b2471 == MSVC 7.1 project files ==
- removed unused project keymaker
2007-07-04 19:29:59 +00:00
Joseph Gilbert
3851ea07d4 *msvc project update
- commiting fixes for vc8
- updating projects for added files
2006-06-23 15:25:57 +00:00
Joseph Gilbert
f54a113cde Update to the VC7 projectfiles.
This should bring the projectfiles upto date for msvc7.

Moving these to version 7.1 so that the version 8 people don't have such a hard time importing into 2005.

Build intern.sln, extern.sln and then blender.sln. Enjoy. :p
2006-04-17 20:05:39 +00:00
Jens Ole Wund
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
Jens Ole Wund
0093857b4f fixing msvc6 projects to compile again 2005-11-09 19:29:04 +00:00
Joseph Gilbert
beece21d1f project file update
*Added the boolop project
2005-11-03 20:07:55 +00:00
Jens Ole Wund
ad915277a0 msvc6 project file suite complete again 2005-10-10 17:27:17 +00:00
Jens Ole Wund
42bd456060 added elbeem though it won't compile without modifications
thus i did not add to dependencies but still a nice reminder to build it at times
2005-10-04 20:39:31 +00:00
Joseph Gilbert
b6ecdb8c35 Project file update for elbeem
Warning clean up of python project
2005-09-26 14:46:14 +00:00
Joseph Gilbert
292c03ab8e _.NET projectfiles update_
* converted files to .NET 2002
* removed unneeded projectfiles from bullet
* PHY_Bullet outputs to correct directories
* Bullet linked to activex and blenderplayer
* misc updates
2005-08-02 13:44:49 +00:00
Erwin Coumans
49499c49be updated vc7 projectfiles so they work with bullet 2005-07-31 14:40:51 +00:00
Joseph Gilbert
fc663edf72 *** empty log message *** 2005-04-02 18:42:30 +00:00
Daniel Dunbar
24c9f65056 - got tired of str[n]casecmp not declared warnings
- added BLI_str[n]casecmp, use instead of regular versions
 - rewrote BLI_str[n]casecmp to not be stupid
2005-04-02 15:36:57 +00:00
Joseph Gilbert
61767b4f48 MSVC7 update and freetype2 source
- Added correct .libs to be linked to GP_Ghost
- Fixed incorrect library extensions for the linker (*.lib and not unix *.a)
- Projects have been set to be multi-threaded - projects were being linked to different versions of the CRT
- All projects are now linking to python 2.3 (this fixes an error regarding struct sizes in python)
- Removed invalid source paths from inclusion for the compiler
- Fix dependency issues with the GP_Ghost module
- Proper .dll's are now being copied to their respective locations for debug and release version of blender/blenderplayer
- Warnings have been set to level 2
- Import paths have been updated and organized for the compiler
- Duplicate import paths for the compiler have been removed
- Removed silly silly silly silly unix path-separators from window paths
- Post-Build scripts have been updated where neccessary (XCOPY is retatined)
- Fixed the output of various .lib files (PHY_Sumo and Yafray)
- PHY_Sumo now uses a .pch
- Removed #undef _DEBUG from debug builds :p
- FTF_Font is now contains a debug build and is being set to it's correct output path
- Blender/Blenderplayer/3DPlugin all linkto Debug libs where appropriate (instead of static release libs to avoid conflicts with the CRT)
- Python23_d.dll is now loaded into a true debug output of both blenderplayer and blender debug builds
- msvcrtd.dll is now loaded into a true debug output of both blenderplayer and blender debug builds
- Post-builds now clean up their mess
- ActiveX controller now builds
- BlenderPlayer now builds
- Internal libs now using .pch
- Moved the build directory from /blender/obj to ../build/msvc_7/  to follow precedence with scons builds
- Builds are now organized to follow precedence with scons builds with a /libs and a /intern /extern /source obj folders
- Set the proper build path for opennl
- Forcing BLO_loader source files to follow project defaults
- Added an 'extern' project that mimics the /make build of the 'intern' project
- Extern build includes solid and it's associated builds, ftgl, and freetype
- Added .vcproj files to /extern directory
- Added new extern.sln file to /extern directory
- All project now link to the built solid.lib from the extern project instead of lib/windows
- Removed uneeded XCOPYs commands from post-builds
- Added conditional Directory building to post-builds
- Freetype2 source commit (this is need for the building of a correct MFC linked version of the activeX controller as well as a correct release and debug build of the blender project)
- Ftgl is built and linked by the 'extern' project
- Intern/Extern project are now exporting their proper header files
- PHY_Physics is now linking to the correct set of header files (in build path not source)
- Makesdna builds object files into build directory now
- Projects are now ignoring the CORRECT versions of the CRT's  :)
- Renderconverter is now outputting it's obj file to it's own directory instead of /render
- Gen_system is now being built to ../kernel
- BL_src_cre is now being built to /creator
- *.exp and *.ilk are now being cleaned up from linkers
- Libpng.dll and zlib.dll are now being copied to the /bin
- MTDLL build are now available for the correct projects
- ActiveX 3D Plugin now links correctly to solid and freetype2
- Corrected the Preprocessor #define that was labeled incorrectly in FTF_Font and Blender that was causing the FTGL libs to export dll calling conventions.
- Changed the solution configurations to 3D Plugin Release, Debug and Blender Release, Debug for internal and external librarys
- Changed the solution configurations to 3D Plugin Release, Debug and Blender Release, Debug for blender and added 2 new solutions configurations BlenderPlayer Release, Debug
-
2005-02-20 21:33:11 +00:00
Joseph Gilbert
5af05c9610 Update to the MSVC7 project files (vcproj) for Blender's internal libraries
- set build_install_all as the default project (if you give me a quarter ill tell you how :)
- set SoundSystem to it's proper dependencies
- updated those silly silly unix path separators
- set project warning levels to something not so noisy
2005-02-12 02:06:52 +00:00
Jens Ole Wund
beba40c16f workspace with opennl included 2004-07-14 20:52:41 +00:00
Nathan Letwory
d906c3c34b * add opennl and superlu to intern project 2004-07-13 18:25:44 +00:00
Nathan Letwory
c4a95ebcb3 Correct a project dependency.
SoundSystem depends on STR_*, but that was not checked, so you had to build twice to get all internal libraries built.
2004-04-16 21:34:23 +00:00
Joseph Gilbert
b7f718fb2c - Sets this as the active project for internal make 2004-04-11 12:59:32 +00:00
Simon Clitherow
6101f0d03d Learning to follow my own advice (I had set the dependancies to csg
already!)
2004-02-11 18:55:31 +00:00
Simon Clitherow
c205e7d1c7 - Added csg.dsp to the main intern workspace (intern.dsw)
- Fixed up the paths for "/lib/..." in csg.dsp

Quick note: Currently intern still builds the old lib (bsplib).

To compile the new lib (when everything is ready for it), uncheck
bsplib from the dependancies in build_install_all and replace with csg.
Will eventually drop bsplib completely - but not just yet :)
2004-02-11 18:36:48 +00:00
Daniel Dunbar
7303944ea9 - update VC7 projectfiles 2004-01-02 23:35:21 +00:00
Simon Clitherow
cb667fd282 - removed keymaker project from intern build (MSVC 6) - no longer needed. 2003-10-07 20:59:42 +00:00
Simon Clitherow
20ee6b2b66 - updated intern project files to include soundsystem (MSVC 6) 2003-07-20 19:51:03 +00:00
Simon Clitherow
94f8098660 - removed freeze project from intern build (MSVC 6) 2003-07-11 19:34:20 +00:00
Daniel Dunbar
7cc9ff34d1 Change the VC7 project to directly call python with the right arguments
to freeze.py (including my new -D hack).
2003-03-26 04:59:28 +00:00
Daniel Dunbar
465229e4d6 Rest of the VC7 intern projectfiles. 2003-03-18 19:38:36 +00:00
Maarten Gribnau
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
Maarten Gribnau
a46e70f0e6 Fixed problem with the main intern MSVC project.
Maarten
2002-11-14 08:23:57 +00:00
Maarten Gribnau
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
Maarten Gribnau
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
Maarten Gribnau
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
Maarten Gribnau
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
Maarten Gribnau
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