diff options
author | Andrea Weikert <elubie@gmx.net> | 2007-03-03 14:28:15 +0300 |
---|---|---|
committer | Andrea Weikert <elubie@gmx.net> | 2007-03-03 14:28:15 +0300 |
commit | d1b17f8c307abb9d4fc6fc9820144872c8be57e4 (patch) | |
tree | ba73597bf3b37fae0b232863fcac6c0a0f88d8d9 | |
parent | 73545179a3fd99a21f5e71f9c742035a3d2d4044 (diff) |
==== MSVC 7.1 project files ====
- fix for 3DPlugin compile
- cleanup of bullet path
- removed PHY_ODE project from 3D plugin too, not used anymore
Now all configurations should build again, let me know of any problems!
Not been able to test if the 3DPlugin is actually working,is job for another day ;)
Also the 3DPlugin is compiled without OpenExr, this needs to be looked into once too.
-rw-r--r-- | extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj | 28 | ||||
-rw-r--r-- | intern/ghost/make/msvc_7_0/ghost.vcproj | 4 | ||||
-rw-r--r-- | projectfiles_vc7/blender/blender.sln | 4 | ||||
-rw-r--r-- | projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj | 2 | ||||
-rw-r--r-- | projectfiles_vc7/gameengine/gameplayer/axctl/GP_axctl.vcproj | 8 | ||||
-rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_api.cpp | 2 |
6 files changed, 24 insertions, 24 deletions
diff --git a/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj b/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj index 5a9f8a8138c..c282c496e87 100644 --- a/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj +++ b/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj @@ -171,8 +171,8 @@ ECHO Done </Configuration> <Configuration Name="3D Plugin Debug|Win32" - OutputDirectory="..\..\..\..\..\..\build\msvc_7\extern\bullet\mtdll\debug" - IntermediateDirectory="..\..\..\..\..\..\build\msvc_7\extern\bullet\mtdll\debug" + OutputDirectory="..\..\..\..\..\build\msvc_7\extern\bullet\mtdll\debug" + IntermediateDirectory="..\..\..\..\..\build\msvc_7\extern\bullet\mtdll\debug" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -186,10 +186,10 @@ ECHO Done BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\..\build\msvc_7\extern\bullet\mtdll\debug\Bullet.pch" - AssemblerListingLocation="..\..\..\..\..\..\build\msvc_7\extern\bullet\mtdll\debug\" - ObjectFile="..\..\..\..\..\..\build\msvc_7\extern\bullet\mtdll\debug\" - ProgramDataBaseFileName="..\..\..\..\..\..\build\msvc_7\extern\bullet\mtdll\debug\" + PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\extern\bullet\mtdll\debug\Bullet.pch" + AssemblerListingLocation="..\..\..\..\..\build\msvc_7\extern\bullet\mtdll\debug\" + ObjectFile="..\..\..\..\..\build\msvc_7\extern\bullet\mtdll\debug\" + ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\extern\bullet\mtdll\debug\" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="4" @@ -198,7 +198,7 @@ ECHO Done Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\..\build\msvc_7\libs\extern\mtdll\debug\Bullet.lib" + OutputFile="..\..\..\..\..\build\msvc_7\libs\extern\mtdll\debug\Bullet.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> @@ -249,8 +249,8 @@ ECHO Done </Configuration> <Configuration Name="3D Plugin Release|Win32" - OutputDirectory="..\..\..\..\..\..\build\msvc_7\extern\bullet\mtdll" - IntermediateDirectory="..\..\..\..\..\..\build\msvc_7\extern\bullet\mtdll" + OutputDirectory="..\..\..\..\..\build\msvc_7\extern\bullet\mtdll" + IntermediateDirectory="..\..\..\..\..\build\msvc_7\extern\bullet\mtdll" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -266,10 +266,10 @@ ECHO Done RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\..\build\msvc_7\extern\bullet\mtdll\Bullet.pch" - AssemblerListingLocation="..\..\..\..\..\..\build\msvc_7\extern\bullet\mtdll\" - ObjectFile="..\..\..\..\..\..\build\msvc_7\extern\bullet\mtdll\" - ProgramDataBaseFileName="..\..\..\..\..\..\build\msvc_7\extern\bullet\mtdll\" + PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\extern\bullet\mtdll\Bullet.pch" + AssemblerListingLocation="..\..\..\..\..\build\msvc_7\extern\bullet\mtdll\" + ObjectFile="..\..\..\..\..\build\msvc_7\extern\bullet\mtdll\" + ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\extern\bullet\mtdll\" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="2" @@ -278,7 +278,7 @@ ECHO Done Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\..\build\msvc_7\libs\extern\mtdll\Bullet.lib" + OutputFile="..\..\..\..\..\build\msvc_7\libs\extern\mtdll\Bullet.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> diff --git a/intern/ghost/make/msvc_7_0/ghost.vcproj b/intern/ghost/make/msvc_7_0/ghost.vcproj index 04a526d93ce..9d0aef451e7 100644 --- a/intern/ghost/make/msvc_7_0/ghost.vcproj +++ b/intern/ghost/make/msvc_7_0/ghost.vcproj @@ -136,7 +136,7 @@ ECHO Done <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_7\intern\string\include" + AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\lib\windows\wintab\INCLUDE" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="2" @@ -193,7 +193,7 @@ ECHO Done <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_7\intern\string\include" + AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\lib\windows\wintab\INCLUDE" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/projectfiles_vc7/blender/blender.sln b/projectfiles_vc7/blender/blender.sln index 0306ef5bd35..59dcf1f44b5 100644 --- a/projectfiles_vc7/blender/blender.sln +++ b/projectfiles_vc7/blender/blender.sln @@ -240,6 +240,8 @@ Global BlenderPlayer Debug = BlenderPlayer Debug BlenderPlayer Release = BlenderPlayer Release EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution + EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.3D Plugin Debug.ActiveCfg = Blender Debug|Win32 {F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.3D Plugin Release.ActiveCfg = Blender Release|Win32 @@ -500,9 +502,7 @@ Global {3648FB9A-C36F-43AB-AED0-1F1361E67FC7}.BlenderPlayer Release.ActiveCfg = BlenderPlayer Release|Win32 {3648FB9A-C36F-43AB-AED0-1F1361E67FC7}.BlenderPlayer Release.Build.0 = BlenderPlayer Release|Win32 {EC405272-28E3-4840-AAC2-53D6DE4E163D}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32 - {EC405272-28E3-4840-AAC2-53D6DE4E163D}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32 {EC405272-28E3-4840-AAC2-53D6DE4E163D}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32 - {EC405272-28E3-4840-AAC2-53D6DE4E163D}.3D Plugin Release.Build.0 = 3D Plugin Release|Win32 {EC405272-28E3-4840-AAC2-53D6DE4E163D}.Blender Debug.ActiveCfg = BlenderPlayer Debug|Win32 {EC405272-28E3-4840-AAC2-53D6DE4E163D}.Blender Release.ActiveCfg = BlenderPlayer Release|Win32 {EC405272-28E3-4840-AAC2-53D6DE4E163D}.BlenderPlayer Debug.ActiveCfg = BlenderPlayer Debug|Win32 diff --git a/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj b/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj index cc98401a41e..61c0a857da1 100644 --- a/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj +++ b/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj @@ -22,7 +22,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr" - PreprocessorDefinitions="_DEBUG,WIN32,_LIB,WITH_QUICKTIME" + PreprocessorDefinitions="_DEBUG,WIN32,_LIB,WITH_QUICKTIME;WITH_OPENEXR" BasicRuntimeChecks="3" RuntimeLibrary="1" DefaultCharIsUnsigned="TRUE" diff --git a/projectfiles_vc7/gameengine/gameplayer/axctl/GP_axctl.vcproj b/projectfiles_vc7/gameengine/gameplayer/axctl/GP_axctl.vcproj index dc6692f8ef5..07189cf1f7f 100644 --- a/projectfiles_vc7/gameengine/gameplayer/axctl/GP_axctl.vcproj +++ b/projectfiles_vc7/gameengine/gameplayer/axctl/GP_axctl.vcproj @@ -46,12 +46,12 @@ IgnoreImportLibrary="FALSE" AdditionalOptions="/MACHINE:I386 " - AdditionalDependencies="openal_static.lib libmoto.lib libguardedalloc.lib libbmfont.lib libstring.lib opengl32.lib glu32.lib glaux.lib dxguid.lib ole32.lib vfw32.lib libblenkey.lib libeay32.lib libz.lib libpng.lib libjpeg.lib odelib.lib libSoundSystem.lib libOpenALSoundSystem.lib libDummySoundSystem.lib SDL.lib solid.lib qtmlClient.lib freetype2ST.lib libbsp.lib libopennl.lib libghost.lib ftgl_static.lib libiksolver.lib libdecimation.lib gnu_gettext.lib ws2_32.lib BulletDynamics.lib Bullet.lib python25_d.lib" + AdditionalDependencies="openal_static.lib libmoto.lib libguardedalloc.lib libbmfont.lib libstring.lib opengl32.lib glu32.lib glaux.lib dxguid.lib ole32.lib vfw32.lib libblenkey.lib libeay32.lib libz.lib libpng.lib libjpeg.lib odelib.lib libSoundSystem.lib libOpenALSoundSystem.lib libDummySoundSystem.lib SDL.lib qtmlClient.lib freetype2ST.lib libbsp.lib libopennl.lib libghost.lib ftgl_static.lib libiksolver.lib libdecimation.lib gnu_gettext.lib ws2_32.lib solid.lib Bullet.lib python25_d.lib pthreadVC2.lib" ShowProgress="0" OutputFile="..\..\..\..\bin\debug\Blender3DPlugin.ocx" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="..\..\..\..\..\lib\windows\zlib\lib;..\..\..\..\..\lib\windows\sdl\lib;..\..\..\..\..\lib\windows\png\lib;..\..\..\..\..\lib\windows\jpeg\lib;..\..\..\..\..\lib\windows\python\lib;..\..\..\..\..\lib\windows\gettext\lib;..\..\..\..\..\lib\windows\freetype\lib;..\..\..\..\..\lib\windows\openal\lib;..\..\..\..\..\lib\windows\ode\lib\mt_dll;..\..\..\..\..\lib\windows\openssl\lib\mt_dll;..\..\..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\..\..\build\msvc_7\libs\intern\mtdll\debug;..\..\..\..\..\build\msvc_7\libs\extern\mtdll\debug" + AdditionalLibraryDirectories="..\..\..\..\..\lib\windows\zlib\lib;..\..\..\..\..\lib\windows\sdl\lib;..\..\..\..\..\lib\windows\png\lib;..\..\..\..\..\lib\windows\jpeg\lib;..\..\..\..\..\lib\windows\python\lib;..\..\..\..\..\lib\windows\gettext\lib;..\..\..\..\..\lib\windows\freetype\lib;..\..\..\..\..\lib\windows\openal\lib;..\..\..\..\..\lib\windows\ode\lib\mt_dll;..\..\..\..\..\lib\windows\openssl\lib\mt_dll;..\..\..\..\..\lib\windows\pthreads\lib;..\..\..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\..\..\build\msvc_7\libs\intern\mtdll\debug;..\..\..\..\..\build\msvc_7\libs\extern\mtdll\debug" IgnoreAllDefaultLibraries="FALSE" IgnoreDefaultLibraryNames="libc.lib, libcmt.lib, msvcrt.lib, libcd.lib, libcmtd.lib" ModuleDefinitionFile="..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayer.def" @@ -129,11 +129,11 @@ ECHO Done <Tool Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="openal_static.lib libmoto.lib libguardedalloc.lib libbmfont.lib libstring.lib opengl32.lib glu32.lib glaux.lib dxguid.lib ole32.lib vfw32.lib libblenkey.lib libeay32.lib libz.lib libpng.lib libjpeg.lib odelib.lib libSoundSystem.lib libOpenALSoundSystem.lib libDummySoundSystem.lib SDL.lib solid.lib qtmlClient.lib freetype2ST.lib libbsp.lib libopennl.lib libghost.lib ftgl_static.lib libiksolver.lib libdecimation.lib gnu_gettext.lib ws2_32.lib BulletDynamics.lib Bullet.lib python25.lib" + AdditionalDependencies="openal_static.lib libmoto.lib libguardedalloc.lib libbmfont.lib libstring.lib opengl32.lib glu32.lib glaux.lib dxguid.lib ole32.lib vfw32.lib libblenkey.lib libeay32.lib libz.lib libpng.lib libjpeg.lib odelib.lib libSoundSystem.lib libOpenALSoundSystem.lib libDummySoundSystem.lib SDL.lib qtmlClient.lib freetype2ST.lib libbsp.lib libopennl.lib libghost.lib ftgl_static.lib libiksolver.lib libdecimation.lib gnu_gettext.lib ws2_32.lib solid.lib Bullet.lib python25_d.lib pthreadVC2.lib" OutputFile="..\..\..\..\bin\Blender3DPlugin.ocx" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="..\..\..\..\..\lib\windows\zlib\lib;..\..\..\..\..\lib\windows\sdl\lib;..\..\..\..\..\lib\windows\png\lib;..\..\..\..\..\lib\windows\jpeg\lib;..\..\..\..\..\lib\windows\python\lib;..\..\..\..\..\lib\windows\freetype\lib;..\..\..\..\..\lib\windows\gettext\lib;..\..\..\..\..\lib\windows\openal\lib;..\..\..\..\..\lib\windows\ode\lib\mt_dll;..\..\..\..\..\lib\windows\openssl\lib\mt_dll;..\..\..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\..\..\build\msvc_7\libs\intern\mtdll;..\..\..\..\..\build\msvc_7\libs\extern\mtdll" + AdditionalLibraryDirectories="..\..\..\..\..\lib\windows\zlib\lib;..\..\..\..\..\lib\windows\sdl\lib;..\..\..\..\..\lib\windows\png\lib;..\..\..\..\..\lib\windows\jpeg\lib;..\..\..\..\..\lib\windows\python\lib;..\..\..\..\..\lib\windows\gettext\lib;..\..\..\..\..\lib\windows\freetype\lib;..\..\..\..\..\lib\windows\openal\lib;..\..\..\..\..\lib\windows\ode\lib\mt_dll;..\..\..\..\..\lib\windows\openssl\lib\mt_dll;..\..\..\..\..\lib\windows\pthreads\lib;..\..\..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\..\..\build\msvc_7\libs\intern\mtdll\debug;..\..\..\..\..\build\msvc_7\libs\extern\mtdll\debug" IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;libcd.lib;libcmtd.lib;msvcrtd.lib" ModuleDefinitionFile="..\..\..\..\source\gameengine\GamePlayer\ActiveX\BlenderPlayer.def" ProgramDatabaseFile="..\..\..\..\..\build\msvc_7\libs\Blender3DPlugin.pdb" diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 0467c544b03..983ab101893 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -37,7 +37,7 @@ extern "C" { // The following prevents a linking error in debug mode for MSVC using the libs in CVS -#if defined(_WIN32) && defined(_DEBUG) && !defined(__MINGW32__) && !defined(__CYGWIN__) +#if defined(WITH_OPENEXR) && defined(_WIN32) && defined(_DEBUG) && !defined(__MINGW32__) && !defined(__CYGWIN__) _CRTIMP void __cdecl _invalid_parameter_noinfo(void) { } |