*msvc project update
authorJoseph Gilbert <ascotan@gmail.com>
Fri, 23 Jun 2006 15:25:57 +0000 (15:25 +0000)
committerJoseph Gilbert <ascotan@gmail.com>
Fri, 23 Jun 2006 15:25:57 +0000 (15:25 +0000)
- commiting fixes for vc8
- updating projects for added files

extern/bullet/make/msvc_7_0/Dynamics/BulletDynamics_vc7.vcproj
intern/make/msvc_7_0/intern.sln
projectfiles_vc7/blender/blender.vcproj
projectfiles_vc7/blender/blenpluginapi/blenpluginapi/blenpluginapi.vcproj
source/blender/imbuf/intern/cineon/cin_debug_stuff.h

index 91f6d504e70f504aa25aec186dd3350721939148..fddaff5b675c81c800137a5a19732cb363c6bc30 100644 (file)
@@ -54,7 +54,6 @@ XCOPY /Y ..\..\..\BulletDynamics\ConstraintSolver\*.h ..\..\..\..\..\..\build\ms
 XCOPY /Y ..\..\..\BulletDynamics\Dynamics\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics
 XCOPY /Y ..\..\..\BulletDynamics\Vehicle\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle
 
-
 ECHO Done
 "/>
                        <Tool
@@ -111,6 +110,8 @@ XCOPY /Y ..\..\..\LinearMath\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\in
 XCOPY /Y ..\..\..\BulletDynamics\CollisionDispatch\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 XCOPY /Y ..\..\..\BulletDynamics\ConstraintSolver\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver
 XCOPY /Y ..\..\..\BulletDynamics\Vehicle\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle
+XCOPY /Y ..\..\..\BulletDynamics\Dynamics\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics
+
 ECHO Done
 "/>
                        <Tool
index 1ec072d6f0e56c8b7fa0111172c2cce6172909f3..146a0297dc11977c8068528d28d664a5c5358e3e 100644 (file)
@@ -14,6 +14,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build_install_all", "build_
                {51A348C1-8684-4D67-B980-97B1FC74159B} = {51A348C1-8684-4D67-B980-97B1FC74159B}
                {8B8D4FC3-3234-4E54-8376-5AB83D00D164} = {8B8D4FC3-3234-4E54-8376-5AB83D00D164}
                {4B6AFCC5-968C-424A-8F20-76E41B3BEF74} = {4B6AFCC5-968C-424A-8F20-76E41B3BEF74}
+               {EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9} = {EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9}
                {E86B7BDE-C33C-4E55-9433-E74C141D7538} = {E86B7BDE-C33C-4E55-9433-E74C141D7538}
                {B789C2F3-279E-4A85-8F0A-7F7AC068E598} = {B789C2F3-279E-4A85-8F0A-7F7AC068E598}
                {6B3229F4-2A37-47EE-8B89-9AA046B35193} = {6B3229F4-2A37-47EE-8B89-9AA046B35193}
index 3ebcfdae4741ff7e8d877df14f3c45b308ed752c..687ab2607bb53f5c35fd1453aa45306c260aef99 100644 (file)
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions="/MACHINE:I386"
-                               AdditionalDependencies="SDL.lib freetype2ST.lib ftgl_static.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.lib libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.lib libbsp.lib libbmfont.lib libghost.lib libstring.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libdecimation.lib libiksolver.lib libpng_st.lib zlib.lib libmoto.lib solid.lib qhull.lib libopennl.lib BulletDynamics.lib Bullet.lib python24.lib libelbeem.lib libboolop.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib broad.lib complex.lib convex.lib"
+                               AdditionalDependencies="SDL.lib freetype2ST.lib ftgl_static.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.lib libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.lib libbsp.lib libbmfont.lib libghost.lib libstring.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libdecimation.lib libiksolver.lib libpng_st.lib zlib.lib libmoto.lib solid.lib qhull.lib libopennl.lib BulletDynamics.lib Bullet.lib python24.lib libelbeem.lib libboolop.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib broad.lib complex.lib convex.lib memutil.lib"
                                ShowProgress="0"
                                OutputFile="..\..\bin\blender.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
                                AdditionalLibraryDirectories="..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\zlib\lib;..\..\..\lib\windows\png\lib;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\python\lib;..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\tiff\lib;..\..\..\lib\windows\pthreads\lib;..\..\..\lib\windows\openal\lib;..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\build\msvc_7\libs\intern;..\..\..\build\msvc_7\libs\extern"
                                IgnoreAllDefaultLibraries="FALSE"
-                               IgnoreDefaultLibraryNames="libc.lib, msvcrt.lib, libcd.lib, libcmtd.lib, msvcrtd.lib"
+                               IgnoreDefaultLibraryNames="libc.lib, msvcrt.lib, libcd.lib, libcmtd.lib, msvcrtd.lib, odbc32.lib, odbccp32.lib"
                                ProgramDatabaseFile="..\..\..\build\msvc_7\libs\blender.pdb"
                                SubSystem="1"/>
                        <Tool
@@ -67,7 +67,8 @@ XCOPY /Y ..\..\..\lib\windows\tiff\lib\*.dll ..\..\bin
 XCOPY /Y ..\..\..\lib\windows\pthreads\lib\pthreadVSE2.dll ..\..\bin
 ECHO Copying language folder
 ECHO Copying python scripts
-IF NOT EXIST ..\..\bin\.blender\scripts MKDIR ..\..\bin\.blender\scripts XCOPY /Y ..\..\release\scripts ..\..\bin\.blender\scripts /E
+IF NOT EXIST ..\..\bin\.blender\scripts MKDIR ..\..\bin\.blender\scripts 
+XCOPY /Y ..\..\release\scripts ..\..\bin\.blender\scripts /E
 ECHO Copying manuals/text
 XCOPY/Y ..\..\release\text ..\..\bin /E
 ECHO Done
@@ -122,13 +123,13 @@ ECHO Done
                                Name="VCLinkerTool"
                                AdditionalOptions="/MACHINE:I386
 "
-                               AdditionalDependencies="SDL.lib freetype2ST.lib ftgl_static.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.lib libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.lib libbsp.lib libbmfont.lib libghost.lib libstring.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libdecimation.lib libiksolver.lib libpng_st.lib zlib.lib libmoto.lib solid.lib qhull.lib libopennl.lib BulletDynamics.lib Bullet.lib python24_d.lib libelbeem.lib libboolop.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib broad.lib complex.lib convex.lib"
+                               AdditionalDependencies="SDL.lib freetype2ST.lib ftgl_static.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.lib libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.lib libbsp.lib libbmfont.lib libghost.lib libstring.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libdecimation.lib libiksolver.lib libpng_st.lib zlib.lib libmoto.lib solid.lib qhull.lib libopennl.lib BulletDynamics.lib Bullet.lib python24_d.lib libelbeem.lib libboolop.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib broad.lib complex.lib convex.lib memutil.lib"
                                ShowProgress="0"
                                OutputFile="..\..\bin\debug\blender.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="TRUE"
                                AdditionalLibraryDirectories="..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\zlib\lib;..\..\..\lib\windows\png\lib;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\pthreads\lib;..\..\..\lib\windows\tiff\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\python\lib;..\..\..\lib\windows\openal\lib;..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\build\msvc_7\libs\intern\debug;..\..\..\build\msvc_7\libs\extern\debug"
-                               IgnoreDefaultLibraryNames="libc.lib, libcmt.lib, msvcrt.lib, libcd.lib"
+                               IgnoreDefaultLibraryNames="libc.lib, libcmt.lib, msvcrt.lib, libcd.lib, odbc32.lib, odbccp32.lib"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile="..\..\..\build\msvc_7\libs\debug\blender.pdb"
                                SubSystem="1"/>
@@ -152,7 +153,8 @@ ECHO Copying language folder
 IF NOT EXIST ..\..\bin\debug\.blender MKDIR ..\..\bin\debug\.blender
 XCOPY /Y ..\..\bin\.blender ..\..\bin\debug\.blender /E
 ECHO Copying python scripts
-IF NOT EXIST ..\..\bin\debug\.blender\scripts MKDIR ..\..\bin\debug\.blender\scripts XCOPY /Y ..\..\release\scripts ..\..\bin\debug\.blender\scripts /E
+IF NOT EXIST ..\..\bin\debug\.blender\scripts MKDIR ..\..\bin\debug\.blender\scripts 
+XCOPY /Y ..\..\release\scripts ..\..\bin\debug\.blender\scripts /E
 ECHO Copying manuals/text
 XCOPY/Y ..\..\release\text ..\..\bin\debug /E
 ECHO Done
index dce7f9d7cc4a1e26d6014f623a4dc72b55ceafbb..8a88ed9db508d173915190c8d54d78a804ce79e6 100644 (file)
                        <File
                                RelativePath="..\..\..\..\source\blender\blenpluginapi\documentation.h">
                        </File>
+                       <File
+                               RelativePath="..\..\..\..\source\blender\blenpluginapi\externdef.h">
+                       </File>
                        <File
                                RelativePath="..\..\..\..\source\blender\blenpluginapi\floatpatch.h">
                        </File>
                                RelativePath="..\..\..\..\source\blender\blenpluginapi\util.h">
                        </File>
                </Filter>
+               <File
+                       RelativePath="..\..\..\..\source\blender\blenpluginapi\plugin.DEF">
+               </File>
        </Files>
        <Globals>
        </Globals>
index 148e4e4be530c1be11cbfcd7be35ab997b486f52..5d7daa19c618ba8340e4f030e2edcad6c4ec6ed7 100644 (file)
@@ -1,2 +1 @@
 #define d_printf printf
-