flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed Linux compilation.

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@550 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
cedeel@gmail.com 2012-06-04 13:35:41 +00:00
parent b355bdecce
commit 6fb868d196
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
makefile_base
View File

@ -253,7 +253,8 @@ MCServer : \
build/WSSCompact.o\ build/WSSCompact.o\
build/WSSAnvil.o\ build/WSSAnvil.o\
build/FastNBT.o\ build/FastNBT.o\
build/StringCompression.o build/StringCompression.o\
build/CraftingRecipes.o
$(CC) $(LNK_OPTIONS) \ $(CC) $(LNK_OPTIONS) \
build/json_reader.o\ build/json_reader.o\
build/json_value.o\ build/json_value.o\
@ -476,6 +477,7 @@ MCServer : \
build/WSSAnvil.o\ build/WSSAnvil.o\
build/FastNBT.o\ build/FastNBT.o\
build/StringCompression.o\ build/StringCompression.o\
build/CraftingRecipes.o\
-o MCServer -o MCServer
clean : clean :
@ -696,6 +698,7 @@ clean :
build/StringUtils.o\ build/StringUtils.o\
build/cIsThread.o\ build/cIsThread.o\
build/cSocketThreads.o\ build/cSocketThreads.o\
build/CraftingRecipes.o\
MCServer MCServer
install : MCServer install : MCServer
@ -1604,6 +1607,9 @@ build/StringCompression.o : source/StringCompression.cpp
build/cRedstoneSimulator.o : source/cRedstoneSimulator.cpp build/cRedstoneSimulator.o : source/cRedstoneSimulator.cpp
$(CC) $(CC_OPTIONS) source/cRedstoneSimulator.cpp -c $(INCLUDE) -o build/cRedstoneSimulator.o $(CC) $(CC_OPTIONS) source/cRedstoneSimulator.cpp -c $(INCLUDE) -o build/cRedstoneSimulator.o
build/CraftingRecipes.o : source/CraftingRecipes.cpp
$(CC) $(CC_OPTIONS) source/CraftingRecipes.cpp -c $(INCLUDE) -o build/CraftingRecipes.o
# Template: copy and delete the "# "; insert filenames # Template: copy and delete the "# "; insert filenames
# build/.o : source/.cpp # build/.o : source/.cpp
# $(CC) $(CC_OPTIONS) source/.cpp -c $(INCLUDE) -o build/.o # $(CC) $(CC_OPTIONS) source/.cpp -c $(INCLUDE) -o build/.o

2
source/BlockID.cpp
View File

@ -36,7 +36,7 @@ public:
return m_Ini.GetValueI("Items", a_ItemName, -1); return m_Ini.GetValueI("Items", a_ItemName, -1);
} }
AString ResolveString(AString & a_ItemName) AString ResolveString(const AString & a_ItemName)
{ {
return m_Ini.GetValue("Items", a_ItemName, ""); return m_Ini.GetValue("Items", a_ItemName, "");
} }