- another round of filename corrections

- GBSPLib compiles for Linux/Wine now

diff --git a/G3D/CMakeLists.txt b/G3D/CMakeLists.txt
index cf35af4..e691fc2 100644 (file)
--- a/G3D/CMakeLists.txt
+++ b/G3D/CMakeLists.txt
@@ -1 +1 @@
-ADD_LIBRARY             (genesis3d STATIC CSNetMgr.c Camera.c Ge.c)
+ADD_LIBRARY             (Genesis3D STATIC CSNetMgr.c Camera.c Ge.c)

diff --git a/GBSPLib/BSP.CPP b/GBSPLib/BSP.cpp
similarity index 95%
rename from GBSPLib/BSP.CPP
rename to GBSPLib/BSP.cpp
index aa30d09..c155625 100644 (file)
--- a/GBSPLib/BSP.CPP
+++ b/GBSPLib/BSP.cpp
@@ -19,9 +19,9 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
-#include <Windows.h>\r
-#include <Stdio.h>\r
-#include <Math.h>\r
+#include <windows.h>\r
+#include <stdio.h>\r
+#include <math.h>\r
 \r
 #include "GBSPPrep.h"\r
 #include "BSP.h"\r
@@ -36,7 +36,7 @@
 #include "Light.h"\r
 #include "GBSPFile.h"\r
 \r
-#include "Ram.h"\r
+#include "include/Ram.h"\r
 \r
 // Globals\r
 GBSP_Model     BSPModels[MAX_BSP_MODELS];\r

diff --git a/GBSPLib/Bsp.h b/GBSPLib/BSP.h
similarity index 96%
rename from GBSPLib/Bsp.h
rename to GBSPLib/BSP.h
index d2fbdde..f26d7a3 100644 (file)
--- a/GBSPLib/Bsp.h
+++ b/GBSPLib/BSP.h
@@ -22,7 +22,7 @@
 #ifndef BSP_H\r
 #define BSP_H\r
 \r
-#include <Windows.h>\r
+#include <windows.h>\r
 \r
 #include "GBSPLib.h"\r
 \r

diff --git a/GBSPLib/Bsp2.cpp b/GBSPLib/BSP2.cpp
similarity index 95%
rename from GBSPLib/Bsp2.cpp
rename to GBSPLib/BSP2.cpp
index 27f9f41..70ac2da 100644 (file)
--- a/GBSPLib/Bsp2.cpp
+++ b/GBSPLib/BSP2.cpp
@@ -19,11 +19,11 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
-#include <Windows.h>\r
-#include <Assert.h>\r
-#include <Math.h>\r
+#include <windows.h>\r
+#include <assert.h>\r
+#include <math.h>\r
 \r
-#include "Mathlib.h"\r
+#include "MathLib.h"\r
 #include "Poly.h"\r
 #include "BSP.h"\r
 #include "GBSPFile.h"\r
@@ -33,8 +33,8 @@
 #include "Fill.h"\r
 #include "Brush2.h"\r
 \r
-#include "Vec3d.h"\r
-#include "Ram.h"\r
+#include "include/Vec3d.h"\r
+#include "include/Ram.h"\r
 \r
 #define USE_VOLUMES\r
 \r

diff --git a/GBSPLib/Brush2.cpp b/GBSPLib/Brush2.cpp
index 7fdf94d..f7465a2 100644 (file)
--- a/GBSPLib/Brush2.cpp
+++ b/GBSPLib/Brush2.cpp
@@ -19,18 +19,18 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
-#include <Windows.h>\r
-#include <Math.h>\r
+#include <windows.h>\r
+#include <math.h>\r
 \r
 #include "Brush2.h"\r
-#include "Mathlib.h"\r
+#include "MathLib.h"\r
 #include "Poly.h"\r
 #include "BSP.h"\r
 #include "Texture.h"\r
 \r
-#include "VFile.h"\r
-#include "Vec3d.h"\r
-#include "Ram.h"\r
+#include "include/VFile.h"\r
+#include "include/Vec3d.h"\r
+#include "include/Ram.h"\r
 \r
 #define BSP_BRUSH_SIZE(s) ((sizeof(GBSP_Brush)-sizeof(GBSP_Side[NUM_BRUSH_DEFAULT_SIDES]))+(sizeof(GBSP_Side)*(s)));\r
 #define MAP_BRUSH_SIZE(s) ((sizeof(MAP_Brush)-sizeof(GBSP_Side[NUM_BRUSH_DEFAULT_SIDES]))+(sizeof(GBSP_Side)*(s)));\r

diff --git a/GBSPLib/BRUSH2.H b/GBSPLib/Brush2.h
similarity index 94%
rename from GBSPLib/BRUSH2.H
rename to GBSPLib/Brush2.h
index 38530ed..85846b9 100644 (file)
--- a/GBSPLib/BRUSH2.H
+++ b/GBSPLib/Brush2.h
@@ -22,13 +22,13 @@
 #ifndef BRUSH2_H\r
 #define BRUSH2_H\r
 \r
-#include <Windows.h>\r
+#include <windows.h>\r
 \r
-#include "Mathlib.h"\r
+#include "MathLib.h"\r
 #include "Map.h"\r
 \r
-#include "VFile.h"\r
-#include "Vec3d.h"\r
+#include "include/VFile.h"\r
+#include "include/Vec3d.h"\r
 \r
 #define        NUM_BRUSH_DEFAULT_SIDES         6\r
 \r
@@ -91,4 +91,4 @@ GBSP_Brush    *CSGBrushes(GBSP_Brush *Head);
 geBoolean      OutputBrushes(char *FileName, GBSP_Brush *Brushes);\r
 geBoolean      OutputMapBrushes(char *FileName, MAP_Brush *Brushes);\r
 \r
-#endif
\ No newline at end of file
+#endif\r

diff --git a/GBSPLib/CMakeLists.txt b/GBSPLib/CMakeLists.txt
index f36909c..9c8ef48 100644 (file)
--- a/GBSPLib/CMakeLists.txt
+++ b/GBSPLib/CMakeLists.txt
@@ -1 +1,3 @@
-ADD_LIBRARY             (GBSPLib STATIC Brush2.cpp)
+ADD_LIBRARY             (GBSPLib STATIC BSP.cpp BSP2.cpp Brush2.cpp Fill.cpp GBSPFile.cpp GBSPLib.cpp GBSPPrep.cpp
+                                 Leaf.cpp Light.cpp Map.cpp MathLib.cpp Poly.cpp PortFile.cpp Portals.cpp Rad.cpp
+                                 TJunct.cpp Texture.cpp Utils.cpp Vis.cpp VisFlood.cpp)

diff --git a/GBSPLib/Fill.Cpp b/GBSPLib/Fill.cpp
similarity index 95%
rename from GBSPLib/Fill.Cpp
rename to GBSPLib/Fill.cpp
index 40e1f58..a564842 100644 (file)
--- a/GBSPLib/Fill.Cpp
+++ b/GBSPLib/Fill.cpp
@@ -19,8 +19,8 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
-#include <Windows.h>\r
-#include <Stdio.h>\r
+#include <windows.h>\r
+#include <stdio.h>\r
 \r
 #include "Fill.h"\r
 #include "Map.h"\r
@@ -28,7 +28,7 @@
 #include "Leaf.h"\r
 #include "Poly.h"\r
 #include "GBSPFile.h"\r
-#include "Bsp.h"\r
+#include "BSP.h"\r
 \r
 int32          CurrentFill;\r
 geBoolean      HitEntity = GE_FALSE;\r

diff --git a/GBSPLib/Fill.h b/GBSPLib/Fill.h
index 7005810..bd2dfc9 100644 (file)
--- a/GBSPLib/Fill.h
+++ b/GBSPLib/Fill.h
@@ -22,7 +22,7 @@
 #ifndef FILL_H\r
 #define FILL_H\r
 \r
-#include <Windows.h>\r
+#include <windows.h>\r
 \r
 #include "BSP.h"\r
 \r

diff --git a/GBSPLib/GBSPFile.cpp b/GBSPLib/GBSPFile.cpp
index 8e7566c..25f46fc 100644 (file)
--- a/GBSPLib/GBSPFile.cpp
+++ b/GBSPLib/GBSPFile.cpp
@@ -19,13 +19,13 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
-#include <Windows.h>\r
-#include <Stdio.h>\r
+#include <windows.h>\r
+#include <stdio.h>\r
 \r
-#include "DCommon.h"\r
+#include "G3D/Engine/Drivers/DCommon.h"\r
 #include "GBSPFile.h"\r
-#include "VFile.h"\r
-#include "Ram.h"\r
+#include "include/VFile.h"\r
+#include "include/Ram.h"\r
 \r
 //========================================================================================\r
 //     Globals\r

diff --git a/GBSPLib/Gbspfile.h b/GBSPLib/GBSPFile.h
similarity index 95%
rename from GBSPLib/Gbspfile.h
rename to GBSPLib/GBSPFile.h
index f2849cd..186549c 100644 (file)
--- a/GBSPLib/Gbspfile.h
+++ b/GBSPLib/GBSPFile.h
@@ -22,14 +22,14 @@
 #ifndef GBSPFILE_H\r
 #define GBSPFILE_H\r
 \r
-#include <Windows.h>\r
-#include <Stdio.h>\r
+#include <windows.h>\r
+#include <stdio.h>\r
 \r
-#include "DCommon.h"\r
+#include "G3D/Engine/Drivers/DCommon.h"\r
 #include "MathLib.h"\r
-#include "vfile.h"\r
-#include "motion.h"\r
-#include "Vec3d.h"\r
+#include "include/VFile.h"\r
+#include "include/Motion.h"\r
+#include "include/Vec3d.h"\r
 \r
 #define GBSP_VERSION                           15\r
 \r
@@ -350,4 +350,4 @@ geBoolean WriteChunk(GBSP_Chunk *Chunk, void *Data, geVFile *f);
 geBoolean WriteChunks(GBSP_ChunkData *Data, int32 NumChunkData, geVFile *f);\r
 \r
 \r
-#endif
\ No newline at end of file
+#endif\r

diff --git a/GBSPLib/Gbsplib.cpp b/GBSPLib/GBSPLib.cpp
similarity index 95%
rename from GBSPLib/Gbsplib.cpp
rename to GBSPLib/GBSPLib.cpp
index b2d1959..32feef5 100644 (file)
--- a/GBSPLib/Gbsplib.cpp
+++ b/GBSPLib/GBSPLib.cpp
@@ -19,7 +19,7 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
-#include <Windows.h>\r
+#include <windows.h>\r
 \r
 #include "GBSPPrep.h"\r
 #include "BSP.h"\r
@@ -52,7 +52,7 @@ GBSP_RETVAL GBSP_CreateBSP(char *FileName, BspParms *Parms)
        GHook.Printf("** Build Date/Time: "__DATE__","__TIME__"\n");\r
 \r
 #ifdef HANDLE_EXCEPTIONS\r
-       __try\r
+       try\r
        {\r
                if (!CreateBSP(FileName, Parms))\r
                {\r
@@ -64,7 +64,7 @@ GBSP_RETVAL GBSP_CreateBSP(char *FileName, BspParms *Parms)
        \r
                return GBSP_OK;\r
        }\r
-       __except(1)\r
+       catch (...)\r
        {\r
                // Clean up all errors, free any possible left-over data\r
                GHook.Printf("GBSPLib: Fatal error in BSP!  Doing Clean-up work.\n");\r
@@ -109,7 +109,7 @@ GBSP_RETVAL GBSP_SaveGBSPFile(char *FileName)
        CancelRequest = GE_FALSE;\r
 \r
 #ifdef HANDLE_EXCEPTIONS\r
-       __try\r
+       try\r
        {\r
                if (!ConvertGBSPToFile(FileName))\r
                {\r
@@ -119,7 +119,7 @@ GBSP_RETVAL GBSP_SaveGBSPFile(char *FileName)
                                return GBSP_ERROR;\r
                }\r
        }\r
-       __except(1)\r
+       catch (...)\r
        {\r
                // Clean up all errors, free any possible left-over data\r
                GHook.Printf("GBSPLib: Fatal error Saving BSP!  Doing Clean-up work.\n");\r
@@ -170,7 +170,7 @@ GBSP_RETVAL GBSP_VisGBSPFile(char *FileName, VisParms *Parms)
        CancelRequest = GE_FALSE;\r
 \r
 #ifdef HANDLE_EXCEPTIONS\r
-       __try\r
+       try\r
        {\r
                if (!VisGBSPFile(FileName, Parms))\r
                {\r
@@ -180,7 +180,7 @@ GBSP_RETVAL GBSP_VisGBSPFile(char *FileName, VisParms *Parms)
                                return GBSP_ERROR;\r
                }\r
        }\r
-       __except(1)\r
+       catch (...)\r
        {\r
                // Clean up all errors, free any possible left-over data\r
                GHook.Printf("GBSPLib: Fatal error in Vis!  Doing Clean-up work.\n");\r
@@ -209,7 +209,7 @@ GBSP_RETVAL GBSP_LightGBSPFile(char *FileName, LightParms *Parms)
        CancelRequest = GE_FALSE;\r
 \r
 #ifdef HANDLE_EXCEPTIONS\r
-       __try\r
+       try\r
        {\r
                if (!LightGBSPFile(FileName, Parms))\r
                {\r
@@ -219,7 +219,7 @@ GBSP_RETVAL GBSP_LightGBSPFile(char *FileName, LightParms *Parms)
                                return GBSP_ERROR;\r
                }\r
        }\r
-       __except(1)\r
+       catch (...)\r
        {\r
                // Clean up all errors, free any possible left-over data\r
                GHook.Printf("GBSPLib: Fatal error in Radiosity!  Doing Clean-up work.\n");\r

diff --git a/GBSPLib/Gbsplib.h b/GBSPLib/GBSPLib.h
similarity index 96%
rename from GBSPLib/Gbsplib.h
rename to GBSPLib/GBSPLib.h
index 1ab5942..9a91564 100644 (file)
--- a/GBSPLib/Gbsplib.h
+++ b/GBSPLib/GBSPLib.h
@@ -22,11 +22,11 @@
 #ifndef GBSPLIB_H\r
 #define GBSPLIB_H\r
 \r
-#include <Windows.h>\r
+#include <windows.h>\r
 \r
 #include "MathLib.h"\r
 \r
-#include "Vec3d.h"\r
+#include "include/Vec3d.h"\r
 \r
 #define GBSP_VERSION_MAJOR     6\r
 #define GBSP_VERSION_MINOR     0\r

diff --git a/GBSPLib/GBSPPREP.CPP b/GBSPLib/GBSPPrep.cpp
similarity index 96%
rename from GBSPLib/GBSPPREP.CPP
rename to GBSPLib/GBSPPrep.cpp
index f01f508..2158fc6 100644 (file)
--- a/GBSPLib/GBSPPREP.CPP
+++ b/GBSPLib/GBSPPrep.cpp
@@ -19,8 +19,8 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
-#include <Windows.h>\r
-#include <Stdio.h>\r
+#include <windows.h>\r
+#include <stdio.h>\r
 \r
 \r
 #include "GBSPPrep.h"\r
@@ -32,8 +32,8 @@
 #include "Portals.h"\r
 #include "Leaf.h"\r
 \r
-#include "VFile.h"\r
-#include "Ram.h"\r
+#include "include/VFile.h"\r
+#include "include/Ram.h"\r
 \r
 geBoolean      SaveGFXModelData(geVFile *f);\r
 geBoolean      SaveGFXNodes(geVFile *f);\r

diff --git a/GBSPLib/GBSPPREP.H b/GBSPLib/GBSPPrep.h
similarity index 96%
rename from GBSPLib/GBSPPREP.H
rename to GBSPLib/GBSPPrep.h
index b757d41..d9d2296 100644 (file)
--- a/GBSPLib/GBSPPREP.H
+++ b/GBSPLib/GBSPPrep.h
@@ -22,8 +22,8 @@
 #ifndef GBSPPREP_H\r
 #define GBSPPREP_H\r
 \r
-#include <Windows.h>\r
-#include <Stdio.h>\r
+#include <windows.h>\r
+#include <stdio.h>\r
 \r
 #include "BSP.h"\r
 \r

diff --git a/GBSPLib/Leaf.cpp b/GBSPLib/Leaf.cpp
index 4370a49..c961f88 100644 (file)
--- a/GBSPLib/Leaf.cpp
+++ b/GBSPLib/Leaf.cpp
@@ -19,10 +19,10 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
-#include <Windows.h>\r
-#include <Stdio.h>\r
+#include <windows.h>\r
+#include <stdio.h>\r
 \r
-#include "Ram.h"\r
+#include "include/Ram.h"\r
 #include "Portals.h"\r
 #include "GBSPFile.h"\r
 #include "BSP.h"\r
@@ -30,7 +30,7 @@
 #include "Leaf.h"\r
 #include "Brush2.h"\r
 \r
-#include "Vec3d.h"\r
+#include "include/Vec3d.h"\r
 \r
 int32           NumLeafClusters;\r
 \r

diff --git a/GBSPLib/Leaf.h b/GBSPLib/Leaf.h
index 092c1ba..50ac453 100644 (file)
--- a/GBSPLib/Leaf.h
+++ b/GBSPLib/Leaf.h
@@ -22,7 +22,7 @@
 #ifndef LEAF_H\r
 #define LEAF_H\r
 \r
-#include <Windows.h>\r
+#include <windows.h>\r
 \r
 #include "BSP.h"\r
 \r
@@ -40,4 +40,4 @@ geBoolean CreateLeafSides(GBSP_Node *RootNode);
 geBoolean CreateAreas(GBSP_Node *RootNode);\r
 GBSP_Node *FindLeaf(GBSP_Node *Node, geVec3d *Origin);\r
 \r
-#endif
\ No newline at end of file
+#endif\r

diff --git a/GBSPLib/Light.cpp b/GBSPLib/Light.cpp
index 68aeafd..9bec9e9 100644 (file)
--- a/GBSPLib/Light.cpp
+++ b/GBSPLib/Light.cpp
@@ -19,11 +19,11 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
-#include <Windows.h>\r
-#include <Stdio.h>\r
-#include <Assert.h>\r
+#include <windows.h>\r
+#include <stdio.h>\r
+#include <assert.h>\r
+#include <math.h>\r
 \r
-#include "Math.h"\r
 #include "MathLib.h"\r
 #include "GBSPFile.h"\r
 #include "Light.h"\r
@@ -32,10 +32,9 @@
 #include "Utils.h"\r
 #include "BSP.h"\r
 \r
-#include "Vec3d.h"\r
-#include "XForm3d.h"\r
-\r
-#include "Ram.h"\r
+#include "include/Vec3d.h"\r
+#include "include/XForm3d.h"\r
+#include "include/Ram.h"\r
 \r
 #define RWM_GOURAUD 1\r
 #define DEBUG_RWM_GOURAUD 1\r

diff --git a/GBSPLib/Light.h b/GBSPLib/Light.h
index 5c7ba31..83b388f 100644 (file)
--- a/GBSPLib/Light.h
+++ b/GBSPLib/Light.h
@@ -22,10 +22,10 @@
 #ifndef LIGHT_H\r
 #define LIGHT_H\r
 \r
-#include <Windows.h>\r
-#include <Stdio.h>\r
+#include <windows.h>\r
+#include <stdio.h>\r
 \r
-#include "GBSPfile.h"\r
+#include "GBSPFile.h"\r
 #include "GBSPLib.h"                           // Lightparms\r
 #include "BSP.h"\r
 \r

diff --git a/GBSPLib/Map.cpp b/GBSPLib/Map.cpp
index 4dabc02..2b10122 100644 (file)
--- a/GBSPLib/Map.cpp
+++ b/GBSPLib/Map.cpp
@@ -19,21 +19,21 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
-#include <Windows.h>\r
+#include <windows.h>\r
+#include <stdio.h>\r
+#include <math.h>\r
 \r
 #include "Map.h"\r
 #include "GBSPFile.h"\r
 #include "Texture.h"\r
 #include "BSP.h"\r
-#include "Stdio.h"\r
-#include "Math.h"\r
 #include "Brush2.h"\r
 #include "Poly.h"\r
-#include "Mathlib.h"\r
+#include "MathLib.h"\r
 \r
-#include "Motion.h"                            // From Genesis (in include path)\r
-#include "Errorlog.h"\r
-#include "Ram.h"\r
+#include "include/Motion.h"                            // From Genesis (in include path)\r
+#include "include/ErrorLog.h"\r
+#include "include/Ram.h"\r
 \r
 int32          NumEntities;\r
 MAP_Entity     Entities[MAX_MAP_ENTITIES];\r

diff --git a/GBSPLib/Map.h b/GBSPLib/Map.h
index 036cba6..c9c6011 100644 (file)
--- a/GBSPLib/Map.h
+++ b/GBSPLib/Map.h
@@ -22,10 +22,10 @@
 #ifndef MAP_H\r
 #define MAP_H\r
 \r
-#include <Windows.h>\r
+#include <windows.h>\r
 \r
 #include "BSP.h"\r
-#include "Motion.h"\r
+#include "include/Motion.h"\r
 \r
 #define MAX_MAP_ENTITIES                       4096*2\r
 #define MAX_MAP_TEXINFO                                8192*2\r

diff --git a/GBSPLib/MATHLIB.CPP b/GBSPLib/MathLib.cpp
similarity index 96%
rename from GBSPLib/MATHLIB.CPP
rename to GBSPLib/MathLib.cpp
index 2dfafb3..d1516cc 100644 (file)
--- a/GBSPLib/MATHLIB.CPP
+++ b/GBSPLib/MathLib.cpp
@@ -19,9 +19,9 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
-#include <Windows.h>\r
+#include <windows.h>\r
+#include <math.h>\r
 \r
-#include "Math.h"\r
 #include "MathLib.h"\r
 \r
 geVec3d        VecOrigin = {0.0f, 0.0f, 0.0f};\r

diff --git a/GBSPLib/MATHLIB.H b/GBSPLib/MathLib.h
similarity index 97%
rename from GBSPLib/MATHLIB.H
rename to GBSPLib/MathLib.h
index 39fc0ac..ed3afc1 100644 (file)
--- a/GBSPLib/MATHLIB.H
+++ b/GBSPLib/MathLib.h
@@ -22,7 +22,7 @@
 #ifndef MATHLIB_H\r
 #define MATHLIB_H\r
 \r
-#include "Vec3d.h"\r
+#include "include/Vec3d.h"\r
 \r
 //#define      ON_EPSILON                      (geFloat)0.05\r
 #define                ON_EPSILON                      (geFloat)0.1\r

diff --git a/GBSPLib/POLY.CPP b/GBSPLib/Poly.cpp
similarity index 95%
rename from GBSPLib/POLY.CPP
rename to GBSPLib/Poly.cpp
index c37ad2f..0349fe5 100644 (file)
--- a/GBSPLib/POLY.CPP
+++ b/GBSPLib/Poly.cpp
@@ -19,18 +19,18 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
-#include <Windows.h>\r
+#include <windows.h>\r
 #include <math.h>\r
 \r
 #include "BSP.h"\r
-#include "Mathlib.h"\r
+#include "MathLib.h"\r
 #include "Map.h"\r
 #include "Poly.h"\r
 #include "Texture.h"\r
 #include "GBSPFile.h"\r
 #include "Light.h"\r
 \r
-#include "Ram.h"\r
+#include "include/Ram.h"\r
 \r
 int32          NumSubdivides;\r
 geFloat                SubdivideSize = 235.0f;\r

diff --git a/GBSPLib/POLY.H b/GBSPLib/Poly.h
similarity index 97%
rename from GBSPLib/POLY.H
rename to GBSPLib/Poly.h
index 730d233..7299aa9 100644 (file)
--- a/GBSPLib/POLY.H
+++ b/GBSPLib/Poly.h
@@ -22,7 +22,7 @@
 #ifndef POLY_H\r
 #define POLY_H\r
 \r
-#include <Windows.h>\r
+#include <windows.h>\r
 \r
 #include "BSP.h"\r
 #include "MathLib.h"\r

diff --git a/GBSPLib/PortFile.cpp b/GBSPLib/PortFile.cpp
index 3d09f04..b9987c8 100644 (file)
--- a/GBSPLib/PortFile.cpp
+++ b/GBSPLib/PortFile.cpp
@@ -19,13 +19,13 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
-#include <Windows.h>\r
-#include <Stdio.h>\r
+#include <windows.h>\r
+#include <stdio.h>\r
 \r
-#include "Bsp.h"\r
+#include "BSP.h"\r
 #include "Portals.h"\r
 #include "Leaf.h"\r
-#include "GBspFile.h"\r
+#include "GBSPFile.h"\r
 #include "Poly.h"\r
 #include "Utils.h"\r
 \r

diff --git a/GBSPLib/PORTALS.CPP b/GBSPLib/Portals.cpp
similarity index 95%
rename from GBSPLib/PORTALS.CPP
rename to GBSPLib/Portals.cpp
index 1883ab1..b6b6973 100644 (file)
--- a/GBSPLib/PORTALS.CPP
+++ b/GBSPLib/Portals.cpp
@@ -19,19 +19,19 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
-#include <Windows.h>\r
-#include <Stdio.h>\r
-#include <Assert.h>\r
+#include <windows.h>\r
+#include <stdio.h>\r
+#include <assert.h>\r
 \r
 #include "Portals.h"\r
 #include "Poly.h"\r
-#include "Bsp.h"\r
+#include "BSP.h"\r
 #include "GBSPFile.h"\r
 #include "Leaf.h"\r
 #include "Utils.h"\r
 #include "Map.h"\r
 \r
-#include "Ram.h"\r
+#include "include/Ram.h"\r
 \r
 GBSP_Node      *OutsideNode;\r
 geVec3d                NodeMins, NodeMaxs;\r

diff --git a/GBSPLib/PORTALS.H b/GBSPLib/Portals.h
similarity index 97%
rename from GBSPLib/PORTALS.H
rename to GBSPLib/Portals.h
index f9f00f1..4010284 100644 (file)
--- a/GBSPLib/PORTALS.H
+++ b/GBSPLib/Portals.h
@@ -22,7 +22,7 @@
 #ifndef PORTALS_H\r
 #define PORTALS_H\r
 \r
-#include <Windows.h>\r
+#include <windows.h>\r
 \r
 #include "BSP.h"\r
 \r

diff --git a/GBSPLib/RAD.CPP b/GBSPLib/Rad.cpp
similarity index 95%
rename from GBSPLib/RAD.CPP
rename to GBSPLib/Rad.cpp
index 9d553e1..0db9b89 100644 (file)
--- a/GBSPLib/RAD.CPP
+++ b/GBSPLib/Rad.cpp
@@ -19,19 +19,19 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
-#include <Windows.h>\r
-#include <Stdio.h>\r
+#include <windows.h>\r
+#include <stdio.h>\r
+#include <math.h>\r
 \r
-#include "DCommon.h"\r
+#include "G3D/Engine/Drivers/DCommon.h"\r
 #include "BSP.h"\r
 #include "GBSPFile.h"\r
-#include "Math.h"\r
 #include "MathLib.h"\r
 #include "Poly.h"\r
 #include "Light.h"\r
 #include "Texture.h"\r
 \r
-#include "Ram.h"\r
+#include "include/Ram.h"\r
 \r
 pRAD_Patch     *FacePatches;\r
 pRAD_Patch     *PatchList;\r

diff --git a/GBSPLib/TJunct.cpp b/GBSPLib/TJunct.cpp
index c7bc885..4c21a94 100644 (file)
--- a/GBSPLib/TJunct.cpp
+++ b/GBSPLib/TJunct.cpp
@@ -19,15 +19,15 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
-#include <Windows.h>\r
-#include <Stdio.h>\r
-#include <Math.h>\r
+#include <windows.h>\r
+#include <stdio.h>\r
+#include <math.h>\r
 \r
 #include "BSP.h"\r
 #include "Poly.h"\r
 #include "Texture.h"\r
 \r
-#include "Ram.h"\r
+#include "include/Ram.h"\r
 \r
 #define OFF_EPSILON                                    0.05f\r
 \r
@@ -509,4 +509,4 @@ geBoolean FixModelTJunctions(void)
        }\r
 \r
        return GE_TRUE;\r
-}
\ No newline at end of file
+}\r

diff --git a/GBSPLib/TEXTURE.CPP b/GBSPLib/Texture.cpp
similarity index 94%
rename from GBSPLib/TEXTURE.CPP
rename to GBSPLib/Texture.cpp
index 0366250..7887565 100644 (file)
--- a/GBSPLib/TEXTURE.CPP
+++ b/GBSPLib/Texture.cpp
@@ -19,19 +19,18 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
-#include <Windows.h>\r
-\r
-#include <Stdio.h>\r
-#include <Assert.h>\r
+#include <windows.h>\r
+#include <stdio.h>\r
+#include <assert.h>\r
 \r
 #include "Map.h"\r
 #include "BSP.h"\r
 #include "Texture.h"\r
 #include "Utils.h"\r
 \r
-#include       "vfile.h"\r
-#include       "bitmap.h"\r
-#include       "ram.h"\r
+#include "include/VFile.h"\r
+#include "include/Bitmap.h"\r
+#include "include/Ram.h"\r
 \r
 int32          NumTextures;\r
 GFX_Texture    Textures[MAX_MAP_TEXTURES];\r

diff --git a/GBSPLib/TEXTURE.H b/GBSPLib/Texture.h
similarity index 95%
rename from GBSPLib/TEXTURE.H
rename to GBSPLib/Texture.h
index 34436f8..f084c4c 100644 (file)
--- a/GBSPLib/TEXTURE.H
+++ b/GBSPLib/Texture.h
@@ -24,11 +24,11 @@
 \r
 //#include <Windows.h>\r
 \r
-#include <Stdio.h>\r
+#include <stdio.h>\r
 #include "Map.h"\r
-#include "DCommon.h"\r
+#include "G3D/Engine/Drivers/DCommon.h"\r
 #include "GBSPFile.h"\r
-#include "VFile.h"\r
+#include "include/VFile.h"\r
 \r
 #define TEXTURE_SKYBOX         (1<<0)\r
 \r

diff --git a/GBSPLib/Utils.cpp b/GBSPLib/Utils.cpp
index 7b98780..0f79d44 100644 (file)
--- a/GBSPLib/Utils.cpp
+++ b/GBSPLib/Utils.cpp
@@ -20,11 +20,11 @@
 /*                                                                                      */\r
 /****************************************************************************************/\r
 \r
-#include <Windows.h>\r
-#include <StdIo.h>\r
+#include <windows.h>\r
+#include <stdio.h>\r
 \r
 #include "Utils.h"\r
-#include "Basetype.h"\r
+#include "include/BaseType.h"\r
 \r
 //====================================================================================\r
 //     DefaultExtension\r

diff --git a/GBSPLib/Utils.h b/GBSPLib/Utils.h
index f6d16b3..d736a0a 100644 (file)
--- a/GBSPLib/Utils.h
+++ b/GBSPLib/Utils.h
@@ -22,7 +22,7 @@
 #ifndef UTILS_H\r
 #define UTILS_H\r
 \r
-#include <StdIo.h>\r
+#include <stdio.h>\r
 \r
 #define PATH_SEPERATOR   '/'\r
 \r
@@ -37,4 +37,4 @@ void ExtractFileBase (char *Path, char *Dest);
 void ExtractFileExtension (char *Path, char *Dest);\r
 \r
 \r
-#endif
\ No newline at end of file
+#endif\r

diff --git a/GBSPLib/VIS.CPP b/GBSPLib/Vis.cpp
similarity index 96%
rename from GBSPLib/VIS.CPP
rename to GBSPLib/Vis.cpp
index ff34efc..d08835d 100644 (file)
--- a/GBSPLib/VIS.CPP
+++ b/GBSPLib/Vis.cpp
@@ -19,16 +19,16 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
-#include <Windows.h>\r
-#include <Stdio.h>\r
+#include <windows.h>\r
+#include <stdio.h>\r
 \r
 #include "Utils.h"\r
 #include "Vis.h"\r
 #include "GBSPFile.h"\r
 #include "Poly.h"\r
-#include "Bsp.h"\r
+#include "BSP.h"\r
 \r
-#include "Ram.h"\r
+#include "include/Ram.h"\r
 \r
 int32          NumVisPortals;                                  // Total portals\r
 int32          NumVisPortalBytes;                              // Total portals / 8\r
@@ -672,4 +672,4 @@ geBoolean CalcPortalInfo(VIS_Portal *Portal)
        Portal->Radius = BestDist;\r
 \r
        return GE_TRUE;\r
-}
\ No newline at end of file
+}\r

diff --git a/GBSPLib/Vis.h b/GBSPLib/Vis.h
index 3aa279b..4ee636c 100644 (file)
--- a/GBSPLib/Vis.h
+++ b/GBSPLib/Vis.h
@@ -22,8 +22,8 @@
 #ifndef VIS_H\r
 #define VIS_H\r
 \r
-#include <Windows.h>\r
-#include <Stdio.h>\r
+#include <windows.h>\r
+#include <stdio.h>\r
 \r
 #include "BSP.h"\r
 #include "GBSPFile.h"\r

diff --git a/GBSPLib/VISFLOOD.CPP b/GBSPLib/VisFlood.cpp
similarity index 95%
rename from GBSPLib/VISFLOOD.CPP
rename to GBSPLib/VisFlood.cpp
index 3f8749a..b6ba8fd 100644 (file)
--- a/GBSPLib/VISFLOOD.CPP
+++ b/GBSPLib/VisFlood.cpp
@@ -19,16 +19,16 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
-#include <Windows.h>\r
-#include <Stdio.h>\r
+#include <windows.h>\r
+#include <stdio.h>\r
 \r
 #include "Utils.h"\r
 #include "Vis.h"\r
 #include "GBSPFile.h"\r
 #include "Poly.h"\r
-#include "Bsp.h"\r
+#include "BSP.h"\r
 \r
-#include "Ram.h"\r
+#include "include/Ram.h"\r
 \r
 extern int32           NumVisPortals;                          // Total portals\r
 extern int32           NumVisPortalBytes;                      // Total portals / 8\r