From e17338622adfd9698ab744c44414555a36a8dc34 Mon Sep 17 00:00:00 2001 From: curt Date: Sun, 15 Sep 2002 04:32:28 +0000 Subject: [PATCH] Change the header install directory. Clean up a couple warnings. --- simgear/scene/sky/clouds3d/Makefile.am | 2 +- simgear/scene/sky/clouds3d/SkyArchive.hpp | 2 +- simgear/scene/sky/clouds3d/SkyLight.cpp | 2 +- simgear/scene/sky/clouds3d/SkyMaterial.hpp | 2 +- simgear/scene/sky/clouds3d/SkyTexture.hpp | 2 +- simgear/scene/sky/clouds3d/SkyTextureManager.hpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/simgear/scene/sky/clouds3d/Makefile.am b/simgear/scene/sky/clouds3d/Makefile.am index 35b6b90c..9c8ff6f4 100644 --- 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 0385f951..a93dfbf2 100644 --- 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 c71f1657..0c0ca0aa 100644 --- 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 255f8f92..27f570e2 100644 --- 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 5bb515c2..c32de55d 100644 --- 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 diff --git a/simgear/scene/sky/clouds3d/SkyTextureManager.hpp b/simgear/scene/sky/clouds3d/SkyTextureManager.hpp index 0bda600d..92fbee5c 100644 --- 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" -- 2.39.5