Revision: 20882
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20882
Author: ben2610
Date: 2009-06-14 21:59:59 +0200 (Sun, 14 Jun 2009)
Log Message:
-----------
Update MSVC9 project files. Use pthreadVC2 instead of pthreadVSE2 to match
scons (don't know why we were using VSE2 in the first place).
Modified Paths:
--------------
trunk/blender/projectfiles_vc9/blender/blender.vcproj
trunk/blender/projectfiles_vc9/blender/nodes/nodes.vcproj
trunk/blender/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
Modified: trunk/blender/projectfiles_vc9/blender/blender.vcproj
===================================================================
--- trunk/blender/projectfiles_vc9/blender/blender.vcproj 2009-06-14
18:54:35 UTC (rev 20881)
+++ trunk/blender/projectfiles_vc9/blender/blender.vcproj 2009-06-14
19:59:59 UTC (rev 20882)
@@ -73,7 +73,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="SDL.lib freetype2ST.lib
gnu_gettext.lib qtmlClient.lib openal_static.lib ws2_32.lib dxguid.lib
opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib
python25.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib Half.lib Iex.lib
IlmImf.lib Imath.lib IlmThread.lib avcodec-52.lib avformat-52.lib avutil-50.lib
swscale-0.lib avdevice-52.lib"
+ AdditionalDependencies="SDL.lib freetype2ST.lib
gnu_gettext.lib qtmlClient.lib openal_static.lib ws2_32.lib dxguid.lib
opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib
python25.lib pthreadVC2.lib libtiff.lib Half.lib Iex.lib IlmImf.lib Imath.lib
IlmThread.lib avcodec-52.lib avformat-52.lib avutil-50.lib swscale-0.lib
avdevice-52.lib"
ShowProgress="0"
OutputFile="..\..\bin\blender.exe"
LinkIncremental="1"
@@ -107,7 +107,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="ECHO Moving libraries and export
definitions...
MOVE /Y ..\..\bin\blender.lib
..\..\..\build\msvc_9\libs
MOVE /Y ..\..\bin\blender.exp
..\..\..\build\msvc_9\libs
ECHO Copying required 3rd party
dlls...
XCOPY /Y
..\..\..\lib\windows\python\lib\lib25_vs2008\python25.dll
..\..\bin
XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll
..\..\bin
XCOPY /Y ..\..\..\lib\windows\sdl\lib\*.dll
..\..\bin
XCOPY /Y ..\..\..\lib\windows\tiff\lib\*.dll
..\..\bin
XCOPY /Y ..\..\..\lib\windows\pthreads\lib\pthreadVSE2.dll
..\..\bin
XCOPY /Y ..\..\..\lib\windows\ffmpeg\lib\*.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
ECHO Copying
manuals/text
XCOPY/Y ..\..\rele
ase\text ..\..\bin /E
ECHO Done
"
+ CommandLine="ECHO Moving libraries and export
definitions...
MOVE /Y ..\..\bin\blender.lib
..\..\..\build\msvc_9\libs
MOVE /Y ..\..\bin\blender.exp
..\..\..\build\msvc_9\libs
ECHO Copying required 3rd party
dlls...
XCOPY /Y
..\..\..\lib\windows\python\lib\lib25_vs2008\python25.dll
..\..\bin
XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll
..\..\bin
XCOPY /Y ..\..\..\lib\windows\sdl\lib\*.dll
..\..\bin
XCOPY /Y ..\..\..\lib\windows\tiff\lib\*.dll
..\..\bin
XCOPY /Y ..\..\..\lib\windows\pthreads\lib\pthreadVC2.dll
..\..\bin
XCOPY /Y ..\..\..\lib\windows\ffmpeg\lib\*.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
ECHO Copying
manuals/text
XCOPY/Y ..\..\relea
se\text ..\..\bin /E
ECHO Done
"
/>
</Configuration>
<Configuration
@@ -168,7 +168,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386
"
- AdditionalDependencies="SDL.lib freetype2ST.lib
gnu_gettext.lib qtmlClient.lib openal_static.lib ws2_32.lib dxguid.lib
opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib
python25_d.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib Half_d.lib Iex_d.lib
Imath_d.lib IlmImf_d.lib IlmThread_d.lib avcodec-52.lib avformat-52.lib
avdevice-52.lib avutil-50.lib swscale-0.lib"
+ AdditionalDependencies="SDL.lib freetype2ST.lib
gnu_gettext.lib qtmlClient.lib openal_static.lib ws2_32.lib dxguid.lib
opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib
python25_d.lib pthreadVC2.lib libtiff.lib Half_d.lib Iex_d.lib Imath_d.lib
IlmImf_d.lib IlmThread_d.lib avcodec-52.lib avformat-52.lib avdevice-52.lib
avutil-50.lib swscale-0.lib"
ShowProgress="0"
OutputFile="..\..\bin\debug\blender.exe"
LinkIncremental="2"
Modified: trunk/blender/projectfiles_vc9/blender/nodes/nodes.vcproj
===================================================================
--- trunk/blender/projectfiles_vc9/blender/nodes/nodes.vcproj 2009-06-14
18:54:35 UTC (rev 20881)
+++ trunk/blender/projectfiles_vc9/blender/nodes/nodes.vcproj 2009-06-14
19:59:59 UTC (rev 20882)
@@ -609,6 +609,10 @@
Name="TEX_nodes"
>
<File
+
RelativePath="..\..\..\source\blender\nodes\intern\TEX_nodes\TEX_at.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\nodes\intern\TEX_nodes\TEX_bricks.c"
>
</File>
Modified:
trunk/blender/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
===================================================================
--- trunk/blender/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
2009-06-14 18:54:35 UTC (rev 20881)
+++ trunk/blender/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
2009-06-14 19:59:59 UTC (rev 20882)
@@ -72,7 +72,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386
"
- AdditionalDependencies="odelib.lib fmodvc.lib
ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib
openal_static.lib libjpeg.lib dxguid.lib libeay32.lib libpng.lib libz.lib
qtmlClient.lib SDL.lib freetype2ST.lib python25_d.lib pthreadVSE2.lib
pthreadVC2.lib Half_d.lib Iex_d.lib IlmImf_d.lib IlmThread_d.lib Imath_d.lib
avcodec-52.lib avformat-52.lib avutil-50.lib swscale-0.lib avdevice-52.lib"
+ AdditionalDependencies="odelib.lib fmodvc.lib
ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib
openal_static.lib libjpeg.lib dxguid.lib libeay32.lib libpng.lib libz.lib
qtmlClient.lib SDL.lib freetype2ST.lib python25_d.lib pthreadVC2.lib Half_d.lib
Iex_d.lib IlmImf_d.lib IlmThread_d.lib Imath_d.lib avcodec-52.lib
avformat-52.lib avutil-50.lib swscale-0.lib avdevice-52.lib"
ShowProgress="0"
OutputFile="..\..\..\..\bin\debug\blenderplayer.exe"
LinkIncremental="2"
@@ -166,7 +166,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="odelib.lib ws2_32.lib
vfw32.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib openal_static.lib
libjpeg.lib dxguid.lib libeay32.lib libpng.lib libz.lib qtmlClient.lib SDL.lib
freetype2ST.lib python25.lib pthreadVSE2.lib pthreadVC2.lib Half.lib Iex.lib
IlmImf.lib IlmThread.lib Imath.lib avcodec-52.lib avformat-52.lib avutil-50.lib
swscale-0.lib avdevice-52.lib"
+ AdditionalDependencies="odelib.lib ws2_32.lib
vfw32.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib openal_static.lib
libjpeg.lib dxguid.lib libeay32.lib libpng.lib libz.lib qtmlClient.lib SDL.lib
freetype2ST.lib python25.lib pthreadVC2.lib Half.lib Iex.lib IlmImf.lib
IlmThread.lib Imath.lib avcodec-52.lib avformat-52.lib avutil-50.lib
swscale-0.lib avdevice-52.lib"
OutputFile="..\..\..\..\bin\blenderplayer.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
