Build only static libraries.

Declare memmove/memset for Sloaris.

diff --git a/Cockpit/Makefile.am b/Cockpit/Makefile.am
index 2b3be56a3819abaa86fb7a0b608c76c9723dc9af..b09ad7fb308e2f7ce9b0306152c3e5dde93cb553 100644 (file)
--- a/Cockpit/Makefile.am
+++ b/Cockpit/Makefile.am
@@ -1,7 +1,6 @@
-libdir = ${exec_prefix}/lib
+noinst_LIBRARIES = libCockpit.a
 
-lib_LTLIBRARIES = libCockpit.la
-libCockpit_la_SOURCES = \
+libCockpit_a_SOURCES = \
        cockpit.cxx cockpit.hxx \
        hud.cxx hud.hxx
 

diff --git a/Cockpit/hud.cxx b/Cockpit/hud.cxx
index bfad1f39df9a3007466022b4b6076e0278220619..6dc3a86e696b4145a128de0120f40d353901e546 100644 (file)
--- a/Cockpit/hud.cxx
+++ b/Cockpit/hud.cxx
@@ -53,13 +53,6 @@
 #include "hud.hxx"
 
 
-#ifdef __sun__
-extern "C" {
-  extern void *memmove(void *, const void *, size_t);
-}
-#endif
-
-
 // The following routines obtain information concerntin the aircraft's
 // current state and return it to calling instrument display routines.
 // They should eventually be member functions of the aircraft.
@@ -1923,10 +1916,14 @@ void fgUpdateHUD( void ) {
 }
 
 /* $Log$
-/* Revision 1.11  1998/06/05 18:17:10  curt
-/* Added the declaration of memmove needed by the stl which apparently
-/* solaris only defines for cc compilations and not for c++ (__STDC__)
+/* Revision 1.12  1998/06/12 00:55:59  curt
+/* Build only static libraries.
+/* Declare memmove/memset for Sloaris.
 /*
+ * Revision 1.11  1998/06/05 18:17:10  curt
+ * Added the declaration of memmove needed by the stl which apparently
+ * solaris only defines for cc compilations and not for c++ (__STDC__)
+ *
  * Revision 1.10  1998/05/17 16:58:12  curt
  * Added a View Frustum Culling ratio display to the hud.
  *

diff --git a/Cockpit/hud.hxx b/Cockpit/hud.hxx
index f62575bda77c2d237f865066ddda60158371cb71..8ef19ca71c912ac4c9a4056f022f8dd530a95b59 100644 (file)
--- a/Cockpit/hud.hxx
+++ b/Cockpit/hud.hxx
@@ -33,11 +33,18 @@
 #endif
 
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
+#ifdef __sun__
+extern "C" void *memmove(void *, const void *, size_t);
+extern "C" void *memset(void *, int, size_t);
+#endif
 
 #include <fg_typedefs.h>
 #include <fg_constants.h>
+
 #include <Aircraft/aircraft.h>
 #include <Flight/flight.h>
 #include <Controls/controls.h>
@@ -446,9 +453,13 @@ void fgHUDSetTimeMode( Hptr hud, int time_of_day );
 #endif // _HUD_H
 
 /* $Log$
-/* Revision 1.6  1998/06/03 00:43:28  curt
-/* No .h when including stl stuff.
+/* Revision 1.7  1998/06/12 00:56:00  curt
+/* Build only static libraries.
+/* Declare memmove/memset for Sloaris.
 /*
+ * Revision 1.6  1998/06/03 00:43:28  curt
+ * No .h when including stl stuff.
+ *
  * Revision 1.5  1998/05/17 16:58:13  curt
  * Added a View Frustum Culling ratio display to the hud.
  *

diff --git a/Scenery/Makefile.am b/Scenery/Makefile.am
index 85edaa0510c93967f7e1437dbf7b79382251faec..91a7ad6ccf2b3da113ab2ebeb616c763a43c73ee 100644 (file)
--- a/Scenery/Makefile.am
+++ b/Scenery/Makefile.am
@@ -1,8 +1,6 @@
-libdir = ${exec_prefix}/lib
+noinst_LIBRARIES = libScenery.a
 
-lib_LTLIBRARIES = libScenery.la
-
-libScenery_la_SOURCES = \
+libScenery_a_SOURCES = \
        material.cxx material.hxx \
        obj.cxx obj.hxx \
        scenery.cxx scenery.hxx \

diff --git a/Scenery/material.cxx b/Scenery/material.cxx
index 8f4a5676141a7f966a9f338f782de7d338009b13..fda7716ba0504d4f5bc48c0b0d0e5ad66cd7aa8d 100644 (file)
--- a/Scenery/material.cxx
+++ b/Scenery/material.cxx
@@ -33,6 +33,8 @@
 #include <GL/glut.h>
 #include <XGL/xgl.h>
 
+#include <string.h>
+
 #include <Debug/fg_debug.h>
 #include <Include/fg_zlib.h>
 #include <Main/options.hxx>
@@ -207,6 +209,10 @@ fgMATERIAL_MGR::~fgMATERIAL_MGR ( void ) {
 
 
 // $Log$
+// Revision 1.4  1998/06/12 00:58:04  curt
+// Build only static libraries.
+// Declare memmove/memset for Sloaris.
+//
 // Revision 1.3  1998/06/05 22:39:53  curt
 // Working on sorting by, and rendering by material properties.
 //

diff --git a/Scenery/material.hxx b/Scenery/material.hxx
index 83a882042effb4dbed7f5ee462a8d0a37cc37e37..83a05a6fe46eb3b70b0500cff2d0380ca06d9bd4 100644 (file)
--- a/Scenery/material.hxx
+++ b/Scenery/material.hxx
@@ -41,6 +41,11 @@
 #include <GL/glut.h>
 #include <XGL/xgl.h>
 
+#ifdef __sun__
+extern "C" void *memmove(void *, const void *, size_t);
+extern "C" void *memset(void *, int, size_t);
+#endif
+
 #include <map>             // STL associative "array"
 #include <string>          // Standard C++ string library
 
@@ -108,6 +113,10 @@ extern fgMATERIAL_MGR material_mgr;
 
 
 // $Log$
+// Revision 1.7  1998/06/12 00:58:04  curt
+// Build only static libraries.
+// Declare memmove/memset for Sloaris.
+//
 // Revision 1.6  1998/06/06 01:09:31  curt
 // I goofed on the log message in the last commit ... now fixed.
 //

diff --git a/Scenery/obj.cxx b/Scenery/obj.cxx
index 4d09c8b1253782302d65a84eb15eec3d59343225..4243d5595d1da10007459eb6df9b0f8f49d20a0a 100644 (file)
--- a/Scenery/obj.cxx
+++ b/Scenery/obj.cxx
@@ -35,6 +35,11 @@
 #include <GL/glut.h>
 #include <XGL/xgl.h>
 
+#ifdef __sun__
+extern "C" void *memmove(void *, const void *, size_t);
+extern "C" void *memset(void *, int, size_t);
+#endif
+
 #include <map>     // STL
 #include <string>  // Standard C++ library
 
@@ -431,6 +436,10 @@ int fgObjLoad(char *path, fgTILE *tile) {
 
 
 // $Log$
+// Revision 1.13  1998/06/12 00:58:05  curt
+// Build only static libraries.
+// Declare memmove/memset for Sloaris.
+//
 // Revision 1.12  1998/06/08 17:57:54  curt
 // Working first pass at material proporty sorting.
 //

diff --git a/Scenery/tile.hxx b/Scenery/tile.hxx
index 3f4c8d96a10039e3ee08e87f9ea05ec9c1010efc..295117936ecd9c3bcb8490fc4e80c832e1345632 100644 (file)
--- a/Scenery/tile.hxx
+++ b/Scenery/tile.hxx
@@ -41,6 +41,11 @@
 #include <GL/glut.h>
 #include <XGL/xgl.h>
 
+#ifdef __sun__
+extern "C" void *memmove(void *, const void *, size_t);
+extern "C" void *memset(void *, int, size_t);
+#endif
+
 #include <list>         // STL list
 
 #include <Bucket/bucketutils.h>
@@ -105,6 +110,10 @@ public:
 
 
 // $Log$
+// Revision 1.7  1998/06/12 00:58:05  curt
+// Build only static libraries.
+// Declare memmove/memset for Sloaris.
+//
 // Revision 1.6  1998/06/08 17:57:54  curt
 // Working first pass at material proporty sorting.
 //