fly/flightgear
1
0
Fork 0
Code Activity

Build only static libraries.

Browse source 
Declare memmove/memset for Sloaris.
This commit is contained in:
curt 1998-06-12 00:55:58 +00:00
parent 6c0d4504d8
commit 7b98736e32
8 changed files with 58 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Cockpit/Makefile.am
View file

@ -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

17
Cockpit/hud.cxx
View file

@ -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.
*

17
Cockpit/hud.hxx
View file

@ -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.
*

6
Scenery/Makefile.am
View file

@ -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 \

6
Scenery/material.cxx
View file

@ -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.
//

9
Scenery/material.hxx
View file

@ -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.
//

9
Scenery/obj.cxx
View file

@ -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.
//

9
Scenery/tile.hxx
View file

@ -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.
//