diff options
author | Rob Haarsma <phaseIV@zonnet.nl> | 2003-04-29 01:18:43 +0400 |
---|---|---|
committer | Rob Haarsma <phaseIV@zonnet.nl> | 2003-04-29 01:18:43 +0400 |
commit | a4f2249497009c31f1c1823869e3130a51a15f7b (patch) | |
tree | 77304bcbb96ce5627acfb3f80d2cdfc8f95285a2 /projectfiles/blender | |
parent | d4f9678b3939a3b480005fee3b82ad8843de51e0 (diff) |
Added the WITH_FREETYPE2 compile flag, in the blenkernel
and blenlib msvc 'release' projectfiles. Compile and link with the
lib/windows/freetype directory.
Diffstat (limited to 'projectfiles/blender')
-rw-r--r-- | projectfiles/blender/blender.dsp | 2 | ||||
-rw-r--r-- | projectfiles/blender/blenkernel/BKE_blenkernel.dsp | 2 | ||||
-rw-r--r-- | projectfiles/blender/blenlib/BLI_blenlib.dsp | 35 | ||||
-rw-r--r-- | projectfiles/blender/src/BL_src.dsp | 20 |
4 files changed, 30 insertions, 29 deletions
diff --git a/projectfiles/blender/blender.dsp b/projectfiles/blender/blender.dsp index 9129af25486..dea3b9c5a27 100644 --- a/projectfiles/blender/blender.dsp +++ b/projectfiles/blender/blender.dsp @@ -50,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 qtmlClient.lib odelib.lib openal_static.lib libguardedalloc.a libbsp.a libbmfont.a libghost.a libstring.a ws2_32.lib dxguid.lib opengl32.lib libjpeg.a glu32.lib user32.lib gdi32.lib vfw32.lib advapi32.lib ole32.lib libdecimation.a libblenkey.a libeay32.lib libiksolver.a libpng.a libz.a libmoto.a /nologo /subsystem:console /machine:I386 /nodefaultlib:"msvcprt.lib" /nodefaultlib:"glut32.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcpd.lib" /nodefaultlib:"libcp.lib" /nodefaultlib:"libcmtd.lib" /out:"..\..\bin\blender.exe" /libpath:"..\..\..\lib\windows\ode\lib" /libpath:"..\..\..\lib\windows\bsp\lib" /libpath:"..\..\..\lib\windows\moto\lib" /libpath:"..\..\..\lib\windows\bmfont\lib" /libpath:"..\..\..\lib\windows\ghost\lib" /libpath:"..\..\..\lib\windows\python\frozen" /libpath:"..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\lib\windows\string\lib" /libpath:"..\..\..\lib\windows\python\lib" /libpath:"..\..\..\lib\windows\iksolver\lib" /libpath:"..\..\..\lib\windows\decimation\lib" /libpath:"..\..\..\lib\windows\openal\lib" /libpath:"..\..\..\lib\windows\jpeg\lib" /libpath:"..\..\..\lib\windows\blenkey\lib" /libpath:"..\..\..\lib\windows\openssl\lib" /libpath:"..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\lib\windows\png\lib\\" +# ADD LINK32 freetype213ST.lib qtmlClient.lib odelib.lib openal_static.lib libguardedalloc.a libbsp.a libbmfont.a libghost.a libstring.a ws2_32.lib dxguid.lib opengl32.lib libjpeg.a glu32.lib user32.lib gdi32.lib vfw32.lib advapi32.lib ole32.lib libdecimation.a libblenkey.a libeay32.lib libiksolver.a libpng.a libz.a libmoto.a /nologo /subsystem:console /machine:I386 /nodefaultlib:"msvcprt.lib" /nodefaultlib:"glut32.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcpd.lib" /nodefaultlib:"libcp.lib" /nodefaultlib:"libcmtd.lib" /out:"..\..\bin\blender.exe" /libpath:"..\..\..\lib\windows\freetype\lib" /libpath:"..\..\..\lib\windows\ode\lib" /libpath:"..\..\..\lib\windows\bsp\lib" /libpath:"..\..\..\lib\windows\moto\lib" /libpath:"..\..\..\lib\windows\bmfont\lib" /libpath:"..\..\..\lib\windows\ghost\lib" /libpath:"..\..\..\lib\windows\python\frozen" /libpath:"..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\lib\windows\string\lib" /libpath:"..\..\..\lib\windows\python\lib" /libpath:"..\..\..\lib\windows\iksolver\lib" /libpath:"..\..\..\lib\windows\decimation\lib" /libpath:"..\..\..\lib\windows\openal\lib" /libpath:"..\..\..\lib\windows\jpeg\lib" /libpath:"..\..\..\lib\windows\blenkey\lib" /libpath:"..\..\..\lib\windows\openssl\lib" /libpath:"..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\lib\windows\png\lib\\" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "blender - Win32 Debug" diff --git a/projectfiles/blender/blenkernel/BKE_blenkernel.dsp b/projectfiles/blender/blenkernel/BKE_blenkernel.dsp index 825b6b84c6b..f40f12ef33d 100644 --- a/projectfiles/blender/blenkernel/BKE_blenkernel.dsp +++ b/projectfiles/blender/blenkernel/BKE_blenkernel.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../lib/windows/bsp/include" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\blenlib" /I "../../../source/gameengine\SoundSystem\\" /I "../../../../lib/windows/iksolver/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../lib/windows/bsp/include" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\blenlib" /I "../../../source/gameengine\SoundSystem\\" /I "../../../../lib/windows/iksolver/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WITH_FREETYPE2" /YX /J /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe diff --git a/projectfiles/blender/blenlib/BLI_blenlib.dsp b/projectfiles/blender/blenlib/BLI_blenlib.dsp index 15ee743b0de..7e33db88453 100644 --- a/projectfiles/blender/blenlib/BLI_blenlib.dsp +++ b/projectfiles/blender/blenlib/BLI_blenlib.dsp @@ -44,7 +44,8 @@ RSC=rc.exe # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\makesdna" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\lib\windows\freetype\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\makesdna" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WITH_FREETYPE2" /J /FD /c +# SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -68,8 +69,8 @@ LIB32=link.exe -lib # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c -# SUBTRACT CPP /Fr +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /J /FD /GZ /c +# SUBTRACT CPP /Fr /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -168,6 +169,10 @@ SOURCE=..\..\..\source\blender\blenlib\intern\fileops.c # End Source File # Begin Source File +SOURCE=..\..\..\source\blender\blenlib\intern\freetypefont.c +# End Source File +# Begin Source File + SOURCE=..\..\..\source\blender\blenlib\intern\gsqueue.c # End Source File # Begin Source File @@ -272,14 +277,6 @@ SOURCE=..\..\..\source\blender\blenlib\BLI_noise.h # End Source File # Begin Source File -SOURCE=..\..\..\source\blender\blenlib\BLI_objfnt.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\blender\blenlib\intern\BLI_objfnt.h -# End Source File -# Begin Source File - SOURCE=..\..\..\source\blender\blenlib\BLI_objfnt_types.h # End Source File # Begin Source File @@ -288,14 +285,6 @@ SOURCE=..\..\..\source\blender\blenlib\BLI_packedFile_types.h # End Source File # Begin Source File -SOURCE=..\..\..\source\blender\blenlib\BLI_psfont.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\blender\blenlib\intern\BLI_psfont.h -# End Source File -# Begin Source File - SOURCE=..\..\..\source\blender\blenlib\BLI_rct.h # End Source File # Begin Source File @@ -308,10 +297,6 @@ SOURCE=..\..\..\source\blender\blenlib\intern\BLI_scanfill.h # End Source File # Begin Source File -SOURCE=..\..\..\source\blender\blenlib\BLI_storage.h -# End Source File -# Begin Source File - SOURCE=..\..\..\source\blender\blenlib\intern\BLI_storage.h # End Source File # Begin Source File @@ -320,10 +305,6 @@ SOURCE=..\..\..\source\blender\blenlib\BLI_storage_types.h # End Source File # Begin Source File -SOURCE=..\..\..\source\blender\blenlib\BLI_util.h -# End Source File -# Begin Source File - SOURCE=..\..\..\source\blender\blenlib\intern\BLI_util.h # End Source File # Begin Source File diff --git a/projectfiles/blender/src/BL_src.dsp b/projectfiles/blender/src/BL_src.dsp index 0dcae3bd01a..0fa00e7607a 100644 --- a/projectfiles/blender/src/BL_src.dsp +++ b/projectfiles/blender/src/BL_src.dsp @@ -408,6 +408,18 @@ SOURCE=..\..\..\source\blender\src\writemovie.c # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File +SOURCE=..\..\..\source\blender\include\BIF_editfont.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\blender\include\BIF_editoops.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\blender\include\BIF_imasel.h +# End Source File +# Begin Source File + SOURCE=..\..\..\source\blender\include\BIF_previewrender.h # End Source File # Begin Source File @@ -424,6 +436,14 @@ SOURCE=..\..\..\source\blender\include\BIF_writeavicodec.h # End Source File # Begin Source File +SOURCE=..\..\..\source\blender\include\blendef.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\blender\include\BSE_filesel.h +# End Source File +# Begin Source File + SOURCE=..\..\..\source\blender\src\sound.h # End Source File # Begin Source File |