diff --git a/src/OpenThreads/pthreads/GNUmakefile b/src/OpenThreads/pthreads/GNUmakefile deleted file mode 100644 index a800725fd..000000000 --- a/src/OpenThreads/pthreads/GNUmakefile +++ /dev/null @@ -1,46 +0,0 @@ -TOPDIR = ../. -include $(TOPDIR)/Make/makedefs - -C++FILES = \ - PThread.c++ \ - PThreadMutex.c++ \ - PThreadCondition.c++ \ - PThreadBarrier.c++ \ - $(NULL) - -INC += -I$(TOPDIR)/include -I. - -ifeq ($(OS),Linux) -DEF += -fPIC -DLinux -DGL_GLEXT_PROTOTYPES -LIBS += -lpthread -endif - -ifeq ($(OS),SunOS) -LIBS += -lpthread -lposix4 -endif - -ifeq ($(OS),IRIX) -LIBS += -lpthread -endif - -ifeq ($(OS),Darwin) -LIBS += -lpthread -endif - -ifeq ($(OS),CYGWIN) -LIBS += -lpthread -DEF += -DOPENTHREADS_EXPORTS -endif - -ifeq ($(OS),MINGW) -LIBS += -lpthread -lwinmm -DEF += -DOPENTHREADS_EXPORTS -endif - -TARGET_BASENAME = OpenThreads -LIB = $(LIB_PREFIX)$(TARGET_BASENAME) - -ifeq ($(COMPILE_USING_TWO_PARAM_sched_setaffinity),yes) -DEF += -DCOMPILE_USING_TWO_PARAM_sched_setaffinity -endif -include $(TOPDIR)/Make/makerules diff --git a/src/OpenThreads/sproc/GNUmakefile b/src/OpenThreads/sproc/GNUmakefile deleted file mode 100644 index 1da6eda22..000000000 --- a/src/OpenThreads/sproc/GNUmakefile +++ /dev/null @@ -1,17 +0,0 @@ -TOPDIR = ../. -include $(TOPDIR)/Make/makedefs - -C++FILES = \ - SprocThread.c++ \ - SprocMutex.c++ \ - SprocBarrier.c++ \ - SprocCondition.c++ \ - SharedArena.c++ \ - $(NULL) - -INC += -I$(TOPDIR)/include -I. - -TARGET_BASENAME = OpenThreads -LIB = libOpenThreads - -include $(TOPDIR)/Make/makerules diff --git a/src/OpenThreads/win32/GNUmakefile b/src/OpenThreads/win32/GNUmakefile deleted file mode 100755 index 163b0cc8b..000000000 --- a/src/OpenThreads/win32/GNUmakefile +++ /dev/null @@ -1,38 +0,0 @@ -TOPDIR = ../. -include $(TOPDIR)/Make/makedefs - -CXXFILES = \ - WIN32Condition.cpp \ - Win32Mutex.cpp \ - Win32Thread.cpp \ - Win32ThreadBarrier.cpp \ - $(NULL) - -INC += -I$(TOPDIR)/include -I. - -ifeq ($(OS),Linux) -DEF += -fPIC -DLinux -DGL_GLEXT_PROTOTYPES -LIBS += -lpthread -endif - -ifeq ($(OS),SunOS) -LIBS += -lpthread -lposix4 -endif - -ifeq ($(OS),IRIX) -LIBS += -lpthread -endif - -ifeq ($(OS),Darwin) -LIBS += -lpthread -endif - -ifeq ($(OS),MINGW) -LIBS += -DEF += -DOPENTHREADS_EXPORTS -endif - -TARGET_BASENAME = OpenThreads -LIB = $(LIB_PREFIX)$(TARGET_BASENAME) - -include $(TOPDIR)/Make/makerules diff --git a/src/OpenThreads/win32/OpenThreads.dsp b/src/OpenThreads/win32/OpenThreads.dsp deleted file mode 100755 index 7e40f281c..000000000 --- a/src/OpenThreads/win32/OpenThreads.dsp +++ /dev/null @@ -1,231 +0,0 @@ -# Microsoft Developer Studio Project File - Name="OpenThreads" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=OpenThreads - 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 "OpenThreads.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 "OpenThreads.mak" CFG="OpenThreads - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "OpenThreads - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "OpenThreads - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "OpenThreads - Win32 Release Static" (based on "Win32 (x86) Static Library") -!MESSAGE "OpenThreads - Win32 Debug Static" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" - -!IF "$(CFG)" == "OpenThreads - 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 "../bin/$(PlatformName)" -# PROP Intermediate_Dir "$(PlatformName)/$(ConfigurationName)" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -CPP=cl.exe -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OPENTHREADS_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OPENTHREADS_EXPORTS" /YX /FD /c -MTL=midl.exe -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -RSC=rc.exe -# 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 /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 /nologo /dll /debug /machine:I386 /pdbtype:sept /opt:ref /opt:icf /out:"$(OutDir)/OpenThreadsWin32.dll" /implib:"../lib/$(PlatformName)/OpenThreadsWin32.lib" - -!ELSEIF "$(CFG)" == "OpenThreads - 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 "../bin/$(PlatformName)" -# PROP Intermediate_Dir "$(PlatformName)/$(ConfigurationName)" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -CPP=cl.exe -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OPENTHREADS_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OPENTHREADS_EXPORTS" /YX /FD /GZ /c -MTL=midl.exe -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -RSC=rc.exe -# 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 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 /out:"$(OutDir)/OpenThreadsWin32d.dll" /implib:"../lib/$(PlatformName)/OpenThreadsWin32d.lib" - -!ELSEIF "$(CFG)" == "OpenThreads - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release_Static" -# PROP BASE Intermediate_Dir "Release_Static" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../lib/$(PlatformName)" -# PROP Intermediate_Dir "$(PlatformName)/$(ConfigurationName)_Static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -CPP=cl.exe -# ADD BASE CPP /nologo /MT /W3 /GR /GX /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OT_LIBRARY_STATIC" /D "OPENTHREADS_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "OT_LIBRARY_STATIC" /YX /FD /c -RSC=rc.exe -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"../lib/$(PlatformName)/OpenThreadsWin32_s.lib" - -!ELSEIF "$(CFG)" == "OpenThreads - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug_Static" -# PROP BASE Intermediate_Dir "Debug_Static" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../lib/$(PlatformName)" -# PROP Intermediate_Dir "$(PlatformName)/$(ConfigurationName)_Static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -CPP=cl.exe -# ADD BASE CPP /nologo /MTd /W3 /Gm /GR /GX /Z7 /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "OT_LIBRARY_STATIC" /D "OPENTHREADS_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Z7 /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "OT_LIBRARY_STATIC" /YX /FD /GZ /c -RSC=rc.exe -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"../lib/$(PlatformName)/OpenThreadsWin32d_s.lib" - -!ENDIF - -# Begin Target - -# Name "OpenThreads - Win32 Release" -# Name "OpenThreads - Win32 Debug" -# Name "OpenThreads - Win32 Release Static" -# Name "OpenThreads - Win32 Debug Static" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\WIN32Condition.cpp -# End Source File -# Begin Source File - -SOURCE=.\Win32Mutex.cpp -# End Source File -# Begin Source File - -SOURCE=.\Win32Thread.cpp -# End Source File -# Begin Source File - -SOURCE=.\Win32ThreadBarrier.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\include\OpenThreads\Barrier -# End Source File -# Begin Source File - -SOURCE=..\include\OpenThreads\Condition -# End Source File -# Begin Source File - -SOURCE=..\include\OpenThreads\Exports -# End Source File -# Begin Source File - -SOURCE=.\HandleHolder.h -# End Source File -# Begin Source File - -SOURCE=..\include\OpenThreads\Mutex -# End Source File -# Begin Source File - -SOURCE=..\include\OpenThreads\ScopedLock -# End Source File -# Begin Source File - -SOURCE=..\include\OpenThreads\Thread -# End Source File -# Begin Source File - -SOURCE=.\Win32BarrierPrivateData.h -# End Source File -# Begin Source File - -SOURCE=.\Win32ConditionPrivateData.h -# End Source File -# Begin Source File - -SOURCE=.\Win32MutexPrivateData.h -# End Source File -# Begin Source File - -SOURCE=.\Win32ThreadPrivateData.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/OpenThreads/win32/OpenThreads.dsw b/src/OpenThreads/win32/OpenThreads.dsw deleted file mode 100755 index be8b59a23..000000000 --- a/src/OpenThreads/win32/OpenThreads.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "OpenThreads"=.\OpenThreads.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### -