diff options
author | Jens Ole Wund <bjornmose@gmx.net> | 2006-02-28 11:31:33 +0300 |
---|---|---|
committer | Jens Ole Wund <bjornmose@gmx.net> | 2006-02-28 11:31:33 +0300 |
commit | a040e208eeb4d57c039f354311953f8014f38cf7 (patch) | |
tree | 1cd0fa01560ec7cdc3314fb0365bca75a7e904eb | |
parent | 3662ce0045d7347cf6b05069772de630efc68c49 (diff) |
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
-rw-r--r-- | extern/bullet/BulletDynamics/BulletDynamics.dsp | 44 | ||||
-rw-r--r-- | intern/elbeem/make/msvc_6_0/elbeem.dsp | 18 | ||||
-rw-r--r-- | projectfiles/blender/blender.dsp | 2 |
3 files changed, 8 insertions, 56 deletions
diff --git a/extern/bullet/BulletDynamics/BulletDynamics.dsp b/extern/bullet/BulletDynamics/BulletDynamics.dsp index 1b9f9cc1985..98ce85816ef 100644 --- a/extern/bullet/BulletDynamics/BulletDynamics.dsp +++ b/extern/bullet/BulletDynamics/BulletDynamics.dsp @@ -67,8 +67,8 @@ LIB32=link.exe -lib # PROP Target_Dir "" LINK32=link.exe -lib MTL=midl.exe -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../LinearMath" /I "../Bullet" /I "../BulletDynamics" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../LinearMath" /I "../Bullet" /I "../BulletDynamics" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" BSC32=bscmake.exe @@ -153,52 +153,12 @@ SOURCE=.\ConstraintSolver\SorLcp.h # PROP Default_Filter "" # Begin Source File -SOURCE=.\CollisionDispatch\ConvexConcaveCollisionAlgorithm.cpp -# End Source File -# Begin Source File - -SOURCE=.\CollisionDispatch\ConvexConcaveCollisionAlgorithm.h -# End Source File -# Begin Source File - -SOURCE=.\CollisionDispatch\ConvexConvexAlgorithm.cpp -# End Source File -# Begin Source File - -SOURCE=.\CollisionDispatch\ConvexConvexAlgorithm.h -# End Source File -# Begin Source File - SOURCE=.\CollisionDispatch\EmptyCollisionAlgorithm.cpp # End Source File # Begin Source File SOURCE=.\CollisionDispatch\EmptyCollisionAlgorithm.h # End Source File -# Begin Source File - -SOURCE=.\CollisionDispatch\ManifoldResult.cpp -# End Source File -# Begin Source File - -SOURCE=.\CollisionDispatch\ManifoldResult.h -# End Source File -# Begin Source File - -SOURCE=.\CollisionDispatch\ToiContactDispatcher.cpp -# End Source File -# Begin Source File - -SOURCE=.\CollisionDispatch\ToiContactDispatcher.h -# End Source File -# Begin Source File - -SOURCE=.\CollisionDispatch\UnionFind.cpp -# End Source File -# Begin Source File - -SOURCE=.\CollisionDispatch\UnionFind.h -# End Source File # End Group # Begin Group "Dynamics" diff --git a/intern/elbeem/make/msvc_6_0/elbeem.dsp b/intern/elbeem/make/msvc_6_0/elbeem.dsp index ec6e094efef..6f55813ffd9 100644 --- a/intern/elbeem/make/msvc_6_0/elbeem.dsp +++ b/intern/elbeem/make/msvc_6_0/elbeem.dsp @@ -99,14 +99,6 @@ SOURCE=..\..\intern\attributes.cpp # End Source File # Begin Source File -SOURCE=..\..\intern\blendercall.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\intern\blenderdummy.cpp -# End Source File -# Begin Source File - SOURCE=..\..\intern\cfglexer.cpp # End Source File # Begin Source File @@ -139,7 +131,7 @@ SOURCE=..\..\intern\ntl_geometryobject.cpp # End Source File # Begin Source File -SOURCE=..\..\intern\ntl_lightobject.cpp +SOURCE=..\..\intern\ntl_lighting.cpp # End Source File # Begin Source File @@ -147,10 +139,6 @@ SOURCE=..\..\intern\ntl_ray.cpp # End Source File # Begin Source File -SOURCE=..\..\intern\ntl_scene.cpp -# End Source File -# Begin Source File - SOURCE=..\..\intern\ntl_world.cpp # End Source File # Begin Source File @@ -235,6 +223,10 @@ SOURCE=..\..\intern\ntl_geometryshader.h # End Source File # Begin Source File +SOURCE=..\..\intern\ntl_lighting.h +# End Source File +# Begin Source File + SOURCE=..\..\intern\ntl_lightobject.h # End Source File # Begin Source File diff --git a/projectfiles/blender/blender.dsp b/projectfiles/blender/blender.dsp index 6079c417f53..bfbe58ce41d 100644 --- a/projectfiles/blender/blender.dsp +++ b/projectfiles/blender/blender.dsp @@ -50,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 solid.lib SDL.lib freetype2ST.lib ftgl_static_ST.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.a libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.a libbsp.a libbmfont.a libghost.a libstring.a ws2_32.lib dxguid.lib opengl32.lib libjpeg.a glu32.lib user32.lib gdi32.lib vfw32.lib advapi32.lib winmm.lib ole32.lib libdecimation.a libiksolver.a libpng.a zlib.lib libmoto.a blender_ONL.lib blender_elbeem.lib boolop.lib BLI_bullet.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"msvcprt.lib" /nodefaultlib:"msvcrt.lib" /nodefaultlib:"glut32.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcpd.lib" /nodefaultlib:"libcp.lib" /nodefaultlib:"libcmtd.lib" /out:"..\..\bin\blender.exe" /libpath:"..\..\..\lib\windows\sdl\lib" /libpath:"..\..\..\lib\windows\freetype\lib" /libpath:"..\..\..\lib\windows\ftgl\lib" /libpath:"..\..\..\lib\windows\gettext\lib" /libpath:"..\..\..\lib\windows\ode\lib" /libpath:"..\..\..\lib\windows\bsp\lib" /libpath:"..\..\..\lib\windows\moto\lib" /libpath:"..\..\..\lib\windows\bmfont\lib" /libpath:"..\..\..\lib\windows\ghost\lib" /libpath:"..\..\..\lib\windows\python\frozen" /libpath:"..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\lib\windows\string\lib" /libpath:"..\..\..\lib\windows\solid\lib" /libpath:"..\..\..\lib\windows\python\lib" /libpath:"..\..\..\lib\windows\iksolver\lib" /libpath:"..\..\..\lib\windows\decimation\lib" /libpath:"..\..\..\lib\windows\openal\lib" /libpath:"..\..\..\lib\windows\jpeg\lib" /libpath:"..\..\..\lib\windows\blenkey\lib" /libpath:"..\..\..\lib\windows\openssl\lib" /libpath:"..\..\obj\windows\intern\soundsystem\dummy" /libpath:"..\..\obj\windows\intern\soundsystem\openal" /libpath:"..\..\..\lib\windows\soundsystem\lib\\" /libpath:"..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\lib\windows\png\lib\\" /libpath:"..\..\..\lib\windows\opennl" /libpath:"..\..\..\lib\windows\elbeem\lib" /libpath:"..\..\..\lib\windows\boolop\lib" /libpath:"..\..\..\lib\windows\bullet\lib" +# ADD LINK32 solid.lib SDL.lib freetype2ST.lib ftgl_static_ST.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.a libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.a libbsp.a libbmfont.a libghost.a libstring.a ws2_32.lib dxguid.lib opengl32.lib libjpeg.a glu32.lib user32.lib gdi32.lib vfw32.lib advapi32.lib winmm.lib ole32.lib libdecimation.a libiksolver.a libpng.a zlib.lib libmoto.a blender_ONL.lib blender_elbeem.lib boolop.lib BLI_bullet.lib pthreadVC2.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"msvcprt.lib" /nodefaultlib:"msvcrt.lib" /nodefaultlib:"glut32.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcpd.lib" /nodefaultlib:"libcp.lib" /nodefaultlib:"libcmtd.lib" /out:"..\..\bin\blender.exe" /libpath:"..\..\..\lib\windows\sdl\lib" /libpath:"..\..\..\lib\windows\freetype\lib" /libpath:"..\..\..\lib\windows\ftgl\lib" /libpath:"..\..\..\lib\windows\gettext\lib" /libpath:"..\..\..\lib\windows\ode\lib" /libpath:"..\..\..\lib\windows\bsp\lib" /libpath:"..\..\..\lib\windows\moto\lib" /libpath:"..\..\..\lib\windows\bmfont\lib" /libpath:"..\..\..\lib\windows\ghost\lib" /libpath:"..\..\..\lib\windows\python\frozen" /libpath:"..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\lib\windows\string\lib" /libpath:"..\..\..\lib\windows\solid\lib" /libpath:"..\..\..\lib\windows\python\lib" /libpath:"..\..\..\lib\windows\iksolver\lib" /libpath:"..\..\..\lib\windows\decimation\lib" /libpath:"..\..\..\lib\windows\openal\lib" /libpath:"..\..\..\lib\windows\jpeg\lib" /libpath:"..\..\..\lib\windows\blenkey\lib" /libpath:"..\..\..\lib\windows\openssl\lib" /libpath:"..\..\obj\windows\intern\soundsystem\dummy" /libpath:"..\..\obj\windows\intern\soundsystem\openal" /libpath:"..\..\..\lib\windows\soundsystem\lib\\" /libpath:"..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\lib\windows\png\lib\\" /libpath:"..\..\..\lib\windows\opennl" /libpath:"..\..\..\lib\windows\elbeem\lib" /libpath:"..\..\..\lib\windows\boolop\lib" /libpath:"..\..\..\lib\windows\bullet\lib" /libpath:"..\..\..\lib\windows\pthreads\lib" # SUBTRACT LINK32 /pdb:none # Begin Special Build Tool SOURCE="$(InputPath)" |