* UNWRAPPER define in blenkernel for
authorNathan Letwory <nathan@letworyinteractive.com>
Tue, 13 Jul 2004 18:27:40 +0000 (18:27 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Tue, 13 Jul 2004 18:27:40 +0000 (18:27 +0000)
* updates to have blender link with opennl

projectfiles_vc7/blender/blender.vcproj
projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj

index 43aad7edff8d83be381d15739dec60e0a328ac7b..3b689b58d61eebbf5538e1ffb4f9b9838131c300 100644 (file)
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions="/MACHINE:I386"
-                               AdditionalDependencies="SDL.lib freetype2ST.lib ftgl_static_ST.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 libz_st.lib libmoto.lib PHY_Sumo.lib solid.lib qhull.lib"
+                               AdditionalDependencies="SDL.lib freetype2ST.lib ftgl_static_ST.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 libopennl.lib libpng_st.lib libz_st.lib libmoto.lib PHY_Sumo.lib solid.lib qhull.lib"
                                ShowProgress="0"
                                OutputFile="..\..\bin\blender.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\ftgl\lib;..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\bsp\lib;..\..\..\lib\windows\moto\lib;..\..\..\lib\windows\bmfont\lib;..\..\..\lib\windows\ghost\lib;..\..\..\lib\windows\python\frozen;..\..\..\lib\windows\guardedalloc\lib;..\..\..\lib\windows\string\lib;..\..\..\lib\windows\python\lib;..\..\..\lib\windows\iksolver\lib;..\..\..\lib\windows\decimation\lib;..\..\..\lib\windows\openal\lib;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\blenkey\lib;..\..\..\lib\windows\openssl\lib;..\..\..\lib\windows\soundsystem\lib\;..\..\..\lib\windows\zlib\lib\;..\..\..\lib\windows\png\lib\;..\..\..\lib\windows\QTDevWin\Libraries;..\..\obj\windows\gameengine\physics\sumo\Release;..\..\..\lib\windows\solid\lib;..\..\..\lib\windows\qhull\lib"
+                               AdditionalLibraryDirectories="..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\ftgl\lib;..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\bsp\lib;..\..\..\lib\windows\moto\lib;..\..\..\lib\windows\bmfont\lib;..\..\..\lib\windows\ghost\lib;..\..\..\lib\windows\python\frozen;..\..\..\lib\windows\guardedalloc\lib;..\..\..\lib\windows\string\lib;..\..\..\lib\windows\python\lib;..\..\..\lib\windows\iksolver\lib;..\..\..\lib\windows\decimation\lib;..\..\..\lib\windows\openal\lib;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\blenkey\lib;..\..\..\lib\windows\openssl\lib;..\..\..\lib\windows\soundsystem\lib\;..\..\..\lib\windows\zlib\lib\;..\..\..\lib\windows\png\lib\;..\..\..\lib\windows\QTDevWin\Libraries;..\..\obj\windows\gameengine\physics\sumo\Release;..\..\..\lib\windows\solid\lib;..\..\..\lib\windows\qhull\lib;..\..\..\lib\windows\opennl\lib"
                                IgnoreAllDefaultLibraries="FALSE"
                                IgnoreDefaultLibraryNames="msvcprt.lib;glut32.lib;libcd.lib;libc.lib;libcpd.lib;libcp.lib;libcmtd.lib"
                                ProgramDatabaseFile=".\..\..\obj\windows\blender/blender.pdb"
@@ -107,7 +107,7 @@ ECHO Done
                                OutputFile="..\..\bin\debug\blender.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\ftgl\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\bsp\lib\debug;..\..\..\lib\windows\moto\lib\debug;..\..\..\lib\windows\bmfont\lib\debug;..\..\..\lib\windows\ghost\lib\debug;..\..\..\lib\windows\guardedalloc\lib\debug;..\..\..\lib\windows\string\lib\debug;..\..\..\lib\windows\python\lib;..\..\..\lib\windows\iksolver\lib\debug;..\..\..\lib\windows\decimation\lib\debug;..\..\..\lib\windows\openal\lib;..\..\obj\windows\intern\soundsystem\dummy\debug;..\..\obj\windows\intern\soundsystem\openal\debug;..\..\..\lib\windows\soundsystem\lib\debug\;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\zlib\lib\;..\..\..\lib\windows\png\lib\;..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\lib\windows\solid\lib;..\..\..\lib\windows\qhull\lib"
+                               AdditionalLibraryDirectories="..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\ftgl\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\bsp\lib\debug;..\..\..\lib\windows\moto\lib\debug;..\..\..\lib\windows\bmfont\lib\debug;..\..\..\lib\windows\ghost\lib\debug;..\..\..\lib\windows\guardedalloc\lib\debug;..\..\..\lib\windows\string\lib\debug;..\..\..\lib\windows\python\lib;..\..\..\lib\windows\iksolver\lib\debug;..\..\..\lib\windows\decimation\lib\debug;..\..\..\lib\windows\openal\lib;..\..\obj\windows\intern\soundsystem\dummy\debug;..\..\obj\windows\intern\soundsystem\openal\debug;..\..\..\lib\windows\soundsystem\lib\debug\;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\zlib\lib\;..\..\..\lib\windows\png\lib\;..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\lib\windows\solid\lib;..\..\..\lib\windows\qhull\lib;..\..\..\lib\windows\opennl\lib\debug"
                                IgnoreDefaultLibraryNames="glut32.lib;libc.lib;libcd.lib;libcpd.lib;libcp.lib;libcmt.lib"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile=".\..\..\obj\windows\blender\debug/blender.pdb"
index 4040b31603bfe521b02612891147c441693f7dcf..8d816a02414d1ddbcb1d81792507959b5b063c69 100644 (file)
                                Name="VCCLCompilerTool"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="../../../../lib/windows/bsp/include,..\..\..\..\lib\windows\guardedalloc\include,..\..\..\source\blender\renderconverter,..\..\..\source\blender\render\extern\include,..\..\..\source\blender\avi,..\..\..\source\blender\imbuf,..\..\..\source\kernel\gen_system,..\..\..\source\blender\blenloader,..\..\..\source\blender,..\..\..\source\blender\include,..\..\..\source\blender\blenkernel,..\..\..\source\blender\makesdna,..\..\..\source\blender\python,..\..\..\source\blender\blenlib,../../../source/gameengine\SoundSystem\,../../../../lib/windows/iksolver/include"
-                               PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_FREETYPE2"
+                               PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_FREETYPE2,UNWRAPPER"
                                StringPooling="TRUE"
                                RuntimeLibrary="0"
                                EnableFunctionLevelLinking="TRUE"
index 15c963c1e0140ede47d4d273f09605d452839f68..fa2b27d61215bc335b8d6bd394b6aea422c4f1a3 100644 (file)
                <Filter
                        Name="Header Files"
                        Filter="h;hpp;hxx;hm;inl">
+                       <File
+                               RelativePath="..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\EXT_separate_specular_color.h">
+                       </File>
                        <File
                                RelativePath="..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_GLExtensionManager.h">
                        </File>