From b430b3c8df8306618a3c7e686f54af77ad4b6bd6 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Thu, 5 Apr 2001 15:58:41 +0000
Subject: [PATCH] Added simgear/threads contributed by Bernie Bright.

---
 SimGear.dsp                | 480 +++++++++++++++++++++++++++++++++++++
 configure.in               |   1 +
 simgear/Makefile.am        |   1 +
 simgear/timing/Makefile.am |   8 +-
 simgear/xml/easyxml.hxx    |   1 +
 5 files changed, 484 insertions(+), 7 deletions(-)

diff --git a/SimGear.dsp b/SimGear.dsp
index d68ea377..1e79a3ef 100644
--- a/SimGear.dsp
+++ b/SimGear.dsp
@@ -243,6 +243,21 @@ SOURCE=.\simgear\ephemeris\neptune.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\simgear\ephemeris\pluto.hxx
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgephem"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgephem"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\simgear\ephemeris\saturn.cxx
 
 !IF  "$(CFG)" == "SimGear - Win32 Release"
@@ -416,6 +431,21 @@ SOURCE=.\simgear\io\sg_socket.cxx
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\simgear\magvar\coremag.hxx
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgmagvar"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgmagvar"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\simgear\magvar\coremag.cxx
 
 !IF  "$(CFG)" == "SimGear - Win32 Release"
@@ -634,6 +664,36 @@ SOURCE=.\simgear\metar\Fracpart.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\simgear\metar\Local.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgmetar"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgmetar"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\simgear\metar\Metar.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgmetar"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgmetar"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\simgear\metar\MetarReport.cpp
 
 !IF  "$(CFG)" == "SimGear - Win32 Release"
@@ -871,6 +931,21 @@ SOURCE=.\simgear\screen\GLBitmaps.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\simgear\screen\GLBitmaps.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgscreen"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgscreen"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\simgear\screen\screen-dump.cxx
 
 !IF  "$(CFG)" == "SimGear - Win32 Release"
@@ -883,6 +958,21 @@ SOURCE=.\simgear\screen\screen-dump.cxx
 
 !ENDIF 
 
+# End Source File
+# Begin Source File
+
+SOURCE=.\simgear\screen\win32-printer.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgscreen"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgscreen"
+
+!ENDIF 
+
 # End Source File
 # End Group
 # Begin Group "Lib_sgserial"
@@ -1108,6 +1198,21 @@ SOURCE=.\simgear\timing\event.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\simgear\timing\event.hxx
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgtiming"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgtiming"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\simgear\timing\#
 
 !IF  "$(CFG)" == "SimGear - Win32 Release"
@@ -1138,6 +1243,21 @@ SOURCE=.\simgear\timing\fg_timer.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\simgear\timing\fg_timer.hxx
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgtiming"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgtiming"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\simgear\timing\#
 
 !IF  "$(CFG)" == "SimGear - Win32 Release"
@@ -1168,6 +1288,21 @@ SOURCE=.\simgear\timing\light.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\simgear\timing\light.hxx
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgtiming"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgtiming"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\simgear\timing\#
 
 !IF  "$(CFG)" == "SimGear - Win32 Release"
@@ -1198,6 +1333,21 @@ SOURCE=.\simgear\timing\moonpos.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\simgear\timing\moonpos.hxx
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgtiming"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgtiming"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\simgear\timing\#
 
 !IF  "$(CFG)" == "SimGear - Win32 Release"
@@ -1228,6 +1378,21 @@ SOURCE=.\simgear\timing\sunpos.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\simgear\timing\sunpos.hxx
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgtiming"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgtiming"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\simgear\timing\#
 
 !IF  "$(CFG)" == "SimGear - Win32 Release"
@@ -1240,6 +1405,21 @@ SOURCE=.\simgear\timing\#
 
 !ENDIF 
 
+# End Source File
+# Begin Source File
+
+SOURCE=.\simgear\timing\timestamp.hxx
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgtiming"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgtiming"
+
+!ENDIF 
+
 # End Source File
 # End Group
 # Begin Group "Lib_sgxgl"
@@ -1281,6 +1461,21 @@ SOURCE=.\simgear\xgl\xglUtils.c
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\simgear\xml\asciitab.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgxml"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgxml"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\simgear\xml\easyxml.cxx
 
 !IF  "$(CFG)" == "SimGear - Win32 Release"
@@ -1296,6 +1491,21 @@ SOURCE=.\simgear\xml\easyxml.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\simgear\xml\hashtable.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgxml"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgxml"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\simgear\xml\hashtable.c
 
 !IF  "$(CFG)" == "SimGear - Win32 Release"
@@ -1311,6 +1521,96 @@ SOURCE=.\simgear\xml\hashtable.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\simgear\xml\iasciitab.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgxml"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgxml"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\simgear\xml\latin1tab.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgxml"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgxml"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\simgear\xml\nametab.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgxml"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgxml"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\simgear\xml\utf8tab.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgxml"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgxml"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\simgear\xml\xmldef.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgxml"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgxml"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\simgear\xml\xmlparse.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgxml"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgxml"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\simgear\xml\xmlparse.c
 
 !IF  "$(CFG)" == "SimGear - Win32 Release"
@@ -1326,6 +1626,21 @@ SOURCE=.\simgear\xml\xmlparse.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\simgear\xml\xmlrole.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgxml"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgxml"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\simgear\xml\xmlrole.c
 
 !IF  "$(CFG)" == "SimGear - Win32 Release"
@@ -1341,6 +1656,21 @@ SOURCE=.\simgear\xml\xmlrole.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\simgear\xml\xmltok.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgxml"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgxml"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\simgear\xml\xmltok.c
 
 !IF  "$(CFG)" == "SimGear - Win32 Release"
@@ -1353,6 +1683,21 @@ SOURCE=.\simgear\xml\xmltok.c
 
 !ENDIF 
 
+# End Source File
+# Begin Source File
+
+SOURCE=.\simgear\xml\xmltok_impl.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgxml"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgxml"
+
+!ENDIF 
+
 # End Source File
 # End Group
 # Begin Group "Lib_z"
@@ -1420,6 +1765,21 @@ SOURCE=.\simgear\zlib\deflate.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\simgear\zlib\deflate.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_z"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_z"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\simgear\zlib\gzio.c
 
 !IF  "$(CFG)" == "SimGear - Win32 Release"
@@ -1450,6 +1810,21 @@ SOURCE=.\simgear\zlib\infblock.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\simgear\zlib\infblock.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_z"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_z"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\simgear\zlib\infcodes.c
 
 !IF  "$(CFG)" == "SimGear - Win32 Release"
@@ -1465,6 +1840,21 @@ SOURCE=.\simgear\zlib\infcodes.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\simgear\zlib\infcodes.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_z"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_z"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\simgear\zlib\inffast.c
 
 !IF  "$(CFG)" == "SimGear - Win32 Release"
@@ -1480,6 +1870,36 @@ SOURCE=.\simgear\zlib\inffast.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\simgear\zlib\inffast.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_z"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_z"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\simgear\zlib\inffixed.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_z"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_z"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\simgear\zlib\inflate.c
 
 !IF  "$(CFG)" == "SimGear - Win32 Release"
@@ -1510,6 +1930,21 @@ SOURCE=.\simgear\zlib\inftrees.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\simgear\zlib\inftrees.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_z"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_z"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\simgear\zlib\infutil.c
 
 !IF  "$(CFG)" == "SimGear - Win32 Release"
@@ -1525,6 +1960,21 @@ SOURCE=.\simgear\zlib\infutil.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\simgear\zlib\infutil.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_z"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_z"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\simgear\zlib\trees.c
 
 !IF  "$(CFG)" == "SimGear - Win32 Release"
@@ -1540,6 +1990,21 @@ SOURCE=.\simgear\zlib\trees.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\simgear\zlib\trees.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_z"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_z"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\simgear\zlib\uncompr.c
 
 !IF  "$(CFG)" == "SimGear - Win32 Release"
@@ -1567,6 +2032,21 @@ SOURCE=.\simgear\zlib\zutil.c
 
 !ENDIF 
 
+# End Source File
+# Begin Source File
+
+SOURCE=.\simgear\zlib\zutil.h
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_z"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_z"
+
+!ENDIF 
+
 # End Source File
 # End Group
 # End Target
diff --git a/configure.in b/configure.in
index 083e3a55..07942fe7 100644
--- a/configure.in
+++ b/configure.in
@@ -279,6 +279,7 @@ AC_OUTPUT( \
 	simgear/screen/Makefile \
 	simgear/serial/Makefile \
 	simgear/sky/Makefile \
+	simgear/threads/Makefile \
 	simgear/timing/Makefile \
 	simgear/xgl/Makefile \
 	simgear/xml/Makefile \
diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index 56d6c4bf..3078a18d 100644
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -38,6 +38,7 @@ SUBDIRS = \
 	screen \
 	$(SERIAL_DIRS) \
 	sky \
+        threads \
 	timing \
 	xgl \
 	$(ZLIB_DIRS)
diff --git a/simgear/timing/Makefile.am b/simgear/timing/Makefile.am
index 9bd6bfff..ffe602fe 100644
--- a/simgear/timing/Makefile.am
+++ b/simgear/timing/Makefile.am
@@ -13,12 +13,6 @@ libsgtiming_a_SOURCES = \
 	geocoord.cxx \
 	lowleveltime.cxx \
 	sg_time.cxx \
-	timezone.cxx \
-	# event.cxx event.hxx \
-	# fg_timer.cxx fg_timer.hxx \
-	# light.cxx light.hxx \
-	# moonpos.cxx moonpos.hxx \
-	# sunpos.cxx sunpos.hxx \
-	# timestamp.hxx
+	timezone.cxx
 
 INCLUDES += -I$(top_srcdir)
diff --git a/simgear/xml/easyxml.hxx b/simgear/xml/easyxml.hxx
index b042ab39..1eee84eb 100644
--- a/simgear/xml/easyxml.hxx
+++ b/simgear/xml/easyxml.hxx
@@ -376,6 +376,7 @@ public:
 
 
 /**
+ * @relates XMLVisitor
  * Read an XML document.
  *
  * This function reads an XML document from the input stream provided,
-- 
2.39.5