Merged in make system changes from Bob Kuehne <rpk@sgi.com>

[flightgear.git] / Astro / sky.c

diff --git a/Astro/sky.c b/Astro/sky.c
index 4de37c7369d10e2fbf7beaf02ed1b824c363d00c..282664bb985a4f38a987b727c355eca824117045 100644 (file)
--- a/Astro/sky.c
+++ b/Astro/sky.c
@@ -36,20 +36,21 @@
 */
 
 #include <GL/glut.h>
-#include "../XGL/xgl.h"
+#include <XGL/xgl.h>
 
-#include "sky.h"
+#include <Astro/sky.h>
 
-#include "../Time/event.h"
-#include "../Time/fg_time.h"
+#include <Time/event.h>
+#include <Time/fg_time.h>
+
+#include <Aircraft/aircraft.h>
+#include <Flight/flight.h>
+#include <Include/constants.h>
+#include <Main/views.h>
+#include <Math/fg_random.h>
 
-#include "../Aircraft/aircraft.h"
-#include "../Flight/flight.h"
-#include "../Include/constants.h"
-#include "../Main/views.h"
-#include "../Math/fg_random.h"
 /*
-#include "../Include/general.h"
+#include <Include/general.h>
 */
 
 /* in meters of course */
@@ -72,7 +73,7 @@ static float outer_color[12][4];
 
 
 /* Calculate the sky structure vertices */
-void fgSkyVerticesInit() {
+void fgSkyVerticesInit( void ) {
     float theta;
     int i;
 
@@ -101,7 +102,7 @@ void fgSkyVerticesInit() {
 
 
 /* (Re)calculate the sky colors at each vertex */
-void fgSkyColorsInit() {
+void fgSkyColorsInit( void ) {
     struct fgLIGHT *l;
     float sun_angle, diff;
     float outer_param[3], outer_amt[3], outer_diff[3];
@@ -224,7 +225,7 @@ void fgSkyColorsInit() {
 
 
 /* Initialize the sky structure and colors */
-void fgSkyInit() {
+void fgSkyInit( void ) {
     printf("Initializing the sky\n");
 
     fgSkyVerticesInit();
@@ -236,7 +237,7 @@ void fgSkyInit() {
 
 
 /* Draw the Sky */
-void fgSkyRender() {
+void fgSkyRender( void ) {
     struct fgFLIGHT *f;
     struct fgLIGHT *l;
     struct fgVIEW *v;
@@ -329,9 +330,17 @@ void fgSkyRender() {
 
 
 /* $Log$
-/* Revision 1.1  1998/01/07 03:16:19  curt
-/* Moved from .../Src/Scenery/ to .../Src/Astro/
+/* Revision 1.3  1998/01/19 19:26:59  curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
 /*
+ * Revision 1.2  1998/01/19 18:40:17  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
+ * Revision 1.1  1998/01/07 03:16:19  curt
+ * Moved from .../Src/Scenery/ to .../Src/Astro/
+ *
  * Revision 1.11  1997/12/30 22:22:38  curt
  * Further integration of event manager.
  *