From 0c8d90980094fb6bdff42e0b3d5df559a84cc7fd Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 2 Oct 2006 11:34:45 +0000 Subject: [PATCH] From Andreas Ekstrand, "It seems my changes to ESRIShape.dsp (to create an osgdb_shp.dll rather than an osgdb_ESRI.dll) were overwritten by later commits to this file. Here are the changes again, made from the latest version of ESRIShape.dsp." --- VisualStudio/osgPlugins/ESRIShape/ESRIShape.dsp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/VisualStudio/osgPlugins/ESRIShape/ESRIShape.dsp b/VisualStudio/osgPlugins/ESRIShape/ESRIShape.dsp index 90217f870..bd7f0bb7c 100644 --- a/VisualStudio/osgPlugins/ESRIShape/ESRIShape.dsp +++ b/VisualStudio/osgPlugins/ESRIShape/ESRIShape.dsp @@ -57,7 +57,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 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgdb_ESRI.dll" /implib:"../../../lib/$(PlatformName)/osgdb_ESRI.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /opt:ref /opt:icf /out:"$(OutDir)/osgdb_shp.dll" /implib:"../../../lib/$(PlatformName)/osgdb_shp.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" !ELSEIF "$(CFG)" == "osgPlugin ESRI - Win32 Debug" @@ -84,7 +84,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 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgdb_ESRId.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_ESRId.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /out:"$(OutDir)/osgdb_shpd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgdb_shpd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ELSEIF "$(CFG)" == "osgPlugin ESRI - Win32 Release Static" @@ -112,7 +112,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nodefaultlib /nologo /out:"$(OutDir)/osgdb_ESRI_s.lib" +# ADD LIB32 /nodefaultlib /nologo /out:"$(OutDir)/osgdb_shp_s.lib" # SUBTRACT LIB32 /nodefaultlib !ELSEIF "$(CFG)" == "osgPlugin ESRI - Win32 Debug Static" @@ -140,7 +140,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nodefaultlib /nologo /out:"$(OutDir)/osgdb_ESRId_s.lib" +# ADD LIB32 /nodefaultlib /nologo /out:"$(OutDir)/osgdb_shpd_s.lib" # SUBTRACT LIB32 /nodefaultlib !ENDIF