dahjah/hostile-takeover
1
0
Fork 0
mirror of https://github.com/spiffcode/hostile-takeover.git synced 2026-05-12 10:09:39 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

strings.h -> wistrings.h

Browse Source 
Change strings.h to wistrings.h to prevent SDL.h from including it
while trying to include the CRT strings.h
This commit is contained in:
Nathan Fulton 2016-08-24 21:40:38 -04:00
parent aeb247e975
commit 4aadbf87cb
13 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/makefile
View File

@ -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
#

2
game/Miner.cpp
View File

@ -1,5 +1,5 @@
#include "ht.h"
#include "strings.h"
#include "wistrings.h"
namespace wi {

2
game/Processor.cpp
View File

@ -1,5 +1,5 @@
#include "ht.h"
#include "strings.h"
#include "wistrings.h"
namespace wi {

2
game/Replicator.cpp
View File

@ -1,5 +1,5 @@
#include "ht.h"
#include "strings.h"
#include "wistrings.h"
namespace wi {

2
game/Research.cpp
View File

@ -1,5 +1,5 @@
#include "ht.h"
#include "strings.h"
#include "wistrings.h"
namespace wi {

2
game/SimUI.cpp
View File

@ -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"

2
game/Simulation.cpp
View File

@ -1,5 +1,5 @@
#include "game/ht.h"
#include "game/strings.h"
#include "game/wistrings.h"
#include "game/stateframe.h"
namespace wi {

2
game/Struct.cpp
View File

@ -1,5 +1,5 @@
#include "ht.h"
#include "strings.h"
#include "wistrings.h"
namespace wi {

2
game/game.cpp
View File

@ -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"

2
game/misc.cpp
View File

@ -1,5 +1,5 @@
#include "ht.h"
#include "strings.h"
#include "wistrings.h"
namespace wi {

4
game/sdl/htsdl.xcodeproj/project.pbxproj
View File

@ -601,7 +601,7 @@
55C5ACCF1390627C003B15C5 /* StateMachine.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StateMachine.cpp; sourceTree = "<group>"; };
55C5ACD01390627C003B15C5 /* statetracker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = statetracker.cpp; sourceTree = "<group>"; };
55C5ACD11390627C003B15C5 /* statetracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = statetracker.h; sourceTree = "<group>"; };
55C5ACD21390627C003B15C5 /* strings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = strings.h; sourceTree = "<group>"; };
55C5ACD21390627C003B15C5 /* wistrings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = wistrings.h; sourceTree = "<group>"; };
55C5ACD31390627C003B15C5 /* stringtable.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = stringtable.cpp; sourceTree = "<group>"; };
55C5ACD41390627C003B15C5 /* Struct.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Struct.cpp; sourceTree = "<group>"; };
55C5ACD51390627C003B15C5 /* stylushandler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = stylushandler.cpp; sourceTree = "<group>"; };
@ -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 */,

4
game/wi.xcodeproj/project.pbxproj
View File

@ -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 */,

9
game/strings.h → game/wistrings.h
View File

@ -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__