kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

renamed libjpeg-static.a to libjpeg.a to suit NaN makefiles (for cygwin)

Browse Source 
and updated the MSVC project files.
This commit is contained in:
Simon Clitherow 2003-01-24 21:10:41 +00:00
parent 23fe9bb3fe
commit 0886539ce6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projectfiles/blenderpublisher/blenderpublisher.dsp
View File

@ -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 odelib.lib fmodvc.lib libguardedalloc.a libbsp.a libbmfont.a libghost.a libstring.a ws2_32.lib openal_static.lib dxguid.lib opengl32.lib libjpeg-static.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:"..\..\obj\windows\blenderpublisher.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\ode-0.03\lib" /libpath:"..\..\lib\windows\python\frozen" /libpath:"..\..\lib\windows\fmod\lib" /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 odelib.lib fmodvc.lib libguardedalloc.a libbsp.a libbmfont.a libghost.a libstring.a ws2_32.lib openal_static.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:"..\..\obj\windows\blenderpublisher.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\ode-0.03\lib" /libpath:"..\..\lib\windows\python\frozen" /libpath:"..\..\lib\windows\fmod\lib" /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)" == "blenderpublisher - Win32 Debug"
@ -76,7 +76,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 /debug /machine:I386 /pdbtype:sept
# ADD LINK32 odelib.lib fmodvc.lib libguardedalloc.a libbsp.a libbmfont.a libghost.a libstring.a ws2_32.lib openal_static.lib dxguid.lib opengl32.lib libjpeg-static.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 /debug /machine:I386 /nodefaultlib:"glut32.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcpd.lib" /nodefaultlib:"libcp.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"libcpmtd.lib" /nodefaultlib:"msvcprtd.lib" /out:"..\..\obj\windows\debug\blenderpublisher.exe" /pdbtype:sept /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\fmod\lib" /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 odelib.lib fmodvc.lib libguardedalloc.a libbsp.a libbmfont.a libghost.a libstring.a ws2_32.lib openal_static.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 /debug /machine:I386 /nodefaultlib:"glut32.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcpd.lib" /nodefaultlib:"libcp.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"libcpmtd.lib" /nodefaultlib:"msvcprtd.lib" /out:"..\..\obj\windows\debug\blenderpublisher.exe" /pdbtype:sept /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\fmod\lib" /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
!ENDIF

4
projectfiles/creator/blendercreator.dsp
View File

@ -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 odelib.lib fmodvc.lib libbsp.a libguardedalloc.a libbmfont.a libstring.a libghost.a ws2_32.lib openal_static.lib dxguid.lib opengl32.lib libjpeg-static.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:"glut32.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcpd.lib" /nodefaultlib:"libcp.lib" /nodefaultlib:"libcmtd.lib" /out:"..\..\obj\windows\blendercreator.exe" /libpath:"..\..\lib\windows\ode\lib" /libpath:"..\..\lib\windows\bsp\lib" /libpath:"..\..\lib\windows\ghost\lib" /libpath:"..\..\lib\windows\bmfont\lib" /libpath:"..\..\lib\windows\openal\lib" /libpath:"..\..\lib\windows\iksolver\lib\\" /libpath:"..\..\lib\windows\ode-0.03\lib" /libpath:"..\..\lib\windows\python\frozen" /libpath:"..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\lib\windows\string\lib" /libpath:"..\..\lib\windows\moto\lib" /libpath:"..\..\lib\windows\python\lib" /libpath:"..\..\lib\windows\jpeg\lib" /libpath:"..\..\lib\windows\decimation\lib" /libpath:"..\..\lib\windows\blenkey\lib" /libpath:"..\..\lib\windows\openssl\lib" /libpath:"..\..\lib\windows\zlib\lib\\" /libpath:"..\..\lib\windows\png\lib\\" /libpath:"..\..\lib\windows\fmod\lib"
# ADD LINK32 odelib.lib fmodvc.lib libbsp.a libguardedalloc.a libbmfont.a libstring.a libghost.a ws2_32.lib openal_static.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:"glut32.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcpd.lib" /nodefaultlib:"libcp.lib" /nodefaultlib:"libcmtd.lib" /out:"..\..\obj\windows\blendercreator.exe" /libpath:"..\..\lib\windows\ode\lib" /libpath:"..\..\lib\windows\bsp\lib" /libpath:"..\..\lib\windows\ghost\lib" /libpath:"..\..\lib\windows\bmfont\lib" /libpath:"..\..\lib\windows\openal\lib" /libpath:"..\..\lib\windows\iksolver\lib\\" /libpath:"..\..\lib\windows\ode-0.03\lib" /libpath:"..\..\lib\windows\python\frozen" /libpath:"..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\lib\windows\string\lib" /libpath:"..\..\lib\windows\moto\lib" /libpath:"..\..\lib\windows\python\lib" /libpath:"..\..\lib\windows\jpeg\lib" /libpath:"..\..\lib\windows\decimation\lib" /libpath:"..\..\lib\windows\blenkey\lib" /libpath:"..\..\lib\windows\openssl\lib" /libpath:"..\..\lib\windows\zlib\lib\\" /libpath:"..\..\lib\windows\png\lib\\" /libpath:"..\..\lib\windows\fmod\lib"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "blendercreator - Win32 Debug"
@ -76,7 +76,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 /debug /machine:I386 /pdbtype:sept
# ADD LINK32 odelib.lib fmodvc.lib libbsp.a libguardedalloc.a libbmfont.a libstring.a libghost.a ws2_32.lib openal_static.lib dxguid.lib opengl32.lib libjpeg-static.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 /debug /machine:I386 /nodefaultlib:"glut32.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcpd.lib" /nodefaultlib:"libcp.lib" /nodefaultlib:"libcmt.lib" /out:"..\..\obj\windows\debug\blendercreator.exe" /pdbtype:sept /libpath:"..\..\lib\windows\ode\lib" /libpath:"..\..\lib\windows\bsp\lib\debug" /libpath:"..\..\lib\windows\ghost\lib\debug" /libpath:"..\..\lib\windows\bmfont\lib\debug" /libpath:"..\..\lib\windows\openal\lib\\" /libpath:"..\..\lib\windows\iksolver\lib\debug" /libpath:"..\..\lib\windows\ode-0.03\lib" /libpath:"..\..\lib\windows\python\frozen" /libpath:"..\..\lib\windows\guardedalloc\lib\debug" /libpath:"..\..\lib\windows\string\lib\debug" /libpath:"..\..\lib\windows\moto\lib\debug" /libpath:"..\..\lib\windows\python\lib" /libpath:"..\..\lib\windows\jpeg\lib" /libpath:"..\..\lib\windows\decimation\lib\debug" /libpath:"..\..\lib\windows\blenkey\lib\debug" /libpath:"..\..\lib\windows\openssl\lib" /libpath:"..\..\lib\windows\zlib\lib\\" /libpath:"..\..\lib\windows\png\lib\\" /libpath:"..\..\lib\windows\fmod\lib"
# ADD LINK32 odelib.lib fmodvc.lib libbsp.a libguardedalloc.a libbmfont.a libstring.a libghost.a ws2_32.lib openal_static.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 /debug /machine:I386 /nodefaultlib:"glut32.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcpd.lib" /nodefaultlib:"libcp.lib" /nodefaultlib:"libcmt.lib" /out:"..\..\obj\windows\debug\blendercreator.exe" /pdbtype:sept /libpath:"..\..\lib\windows\ode\lib" /libpath:"..\..\lib\windows\bsp\lib\debug" /libpath:"..\..\lib\windows\ghost\lib\debug" /libpath:"..\..\lib\windows\bmfont\lib\debug" /libpath:"..\..\lib\windows\openal\lib\\" /libpath:"..\..\lib\windows\iksolver\lib\debug" /libpath:"..\..\lib\windows\ode-0.03\lib" /libpath:"..\..\lib\windows\python\frozen" /libpath:"..\..\lib\windows\guardedalloc\lib\debug" /libpath:"..\..\lib\windows\string\lib\debug" /libpath:"..\..\lib\windows\moto\lib\debug" /libpath:"..\..\lib\windows\python\lib" /libpath:"..\..\lib\windows\jpeg\lib" /libpath:"..\..\lib\windows\decimation\lib\debug" /libpath:"..\..\lib\windows\blenkey\lib\debug" /libpath:"..\..\lib\windows\openssl\lib" /libpath:"..\..\lib\windows\zlib\lib\\" /libpath:"..\..\lib\windows\png\lib\\" /libpath:"..\..\lib\windows\fmod\lib"
# SUBTRACT LINK32 /pdb:none
!ENDIF