Tweaked DefinitionEx include paths; also Parser_ss.h name is finally fixed

22 files changed, 26 insertions, 25 deletions

diff --git a/DefinitionEx/CMakeLists.txt b/DefinitionEx/CMakeLists.txt
index f098670..469f72a 100644
--- a/DefinitionEx/CMakeLists.txt
+++ b/DefinitionEx/CMakeLists.txt
@@ -2,7 +2,7 @@ project(DefinitionEx)
 
 add_library(
 	${PROJECT_NAME} STATIC
-	src/Parser_ss.cpp
+	src/Parser.cpp
 	src/Term.cpp
 	src/Token.cpp
 	)
diff --git a/DefinitionEx/include/starshatter/definition.h b/DefinitionEx/include/starshatter/definition.h
new file mode 100644
index 0000000..785261c
--- /dev/null
+++ b/DefinitionEx/include/starshatter/definition.h
@@ -0,0 +1,11 @@
+/*  Starshatter: The Open Source Project
+    Copyright (c) 2021-2024, Starshatter: The Open Source Project Contributors
+    Copyright (c) 2011-2012, Starshatter OpenSource Distribution Contributors
+    Copyright (c) 1997-2006, Destroyer Studios LLC.
+*/
+
+#pragma once
+
+#include "definition/Parser.h"
+#include "definition/Term.h"
+#include "definition/Token.h"
diff --git a/DefinitionEx/include/Parser_ss.h b/DefinitionEx/include/starshatter/definition/Parser.h
index 50659b9..50659b9 100644
--- a/DefinitionEx/include/Parser_ss.h
+++ b/DefinitionEx/include/starshatter/definition/Parser.h
diff --git a/DefinitionEx/include/Term.h b/DefinitionEx/include/starshatter/definition/Term.h
index 1bc30b6..1bc30b6 100644
--- a/DefinitionEx/include/Term.h
+++ b/DefinitionEx/include/starshatter/definition/Term.h
diff --git a/DefinitionEx/include/Token.h b/DefinitionEx/include/starshatter/definition/Token.h
index 3dd8eb9..3dd8eb9 100644
--- a/DefinitionEx/include/Token.h
+++ b/DefinitionEx/include/starshatter/definition/Token.h
diff --git a/DefinitionEx/src/Parser_ss.cpp b/DefinitionEx/src/Parser.cpp
index 1b80d48..2453819 100644
--- a/DefinitionEx/src/Parser_ss.cpp
+++ b/DefinitionEx/src/Parser.cpp
@@ -11,7 +11,7 @@
     Implementation of the generic Parser class
 */
 
-#include <Parser_ss.h>
+#include <starshatter/definition/Parser.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -21,8 +21,8 @@
 #include <starshatter/foundation/reader.h>
 #include <Utils.h>
 
-#include <Term.h>
-#include <Token.h>
+#include <starshatter/definition/Term.h>
+#include <starshatter/definition/Token.h>
 
 enum KEYS { KEY_TRUE, KEY_FALSE, KEY_DEF, KEY_MINUS };
 
diff --git a/DefinitionEx/src/Term.cpp b/DefinitionEx/src/Term.cpp
index acfdcb8..789066d 100644
--- a/DefinitionEx/src/Term.cpp
+++ b/DefinitionEx/src/Term.cpp
@@ -11,7 +11,7 @@
     Implementation of the Term class
 */
 
-#include <Term.h>
+#include <starshatter/definition/Term.h>
 
 #include <Utils.h>
 
diff --git a/DefinitionEx/src/Token.cpp b/DefinitionEx/src/Token.cpp
index 3f516de..04f5708 100644
--- a/DefinitionEx/src/Token.cpp
+++ b/DefinitionEx/src/Token.cpp
@@ -11,7 +11,7 @@
     Scanner class implementation
 */
 
-#include <Token.h>
+#include <starshatter/definition/Token.h>
 
 #include <ctype.h>
 
diff --git a/DefinitionEx/test/parse_utils_like.cpp b/DefinitionEx/test/parse_utils_like.cpp
index fc943f7..eb87a07 100644
--- a/DefinitionEx/test/parse_utils_like.cpp
+++ b/DefinitionEx/test/parse_utils_like.cpp
@@ -1,8 +1,6 @@
 #include <gtest/gtest.h>
 
-#include <Parser_ss.h>
-#include <Term.h>
-#include <Token.h>
+#include <starshatter/definition.h>
 
 
 TEST(DefinitionEx, ParseUtilsLike)
diff --git a/StarsEx/Campaign.h b/StarsEx/Campaign.h
index e443648..c9bc534 100644
--- a/StarsEx/Campaign.h
+++ b/StarsEx/Campaign.h
@@ -16,11 +16,12 @@
 #ifndef Campaign_h
 #define Campaign_h
 
+#include <starshatter/definition.h>
+
 #include "Types.h"
 #include "Bitmap.h"
 #include "Geometry.h"
 #include "Text.h"
-#include "Term.h"
 #include "List.h"
 
 // +--------------------------------------------------------------------+
diff --git a/StarsEx/CampaignPlan.h b/StarsEx/CampaignPlan.h
index 8dd1d09..553326e 100644
--- a/StarsEx/CampaignPlan.h
+++ b/StarsEx/CampaignPlan.h
@@ -22,7 +22,6 @@
 
 #include "Types.h"
 #include "Text.h"
-#include "Term.h"
 #include "List.h"
 
 // +--------------------------------------------------------------------+
diff --git a/StarsEx/CampaignSaveGame.h b/StarsEx/CampaignSaveGame.h
index 2122715..19de787 100644
--- a/StarsEx/CampaignSaveGame.h
+++ b/StarsEx/CampaignSaveGame.h
@@ -18,7 +18,6 @@
 #include "Types.h"
 #include "Geometry.h"
 #include "Text.h"
-#include "Term.h"
 #include "List.h"
 
 // +--------------------------------------------------------------------+
diff --git a/StarsEx/CombatEvent.cpp b/StarsEx/CombatEvent.cpp
index c97c20b..a42dbff 100644
--- a/StarsEx/CombatEvent.cpp
+++ b/StarsEx/CombatEvent.cpp
@@ -18,7 +18,6 @@
 #include "ShipDesign.h"
 #include "Ship.h"
 
-#include "Term.h"
 #include "ParseUtil.h"
 #include "FormatUtil.h"
 #include "DataLoader.h"
diff --git a/StarsEx/Galaxy.h b/StarsEx/Galaxy.h
index b9bb41e..417d104 100644
--- a/StarsEx/Galaxy.h
+++ b/StarsEx/Galaxy.h
@@ -19,7 +19,6 @@
 #include "Bitmap.h"
 #include "Geometry.h"
 #include "Text.h"
-#include "Term.h"
 #include "List.h"
 
 // +--------------------------------------------------------------------+
diff --git a/StarsEx/NetClientConfig.cpp b/StarsEx/NetClientConfig.cpp
index c90eff9..69dda99 100644
--- a/StarsEx/NetClientConfig.cpp
+++ b/StarsEx/NetClientConfig.cpp
@@ -16,7 +16,6 @@
 #include "NetAddr.h"
 #include "NetHost.h"
 
-#include "Token.h"
 #include "Game.h"
 #include "ParseUtil.h"
 
diff --git a/StarsEx/NetServerConfig.cpp b/StarsEx/NetServerConfig.cpp
index 47197f6..73c1a8e 100644
--- a/StarsEx/NetServerConfig.cpp
+++ b/StarsEx/NetServerConfig.cpp
@@ -20,7 +20,6 @@
 #include "NetLobbyServer.h"
 #include "NetAuth.h"
 
-#include "Token.h"
 #include "Game.h"
 #include "ParseUtil.h"
 #include "VersionInfo.h"
diff --git a/StarsEx/ParseUtil.h b/StarsEx/ParseUtil.h
index 554393c..0e147e0 100644
--- a/StarsEx/ParseUtil.h
+++ b/StarsEx/ParseUtil.h
@@ -16,10 +16,8 @@
 
 #include <vector>
 
-#include <Parser_ss.h>
+#include <starshatter/definition.h>
 #include <starshatter/foundation/reader.h>
-#include <Text.h>
-#include <Token.h>
 
 #include "Types.h"
 #include "Geometry.h"
diff --git a/StarsEx/Ship.cpp b/StarsEx/Ship.cpp
index 251f92a..532d5f8 100644
--- a/StarsEx/Ship.cpp
+++ b/StarsEx/Ship.cpp
@@ -84,8 +84,6 @@
 #include "Sound.h"
 #include "Panic.h"
 
-#include "Parser_ss.h"
-
 // +----------------------------------------------------------------------+
 
 static int     base_contact_id   = 0;
diff --git a/StarsEx/ShipDesign.h b/StarsEx/ShipDesign.h
index b8dffc5..503e390 100644
--- a/StarsEx/ShipDesign.h
+++ b/StarsEx/ShipDesign.h
@@ -14,10 +14,11 @@
 #ifndef ShipDesign_h
 #define ShipDesign_h
 
+#include <starshatter/definition.h>
+
 #include "Types.h"
 #include "Bitmap.h"
 #include "Geometry.h"
-#include "Term.h"
 #include "List.h"
 
 // +----------------------------------------------------------------------+
diff --git a/StarsEx/StarSystem.h b/StarsEx/StarSystem.h
index 0dd2db1..bdd37ec 100644
--- a/StarsEx/StarSystem.h
+++ b/StarsEx/StarSystem.h
@@ -14,12 +14,13 @@
 #ifndef StarSystem_h
 #define StarSystem_h
 
+#include <starshatter/definition.h>
+
 #include "Types.h"
 #include "Solid.h"
 #include "Bitmap.h"
 #include "Geometry.h"
 #include "Text.h"
-#include "Term.h"
 #include "List.h"
 
 // +--------------------------------------------------------------------+
diff --git a/StarsEx/Starshatter.cpp b/StarsEx/Starshatter.cpp
index adb519a..7663148 100644
--- a/StarsEx/Starshatter.cpp
+++ b/StarsEx/Starshatter.cpp
@@ -79,7 +79,6 @@
 #include "NetUtil.h"
 
 #include "ParseUtil.h"
-#include "Token.h"
 
 #include "Game.h"
 #include "GameWinDX9.h"
diff --git a/Starserver/Main.cpp b/Starserver/Main.cpp
index b3632e7..43a567e 100644
--- a/Starserver/Main.cpp
+++ b/Starserver/Main.cpp
@@ -7,7 +7,7 @@
 #include <InfoEx.h>
 #include <NetLayer.h>
 #include <Panic.h>
-#include <Token.h>
+#include <starshatter/definition.h>
 #include <Utils.h>
 #include <VersionInfo.h>