Change the header install directory.

Clean up a couple warnings.

diff --git a/simgear/scene/sky/clouds3d/Makefile.am b/simgear/scene/sky/clouds3d/Makefile.am
index 35b6b90c27a6fe24d97e4b11b6051ac28854f6ab..9c8ff6f4d5ebe3d5e2b2e885358a135d652097ab 100644 (file)
--- a/simgear/scene/sky/clouds3d/Makefile.am
+++ b/simgear/scene/sky/clouds3d/Makefile.am
@@ -1,4 +1,4 @@
-includedir = @includedir@/sky
+includedir = @includedir@/sky/clouds3d
 
 lib_LIBRARIES = libsgclouds3d.a
 

diff --git a/simgear/scene/sky/clouds3d/SkyArchive.hpp b/simgear/scene/sky/clouds3d/SkyArchive.hpp
index 0385f951da3582c2ca053642a691580a7b24fcb1..a93dfbf26d582f03cd23bc6af52614698b1038bd 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyArchive.hpp
+++ b/simgear/scene/sky/clouds3d/SkyArchive.hpp
@@ -23,7 +23,7 @@
 #ifndef __SKYARCHIVE_HPP__
 #define __SKYARCHIVE_HPP__
 
-#pragma warning( disable : 4786 )
+// #pragma warning( disable : 4786 )
 
 #include "vec2f.hpp"
 #include "vec3f.hpp"

diff --git a/simgear/scene/sky/clouds3d/SkyLight.cpp b/simgear/scene/sky/clouds3d/SkyLight.cpp
index c71f16578e2e01b2090c42c90e3f7f910c82f3f4..0c0ca0aac3ed6776fcf3502a35f9486bbd94995c 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyLight.cpp
+++ b/simgear/scene/sky/clouds3d/SkyLight.cpp
@@ -19,7 +19,7 @@
  * 
  * Implementation of a class that maintains the state and operation of a light.
  */
-#pragma warning( disable : 4786)
+// #pragma warning( disable : 4786)
 
 #include "SkyLight.hpp"
 #include "SkyMaterial.hpp"

diff --git a/simgear/scene/sky/clouds3d/SkyMaterial.hpp b/simgear/scene/sky/clouds3d/SkyMaterial.hpp
index 255f8f9225a06fde7f9b52d88e706256f982c74f..27f570e218389b94149642d2dadf3168828dcf19 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyMaterial.hpp
+++ b/simgear/scene/sky/clouds3d/SkyMaterial.hpp
@@ -23,7 +23,7 @@
 #ifndef __SKYMATERIAL_HPP__
 #define __SKYMATERIAL_HPP__
 
-#pragma warning( disable : 4786)
+// #pragma warning( disable : 4786)
 
 #include "vec4f.hpp"
 #include "SkyUtil.hpp"

diff --git a/simgear/scene/sky/clouds3d/SkyTexture.hpp b/simgear/scene/sky/clouds3d/SkyTexture.hpp
index 5bb515c270c5ea5b63ced4b56cf9421fdbd71df7..c32de55dd35338441a2746007045630275c92a97 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyTexture.hpp
+++ b/simgear/scene/sky/clouds3d/SkyTexture.hpp
@@ -23,7 +23,7 @@
 #ifndef __SKYTEXTURE_HPP__
 #define __SKYTEXTURE_HPP__
 
-#pragma warning( disable : 4786 )
+// #pragma warning( disable : 4786 )
 
 #include <GL/glut.h>
 

diff --git a/simgear/scene/sky/clouds3d/SkyTextureManager.hpp b/simgear/scene/sky/clouds3d/SkyTextureManager.hpp
index 0bda600de9b956338a607aae3d1368dfc077633b..92fbee5c7bf7c3b54f11738101ff83949b88eff6 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyTextureManager.hpp
+++ b/simgear/scene/sky/clouds3d/SkyTextureManager.hpp
@@ -22,7 +22,7 @@
 #ifndef SKYTEXTUREMANAGER_HPP
 #define SKYTEXTUREMANAGER_HPP
 
-#pragma warning( disable : 4786)
+// #pragma warning( disable : 4786)
 
 #include "SkySingleton.hpp"
 #include "SkyTexture.hpp"