From: Philip L. <phi...@us...> - 2005-09-21 18:14:23
|
Update of /cvsroot/artoolkit/artoolkit/examples/multi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16107 Modified Files: multiTest.dsp multiTest.vcproj Log Message: Reverse slashes in paths. Index: multiTest.dsp =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/multi/multiTest.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** multiTest.dsp 22 Nov 2004 03:08:24 -0000 1.1 --- multiTest.dsp 21 Sep 2005 18:14:09 -0000 1.2 *************** *** 52,56 **** 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 libAR.lib libARvideo.lib libARgsub.lib libARmulti.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 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 /nodefaultlib:"libc.lib" /out:"../../bin/multi.exe" /libpath:"..\..\lib" # SUBTRACT LINK32 /nodefaultlib --- 52,56 ---- 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 libAR.lib libARvideo.lib libARgsub.lib libARmulti.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 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 /nodefaultlib:"libc.lib" /out:"..\..\bin\multi.exe" /libpath:"..\..\lib" # SUBTRACT LINK32 /nodefaultlib *************** *** 78,82 **** 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 libARd.lib libARvideod.lib libARgsubd.lib libARmultid.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 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 /nodefaultlib:"libcd.lib" /out:"../../bin/multid.exe" /pdbtype:sept /libpath:"..\..\lib" # SUBTRACT LINK32 /nodefaultlib --- 78,82 ---- 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 libARd.lib libARvideod.lib libARgsubd.lib libARmultid.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 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 /nodefaultlib:"libcd.lib" /out:"..\..\bin\multid.exe" /pdbtype:sept /libpath:"..\..\lib" # SUBTRACT LINK32 /nodefaultlib Index: multiTest.vcproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/multi/multiTest.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** multiTest.vcproj 22 Jul 2005 23:59:25 -0000 1.2 --- multiTest.vcproj 21 Sep 2005 18:14:09 -0000 1.3 *************** *** 18,22 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)../../include" PreprocessorDefinitions="WIN32;_DEBUG" BasicRuntimeChecks="3" --- 18,22 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)..\..\include" PreprocessorDefinitions="WIN32;_DEBUG" BasicRuntimeChecks="3" *************** *** 31,36 **** AdditionalOptions="/DEBUG" AdditionalDependencies="libARd.lib libARMultid.lib libARgsubd.lib libARvideod.lib opengl32.lib glu32.lib glut32.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName)d.exe" ! AdditionalLibraryDirectories=""$(ProjectDir)../../lib"" GenerateDebugInformation="TRUE"/> <Tool --- 31,36 ---- AdditionalOptions="/DEBUG" AdditionalDependencies="libARd.lib libARMultid.lib libARgsubd.lib libARvideod.lib opengl32.lib glu32.lib glut32.lib" ! OutputFile="$(ProjectDir)..\..\bin\$(ProjectName)d.exe" ! AdditionalLibraryDirectories=""$(ProjectDir)..\..\lib"" GenerateDebugInformation="TRUE"/> <Tool *************** *** 70,74 **** InlineFunctionExpansion="1" FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories="$(ProjectDir)../../include" PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0"/> --- 70,74 ---- InlineFunctionExpansion="1" FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories="$(ProjectDir)..\..\include" PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0"/> *************** *** 78,83 **** Name="VCLinkerTool" AdditionalDependencies="libAR.lib libARMulti.lib libARgsub.lib libARvideo.lib opengl32.lib glu32.lib glut32.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName).exe" ! AdditionalLibraryDirectories=""$(ProjectDir)../../lib""/> <Tool Name="VCMIDLTool" --- 78,83 ---- Name="VCLinkerTool" AdditionalDependencies="libAR.lib libARMulti.lib libARgsub.lib libARvideo.lib opengl32.lib glu32.lib glut32.lib" ! OutputFile="$(ProjectDir)..\..\bin\$(ProjectName).exe" ! AdditionalLibraryDirectories=""$(ProjectDir)..\..\lib""/> <Tool Name="VCMIDLTool" |