Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Gilbert <ascotan@gmail.com>2006-06-23 19:25:57 +0400
committerJoseph Gilbert <ascotan@gmail.com>2006-06-23 19:25:57 +0400
commit3851ea07d42a51a6a34dce593cf9ac0681434341 (patch)
tree64cc8739f0c5b1360f97cbd6c12c240d531aabc2 /projectfiles_vc7
parent6d79aed0f21468b22c399464182c2b0729f64241 (diff)
*msvc project update
- commiting fixes for vc8 - updating projects for added files
Diffstat (limited to 'projectfiles_vc7')
-rw-r--r--projectfiles_vc7/blender/blender.vcproj14
-rw-r--r--projectfiles_vc7/blender/blenpluginapi/blenpluginapi/blenpluginapi.vcproj6
2 files changed, 14 insertions, 6 deletions
diff --git a/projectfiles_vc7/blender/blender.vcproj b/projectfiles_vc7/blender/blender.vcproj
index 3ebcfdae474..687ab2607bb 100644
--- a/projectfiles_vc7/blender/blender.vcproj
+++ b/projectfiles_vc7/blender/blender.vcproj
@@ -41,14 +41,14 @@
<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
diff --git a/projectfiles_vc7/blender/blenpluginapi/blenpluginapi/blenpluginapi.vcproj b/projectfiles_vc7/blender/blenpluginapi/blenpluginapi/blenpluginapi.vcproj
index dce7f9d7cc4..8a88ed9db50 100644
--- a/projectfiles_vc7/blender/blenpluginapi/blenpluginapi/blenpluginapi.vcproj
+++ b/projectfiles_vc7/blender/blenpluginapi/blenpluginapi/blenpluginapi.vcproj
@@ -337,6 +337,9 @@
RelativePath="..\..\..\..\source\blender\blenpluginapi\documentation.h">
</File>
<File
+ RelativePath="..\..\..\..\source\blender\blenpluginapi\externdef.h">
+ </File>
+ <File
RelativePath="..\..\..\..\source\blender\blenpluginapi\floatpatch.h">
</File>
<File
@@ -349,6 +352,9 @@
RelativePath="..\..\..\..\source\blender\blenpluginapi\util.h">
</File>
</Filter>
+ <File
+ RelativePath="..\..\..\..\source\blender\blenpluginapi\plugin.DEF">
+ </File>
</Files>
<Globals>
</Globals>