diff options
author | Aki <please@ignore.pl> | 2022-04-07 00:35:59 +0200 |
---|---|---|
committer | Aki <please@ignore.pl> | 2022-04-07 00:35:59 +0200 |
commit | 6466c06e44684952dd28cd5a6ac3968bdb81646e (patch) | |
tree | 13c85cd91a89b761b2b66eac4da11c4c6df3556d | |
parent | 39f7f892fe4f995bb354ab2a87d46c5c04a9fd25 (diff) | |
download | starshatter-6466c06e44684952dd28cd5a6ac3968bdb81646e.zip starshatter-6466c06e44684952dd28cd5a6ac3968bdb81646e.tar.gz starshatter-6466c06e44684952dd28cd5a6ac3968bdb81646e.tar.bz2 |
Changed file names for Parser to avoid conflict in MSVC environment
-rw-r--r-- | DefinitionEx/CMakeLists.txt | 2 | ||||
-rw-r--r-- | DefinitionEx/Parser_ss.cpp (renamed from DefinitionEx/Parser.cpp) | 2 | ||||
-rw-r--r-- | DefinitionEx/Parser_ss.h (renamed from DefinitionEx/Parser.h) | 0 | ||||
-rw-r--r-- | StarsEx/ParseUtil.h | 2 | ||||
-rw-r--r-- | StarsEx/Ship.cpp | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/DefinitionEx/CMakeLists.txt b/DefinitionEx/CMakeLists.txt index 9dd6620..fe4e819 100644 --- a/DefinitionEx/CMakeLists.txt +++ b/DefinitionEx/CMakeLists.txt @@ -1,7 +1,7 @@ project(DefinitionEx) add_library( DefinitionEx STATIC - Parser.cpp + Parser_ss.cpp Term.cpp Token.cpp ) diff --git a/DefinitionEx/Parser.cpp b/DefinitionEx/Parser_ss.cpp index 869c316..94f7856 100644 --- a/DefinitionEx/Parser.cpp +++ b/DefinitionEx/Parser_ss.cpp @@ -13,7 +13,7 @@ #include "Reader.h" #include "Token.h" -#include "Parser.h" +#include "Parser_ss.h" #include "Term.h" #include "Utils.h" #include <stdio.h> diff --git a/DefinitionEx/Parser.h b/DefinitionEx/Parser_ss.h index 7ddd256..7ddd256 100644 --- a/DefinitionEx/Parser.h +++ b/DefinitionEx/Parser_ss.h diff --git a/StarsEx/ParseUtil.h b/StarsEx/ParseUtil.h index c234d00..43ddab3 100644 --- a/StarsEx/ParseUtil.h +++ b/StarsEx/ParseUtil.h @@ -20,7 +20,7 @@ #include "Color.h" #include "Text.h" -#include "Parser.h" +#include "Parser_ss.h" #include "Reader.h" #include "Token.h" diff --git a/StarsEx/Ship.cpp b/StarsEx/Ship.cpp index 531f99f..921bc58 100644 --- a/StarsEx/Ship.cpp +++ b/StarsEx/Ship.cpp @@ -85,7 +85,7 @@ #include "DataLoader.h" #include "Panic.h" -#include "Parser.h" +#include "Parser_ss.h" #include "Reader.h" // +----------------------------------------------------------------------+ |