From 9e2d6a51bd292562cc34ea73e277fa778ca113b2 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 9 Nov 2004 15:12:38 +0000 Subject: [PATCH] From Mike Weiblen adding lib paths to net.dsp, and changes by Robert Osfield moving the osgDB and osg dependency from the net.dsp to VisualStudio.dsp to keep it consistent with the rest of the OSG plugins and executables. --- VisualStudio/VisualStudio.dsw | 9 +++++++++ VisualStudio/osgPlugins/net/net.dsp | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/VisualStudio/VisualStudio.dsw b/VisualStudio/VisualStudio.dsw index 07e7bd520..d359b32e4 100644 --- a/VisualStudio/VisualStudio.dsw +++ b/VisualStudio/VisualStudio.dsw @@ -2366,6 +2366,15 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name Core osg + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgDB + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgUtil + End Project Dependency }}} ############################################################################### diff --git a/VisualStudio/osgPlugins/net/net.dsp b/VisualStudio/osgPlugins/net/net.dsp index a65b59cc2..2405ed508 100644 --- a/VisualStudio/osgPlugins/net/net.dsp +++ b/VisualStudio/osgPlugins/net/net.dsp @@ -54,7 +54,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 /nologo /dll /machine:I386 -# ADD LINK32 osgDB.lib osg.lib OpenThreadsWin32.lib wsock32.lib /nologo /dll /machine:I386 /out:"../../../bin/osgdb_net.dll" +# ADD LINK32 OpenThreadsWin32.lib wsock32.lib /nologo /dll /machine:I386 /out:"../../../bin/osgdb_net.dll" /libpath:"../../../lib" /libpath:"../../../../OpenThreads/lib/win32" /libpath:"../../../../Producer/lib" /libpath:"../../../../3rdParty/lib" !ELSEIF "$(CFG)" == "osgPlugin net - Win32 Debug" @@ -81,7 +81,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 /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 osgDBd.lib osgd.lib OpenThreadsWin32d.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"../../../bin/osgdb_netd.dll" /pdbtype:sept +# ADD LINK32 OpenThreadsWin32d.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"../../../bin/osgdb_netd.dll" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../../OpenThreads/lib/win32" /libpath:"../../../../Producer/lib" /libpath:"../../../../3rdParty/lib" !ENDIF