summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAki <please@ignore.pl>2022-04-02 19:19:08 +0200
committerAki <please@ignore.pl>2022-04-02 20:23:41 +0200
commit94ef3b0248485714ca8e635af3811d788ee930e2 (patch)
treee9a9acea17e96a6ce4ce2a5dc790e9704a19dedf
parentbeb4c7aa02cfe80cdfc6793406823c5f32cb0b74 (diff)
downloadstarshatter-94ef3b0248485714ca8e635af3811d788ee930e2.zip
starshatter-94ef3b0248485714ca8e635af3811d788ee930e2.tar.gz
starshatter-94ef3b0248485714ca8e635af3811d788ee930e2.tar.bz2
Moved def format implementation to own module
-rw-r--r--CMakeLists.txt1
-rw-r--r--DefinitionEx/CMakeLists.txt15
-rw-r--r--DefinitionEx/Parser.cpp (renamed from StarsEx/Parser.cpp)0
-rw-r--r--DefinitionEx/Parser.h (renamed from StarsEx/Parser.h)0
-rw-r--r--DefinitionEx/Term.cpp (renamed from StarsEx/Term.cpp)0
-rw-r--r--DefinitionEx/Term.h (renamed from StarsEx/Term.h)0
-rw-r--r--DefinitionEx/Token.cpp (renamed from StarsEx/Token.cpp)0
-rw-r--r--DefinitionEx/Token.h (renamed from StarsEx/Token.h)0
-rw-r--r--StarsEx/CMakeLists.txt4
9 files changed, 17 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d89f0a..8622974 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,7 @@ endif()
add_subdirectory(contrib)
add_subdirectory(data)
add_subdirectory(Datafile)
+add_subdirectory(DefinitionEx)
add_subdirectory(FoundationEx)
# add_subdirectory(Magic2) # TODO: AFX/MFC will be useless, port it to e.g., Qt right away.
add_subdirectory(NetEx)
diff --git a/DefinitionEx/CMakeLists.txt b/DefinitionEx/CMakeLists.txt
new file mode 100644
index 0000000..9dd6620
--- /dev/null
+++ b/DefinitionEx/CMakeLists.txt
@@ -0,0 +1,15 @@
+project(DefinitionEx)
+add_library(
+ DefinitionEx STATIC
+ Parser.cpp
+ Term.cpp
+ Token.cpp
+ )
+target_include_directories(
+ DefinitionEx
+ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
+ )
+target_link_libraries(
+ DefinitionEx
+ PUBLIC FoundationEx
+ )
diff --git a/StarsEx/Parser.cpp b/DefinitionEx/Parser.cpp
index 09827cf..09827cf 100644
--- a/StarsEx/Parser.cpp
+++ b/DefinitionEx/Parser.cpp
diff --git a/StarsEx/Parser.h b/DefinitionEx/Parser.h
index 84fe268..84fe268 100644
--- a/StarsEx/Parser.h
+++ b/DefinitionEx/Parser.h
diff --git a/StarsEx/Term.cpp b/DefinitionEx/Term.cpp
index acd2c74..acd2c74 100644
--- a/StarsEx/Term.cpp
+++ b/DefinitionEx/Term.cpp
diff --git a/StarsEx/Term.h b/DefinitionEx/Term.h
index 79e2fc3..79e2fc3 100644
--- a/StarsEx/Term.h
+++ b/DefinitionEx/Term.h
diff --git a/StarsEx/Token.cpp b/DefinitionEx/Token.cpp
index 2cc97b5..2cc97b5 100644
--- a/StarsEx/Token.cpp
+++ b/DefinitionEx/Token.cpp
diff --git a/StarsEx/Token.h b/DefinitionEx/Token.h
index bd3723b..bd3723b 100644
--- a/StarsEx/Token.h
+++ b/DefinitionEx/Token.h
diff --git a/StarsEx/CMakeLists.txt b/StarsEx/CMakeLists.txt
index d734420..f637326 100644
--- a/StarsEx/CMakeLists.txt
+++ b/StarsEx/CMakeLists.txt
@@ -187,7 +187,6 @@ add_library(
PCX.CPP
Panic.cpp
ParseUtil.cpp
- Parser.cpp
Particles.cpp
Physical.cpp
PlanScreen.cpp
@@ -248,7 +247,6 @@ add_library(
TacRefDlg.cpp
TacticalAI.cpp
TacticalView.cpp
- Term.cpp
Terrain.cpp
TerrainApron.cpp
TerrainClouds.cpp
@@ -258,7 +256,6 @@ add_library(
TexCubeDX9.cpp
TexDX9.cpp
Thruster.cpp
- Token.cpp
TrackIR.cpp
Trail.cpp
VidDlg.cpp
@@ -284,6 +281,7 @@ target_include_directories(
)
target_link_libraries(
StarsEx
+ PUBLIC DefinitionEx
PUBLIC FoundationEx
PUBLIC NetEx
PUBLIC Zlib::zlib