diff --git a/VisualStudio/VisualStudio.dsw b/VisualStudio/VisualStudio.dsw index 002874f33..0567394b6 100644 --- a/VisualStudio/VisualStudio.dsw +++ b/VisualStudio/VisualStudio.dsw @@ -2286,7 +2286,7 @@ Package=<4> ############################################################################### -Project: "osgPlugin obj"=.\osgPlugins\obj\obj.dsp - Package Owner=<4> +Project: "osgPlugin net"=".\osgPlugins\net\net.dsp" - Package Owner=<4> Package=<5> {{{ @@ -2294,15 +2294,6 @@ 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 new file mode 100644 index 000000000..da10ef414 --- /dev/null +++ b/VisualStudio/osgPlugins/net/net.dsp @@ -0,0 +1,133 @@ +# Microsoft Developer Studio Project File - Name="osgPlugin net" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=osgPlugin net - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "osgPlugin net.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "osgPlugin net.mak" CFG="osgPlugin net - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "osgPlugin net - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "osgPlugin net - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "osgPlugin net - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "../../../lib" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +F90=df.exe +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSGPLUGINNET_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 OpenThreadsWin32.lib wsock32.lib /nologo /dll /machine:I386 /out:"../../../bin/osgdb_net.dll" + +!ELSEIF "$(CFG)" == "osgPlugin net - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "osgPlugin_net___Win32_Debug" +# PROP BASE Intermediate_Dir "osgPlugin_net___Win32_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "../../../lib" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +F90=df.exe +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSGPLUGINNET_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /vd0 /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /YX /FD /GZ /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 OpenThreadsWin32d.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"../../../bin/osgdb_netd.dll" /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "osgPlugin net - Win32 Release" +# Name "osgPlugin net - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\src\osgPlugins\net\makeDir.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\osgPlugins\net\ReaderWriterNET.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\osgPlugins\net\sockinet.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\osgPlugins\net\sockstream.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\..\src\osgPlugins\net\makeDir.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\osgPlugins\net\sockinet.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\osgPlugins\net\sockstream.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff --git a/src/osgPlugins/net/makeDir.cpp b/src/osgPlugins/net/makeDir.cpp index 4a38fea90..eba60c9b3 100644 --- a/src/osgPlugins/net/makeDir.cpp +++ b/src/osgPlugins/net/makeDir.cpp @@ -4,10 +4,12 @@ #include #include +#ifndef WIN32 #include #include #include #include +#endif #include #include @@ -19,6 +21,9 @@ namespace TemporaryFileUtils { bool makeDirectory( const std::string &path ) { +#ifdef WIN32 + return false; +#else char *cpath = new char[path.length()+1]; strcpy( cpath, path.c_str()); char *p = dirname(cpath); @@ -72,6 +77,7 @@ bool makeDirectory( const std::string &path ) paths.pop(); } return true; +#endif } }