From bf0cbf6b10c552e2bfb4fe84da2e44626ec853a6 Mon Sep 17 00:00:00 2001 From: Don BURNS Date: Fri, 29 Nov 2002 22:10:12 +0000 Subject: [PATCH] Modified Files: include/osgTXP/trPagePageManager.h src/Demos/osgtxp/osgtxp.cpp Added Files: VisualStudio/Demos/osgtxp/osgtxp.dsp --- VisualStudio/Demos/osgtxp/osgtxp.dsp | 102 +++++++++++++++++++++++++++ include/osgTXP/trPagePageManager.h | 12 +--- src/Demos/osgtxp/osgtxp.cpp | 2 +- 3 files changed, 104 insertions(+), 12 deletions(-) create mode 100644 VisualStudio/Demos/osgtxp/osgtxp.dsp diff --git a/VisualStudio/Demos/osgtxp/osgtxp.dsp b/VisualStudio/Demos/osgtxp/osgtxp.dsp new file mode 100644 index 000000000..4a959bcd4 --- /dev/null +++ b/VisualStudio/Demos/osgtxp/osgtxp.dsp @@ -0,0 +1,102 @@ +# Microsoft Developer Studio Project File - Name="osgtxp" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=osgtxp - 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 "osgtxp.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 "osgtxp.mak" CFG="osgtxp - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "osgtxp - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "osgtxp - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "osgtxp - 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 "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x41a /d "NDEBUG" +# ADD RSC /l 0x41a /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 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 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 glut32.lib /nologo /subsystem:console /machine:I386 /out:"../../../bin/osgtxp.exe" + +!ELSEIF "$(CFG)" == "osgtxp - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE RSC /l 0x41a /d "_DEBUG" +# ADD RSC /l 0x41a /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 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 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 glut32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../bin/osgtxpd.exe" /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "osgtxp - Win32 Release" +# Name "osgtxp - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\src\Demos\osgtxp\osgtxp.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# 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/include/osgTXP/trPagePageManager.h b/include/osgTXP/trPagePageManager.h index bb23e5163..3e0d1e530 100644 --- a/include/osgTXP/trPagePageManager.h +++ b/include/osgTXP/trPagePageManager.h @@ -45,20 +45,10 @@ namespace txp typedef HANDLE ThreadID; typedef HANDLE ThreadMutex; typedef HANDLE ThreadEvent; -#endif - -#if !defined(ThreadID) - /* - // Stubs to make it compile - typedef int ThreadID; - typedef int ThreadMutex; - typedef int ThreadEvent; - */ - +#else typedef pthread_t ThreadID; typedef pthread_mutex_t ThreadMutex; typedef osgTXP::WaitBlock ThreadEvent; - #endif /* OSG Page Manager diff --git a/src/Demos/osgtxp/osgtxp.cpp b/src/Demos/osgtxp/osgtxp.cpp index 028f6ef10..40132b209 100644 --- a/src/Demos/osgtxp/osgtxp.cpp +++ b/src/Demos/osgtxp/osgtxp.cpp @@ -78,7 +78,7 @@ int main( int argc, char **argv ) // configure the plugin registry from the commandline arguments, and // eat any parameters that have been matched. - osgDB::readCommandLine(commandLine); + //osgDB::readCommandLine(commandLine); // Initialize the TXP database bool loadAll = false;