diff --git a/data/makefile b/data/makefile index 189681b..88b0e01 100644 --- a/data/makefile +++ b/data/makefile @@ -307,8 +307,8 @@ trg/help_$(DT).trg: $(HELPFILE) # StringTable # -trg/strings_$(DT).trg: ../game/strings.h - $(MONO) $(TOOLDIR)/stringtable.exe ../game/strings.h $(OUTDIR)/strings.bin +trg/strings_$(DT).trg: ../game/wistrings.h + $(MONO) $(TOOLDIR)/stringtable.exe ../game/wistrings.h $(OUTDIR)/strings.bin @echo x > trg/strings_$(DT).trg # diff --git a/game/Miner.cpp b/game/Miner.cpp index 77e064d..0e87fa6 100644 --- a/game/Miner.cpp +++ b/game/Miner.cpp @@ -1,5 +1,5 @@ #include "ht.h" -#include "strings.h" +#include "wistrings.h" namespace wi { diff --git a/game/Processor.cpp b/game/Processor.cpp index b64f38c..0b622fb 100644 --- a/game/Processor.cpp +++ b/game/Processor.cpp @@ -1,5 +1,5 @@ #include "ht.h" -#include "strings.h" +#include "wistrings.h" namespace wi { diff --git a/game/Replicator.cpp b/game/Replicator.cpp index 9c26991..7c25d5c 100644 --- a/game/Replicator.cpp +++ b/game/Replicator.cpp @@ -1,5 +1,5 @@ #include "ht.h" -#include "strings.h" +#include "wistrings.h" namespace wi { diff --git a/game/Research.cpp b/game/Research.cpp index 24be923..15b4a6d 100644 --- a/game/Research.cpp +++ b/game/Research.cpp @@ -1,5 +1,5 @@ #include "ht.h" -#include "strings.h" +#include "wistrings.h" namespace wi { diff --git a/game/SimUI.cpp b/game/SimUI.cpp index 68a538c..a1177e7 100644 --- a/game/SimUI.cpp +++ b/game/SimUI.cpp @@ -1,6 +1,6 @@ #include "game/ht.h" #include "mpshared/netmessage.h" -#include "game/strings.h" +#include "game/wistrings.h" #include "game/statetracker.h" #include "game/stateframe.h" #include "game/uploader.h" diff --git a/game/Simulation.cpp b/game/Simulation.cpp index 1357d94..58725ba 100644 --- a/game/Simulation.cpp +++ b/game/Simulation.cpp @@ -1,5 +1,5 @@ #include "game/ht.h" -#include "game/strings.h" +#include "game/wistrings.h" #include "game/stateframe.h" namespace wi { diff --git a/game/Struct.cpp b/game/Struct.cpp index 8868d13..cde13e8 100644 --- a/game/Struct.cpp +++ b/game/Struct.cpp @@ -1,5 +1,5 @@ #include "ht.h" -#include "strings.h" +#include "wistrings.h" namespace wi { diff --git a/game/game.cpp b/game/game.cpp index c15fff1..7ed8713 100644 --- a/game/game.cpp +++ b/game/game.cpp @@ -1,5 +1,5 @@ #include "game/ht.h" -#include "game/strings.h" +#include "game/wistrings.h" #include "mpshared/netmessage.h" #include "game/httppackmanager.h" #include "game/completemanager.h" diff --git a/game/misc.cpp b/game/misc.cpp index 3ebb148..93ab2ac 100644 --- a/game/misc.cpp +++ b/game/misc.cpp @@ -1,5 +1,5 @@ #include "ht.h" -#include "strings.h" +#include "wistrings.h" namespace wi { diff --git a/game/sdl/htsdl.xcodeproj/project.pbxproj b/game/sdl/htsdl.xcodeproj/project.pbxproj index 3a94add..f46571c 100644 --- a/game/sdl/htsdl.xcodeproj/project.pbxproj +++ b/game/sdl/htsdl.xcodeproj/project.pbxproj @@ -601,7 +601,7 @@ 55C5ACCF1390627C003B15C5 /* StateMachine.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StateMachine.cpp; sourceTree = ""; }; 55C5ACD01390627C003B15C5 /* statetracker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = statetracker.cpp; sourceTree = ""; }; 55C5ACD11390627C003B15C5 /* statetracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = statetracker.h; sourceTree = ""; }; - 55C5ACD21390627C003B15C5 /* strings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = strings.h; sourceTree = ""; }; + 55C5ACD21390627C003B15C5 /* wistrings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = wistrings.h; sourceTree = ""; }; 55C5ACD31390627C003B15C5 /* stringtable.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = stringtable.cpp; sourceTree = ""; }; 55C5ACD41390627C003B15C5 /* Struct.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Struct.cpp; sourceTree = ""; }; 55C5ACD51390627C003B15C5 /* stylushandler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = stylushandler.cpp; sourceTree = ""; }; @@ -1062,7 +1062,7 @@ 55C5ACCF1390627C003B15C5 /* StateMachine.cpp */, 55C5ACD01390627C003B15C5 /* statetracker.cpp */, 55C5ACD11390627C003B15C5 /* statetracker.h */, - 55C5ACD21390627C003B15C5 /* strings.h */, + 55C5ACD21390627C003B15C5 /* wistrings.h */, 55C5ACD31390627C003B15C5 /* stringtable.cpp */, 55C5ACD41390627C003B15C5 /* Struct.cpp */, 55C5ACD51390627C003B15C5 /* stylushandler.cpp */, diff --git a/game/wi.xcodeproj/project.pbxproj b/game/wi.xcodeproj/project.pbxproj index 1cc352b..b8ab9c6 100755 --- a/game/wi.xcodeproj/project.pbxproj +++ b/game/wi.xcodeproj/project.pbxproj @@ -387,7 +387,7 @@ C17D66480D9E15BE00CB9F01 /* SpInfantry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpInfantry.cpp; sourceTree = SOURCE_ROOT; }; C17D66490D9E15BE00CB9F01 /* SRInfantry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SRInfantry.cpp; sourceTree = SOURCE_ROOT; }; C17D664A0D9E15BE00CB9F01 /* StateMachine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StateMachine.cpp; sourceTree = SOURCE_ROOT; }; - C17D664B0D9E15BE00CB9F01 /* strings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = strings.h; sourceTree = SOURCE_ROOT; }; + C17D664B0D9E15BE00CB9F01 /* wistrings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wistrings.h; sourceTree = SOURCE_ROOT; }; C17D664C0D9E15BE00CB9F01 /* stringtable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stringtable.cpp; sourceTree = SOURCE_ROOT; }; C17D664D0D9E15BE00CB9F01 /* Struct.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Struct.cpp; sourceTree = SOURCE_ROOT; }; C17D664E0D9E15BE00CB9F01 /* Tank.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Tank.cpp; sourceTree = SOURCE_ROOT; }; @@ -651,7 +651,7 @@ C17D66480D9E15BE00CB9F01 /* SpInfantry.cpp */, C17D66490D9E15BE00CB9F01 /* SRInfantry.cpp */, C17D664A0D9E15BE00CB9F01 /* StateMachine.cpp */, - C17D664B0D9E15BE00CB9F01 /* strings.h */, + C17D664B0D9E15BE00CB9F01 /* wistrings.h */, C17D664C0D9E15BE00CB9F01 /* stringtable.cpp */, C17D664D0D9E15BE00CB9F01 /* Struct.cpp */, C17D664E0D9E15BE00CB9F01 /* Tank.cpp */, diff --git a/game/strings.h b/game/wistrings.h similarity index 90% rename from game/strings.h rename to game/wistrings.h index ecb12d1..0eb5dfe 100644 --- a/game/strings.h +++ b/game/wistrings.h @@ -1,7 +1,5 @@ -#ifndef __STRINGS_H__ -#define __STRINGS_H__ - -#ifndef __OBJC__ // SDL.h ends up including this when it is trying to include the CRT strings.h +#ifndef __WISTRINGS_H__ +#define __WISTRINGS_H__ namespace wi { @@ -48,5 +46,4 @@ enum Strings { } // namespace wi -#endif // ndef __OBJC__ -#endif // ndef __STRINGS_H__ +#endif // ndef __WISTRINGS_H__