From 97b6183f50131998f1487e98255d0fd29273ffab Mon Sep 17 00:00:00 2001
From: Amorilia <amorilia@users.sourceforge.net>
Date: Sun, 11 Jun 2006 17:49:37 +0000
Subject: [PATCH] Trying to make things compile again using SCons and VS 2005
 Express. Regenerated all the code in the gen/ folder (no more publics in
 NiLight, optimized "Ref.h" include).

---
 SConstruct           | 2 +-
 Type.h               | 1 +
 gen/AVObject.h       | 1 -
 gen/Bones.h          | 1 -
 gen/ControllerLink.h | 4 +++-
 gen/Footer.h         | 4 +++-
 gen/Header.h         | 1 +
 gen/NodeGroup.h      | 4 +++-
 gen/ShaderTexDesc.h  | 1 +
 gen/SkinData.h       | 1 +
 gen/SkinShape.h      | 4 +++-
 gen/SkinShapeGroup.h | 1 +
 gen/TexDesc.h        | 4 +++-
 gen/TexSource.h      | 4 +++-
 gen/obj_defines.h    | 1 -
 15 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/SConstruct b/SConstruct
index 9d1bd35f..9545cc39 100644
--- a/SConstruct
+++ b/SConstruct
@@ -24,7 +24,7 @@ elif sys.platform == 'win32':
     python_include = [sysconfig.get_python_inc()]
     python_libpath = [sysconfig.get_python_lib(1, 1) + '/../libs']
     python_lib = ['python24']
-    cppflags = '/EHsc /O2 /ML /GS /Zi /TP'
+    cppflags = '/EHsc /O2 /GS /Zi /TP'
 else:
     print "Error: Platform %s not supported."%sys.platform
     Exit(1)
diff --git a/Type.h b/Type.h
index 364e4196..2902cc72 100644
--- a/Type.h
+++ b/Type.h
@@ -5,6 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _TYPE_H_
 
 #include <string>
+#include "dll_export.h"
 
 using namespace std;
 
diff --git a/gen/AVObject.h b/gen/AVObject.h
index daf775fb..08231cdc 100644
--- a/gen/AVObject.h
+++ b/gen/AVObject.h
@@ -7,7 +7,6 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "../NIF_IO.h"
 
 // Forward define of referenced blocks
-#include "../Ref.h"
 class NiAVObject;
 
 /*!
diff --git a/gen/Bones.h b/gen/Bones.h
index 8834b774..c8188059 100644
--- a/gen/Bones.h
+++ b/gen/Bones.h
@@ -7,7 +7,6 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "../NIF_IO.h"
 
 // Forward define of referenced blocks
-#include "../Ref.h"
 class NiNode;
 
 /*!
diff --git a/gen/ControllerLink.h b/gen/ControllerLink.h
index e65fda6d..ce949b5d 100644
--- a/gen/ControllerLink.h
+++ b/gen/ControllerLink.h
@@ -6,8 +6,10 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-// Forward define of referenced blocks
+// Include structures
 #include "../Ref.h"
+
+// Forward define of referenced blocks
 class NiInterpolator;
 class NiObject;
 class NiStringPalette;
diff --git a/gen/Footer.h b/gen/Footer.h
index 2b223aec..0537e040 100644
--- a/gen/Footer.h
+++ b/gen/Footer.h
@@ -6,8 +6,10 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-// Forward define of referenced blocks
+// Include structures
 #include "../Ref.h"
+
+// Forward define of referenced blocks
 class NiAVObject;
 #include "../obj/NiObject.h"
 
diff --git a/gen/Header.h b/gen/Header.h
index 0c0fc722..575863cf 100644
--- a/gen/Header.h
+++ b/gen/Header.h
@@ -5,6 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _HEADER_H_
 
 #include "../NIF_IO.h"
+
 // Include structures
 #include "ShortString.h"
 #include "../obj/NiObject.h"
diff --git a/gen/NodeGroup.h b/gen/NodeGroup.h
index 8eb6ae83..12354302 100644
--- a/gen/NodeGroup.h
+++ b/gen/NodeGroup.h
@@ -6,8 +6,10 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-// Forward define of referenced blocks
+// Include structures
 #include "../Ref.h"
+
+// Forward define of referenced blocks
 class NiNode;
 
 /*!
diff --git a/gen/ShaderTexDesc.h b/gen/ShaderTexDesc.h
index e837edb7..4b738818 100644
--- a/gen/ShaderTexDesc.h
+++ b/gen/ShaderTexDesc.h
@@ -5,6 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _SHADERTEXDESC_H_
 
 #include "../NIF_IO.h"
+
 // Include structures
 #include "TexDesc.h"
 
diff --git a/gen/SkinData.h b/gen/SkinData.h
index aa0cb209..8e4e78fc 100644
--- a/gen/SkinData.h
+++ b/gen/SkinData.h
@@ -5,6 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _SKINDATA_H_
 
 #include "../NIF_IO.h"
+
 // Include structures
 #include "SkinWeight.h"
 
diff --git a/gen/SkinShape.h b/gen/SkinShape.h
index 9e84582c..51fab527 100644
--- a/gen/SkinShape.h
+++ b/gen/SkinShape.h
@@ -6,8 +6,10 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-// Forward define of referenced blocks
+// Include structures
 #include "../Ref.h"
+
+// Forward define of referenced blocks
 class NiTriShape;
 class NiSkinInstance;
 
diff --git a/gen/SkinShapeGroup.h b/gen/SkinShapeGroup.h
index 250c0c64..6cf48443 100644
--- a/gen/SkinShapeGroup.h
+++ b/gen/SkinShapeGroup.h
@@ -5,6 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _SKINSHAPEGROUP_H_
 
 #include "../NIF_IO.h"
+
 // Include structures
 #include "SkinShape.h"
 
diff --git a/gen/TexDesc.h b/gen/TexDesc.h
index 12fd17d4..e3291f34 100644
--- a/gen/TexDesc.h
+++ b/gen/TexDesc.h
@@ -6,8 +6,10 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-// Forward define of referenced blocks
+// Include structures
 #include "../Ref.h"
+
+// Forward define of referenced blocks
 class NiSourceTexture;
 
 /*!
diff --git a/gen/TexSource.h b/gen/TexSource.h
index 22f1a237..0dd4faa2 100644
--- a/gen/TexSource.h
+++ b/gen/TexSource.h
@@ -6,8 +6,10 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-// Forward define of referenced blocks
+// Include structures
 #include "../Ref.h"
+
+// Forward define of referenced blocks
 class NiObject;
 class NiPixelData;
 
diff --git a/gen/obj_defines.h b/gen/obj_defines.h
index 5ee61566..895fa5a2 100644
--- a/gen/obj_defines.h
+++ b/gen/obj_defines.h
@@ -1130,7 +1130,6 @@ for (uint i0 = 0; i0 < affectedNodes.size(); i0++) { \
 return refs; \
 
 #define NI_LIGHT_MEMBERS \
-public: \
 float dimmer; \
 Color3 ambientColor; \
 Color3 diffuseColor; \
-- 
GitLab