From de293999872346271cdfb5dbecbad7f77362b83b Mon Sep 17 00:00:00 2001 From: faketruth Date: Fri, 27 Jan 2012 23:47:32 +0000 Subject: Converted entire Core plugin including WebAdmin interface to new plugin method/system/thingy and sexyfied it. Made some changes to WebAdmin to make the new plugins work Old plugins still work like they're supposed to Not all hooks have been programmed for the new plugins yet, this still needs to be done git-svn-id: http://mc-server.googlecode.com/svn/trunk@182 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- makefile | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'makefile') diff --git a/makefile b/makefile index 7f922f4a0..378847ffe 100644 --- a/makefile +++ b/makefile @@ -10,10 +10,10 @@ # Macros # -CC = /usr/bin/g++ -msse4 -CC_OPTIONS = -O2 -s -CCE_OPTIONS = -O2 -s -x c -LNK_OPTIONS = -lstdc++ -pthread +CC = /usr/bin/g++ +CC_OPTIONS = -s -O3 +CCE_OPTIONS = -s -x c -O3 +LNK_OPTIONS = -lstdc++ -O3 # @@ -243,7 +243,9 @@ MCServer : \ build/cLavaSimulator.o\ build/cFireSimulator.o\ build/cFileFormatUpdater.o\ - build/cItem.o + build/cItem.o\ + build/cPlugin_NewLua.o\ + build/cWebPlugin_Lua.o $(CC) $(LNK_OPTIONS) \ build/json_reader.o\ build/json_value.o\ @@ -450,6 +452,8 @@ MCServer : \ build/cFireSimulator.o\ build/cFileFormatUpdater.o\ build/cItem.o\ + build/cPlugin_NewLua.o\ + build/cWebPlugin_Lua.o\ -o MCServer clean : @@ -659,6 +663,8 @@ clean : build/cFireSimulator.o\ build/cFileFormatUpdater.o\ build/cItem.o\ + build/cPlugin_NewLua.o\ + build/cWebPlugin_Lua.o\ MCServer install : MCServer @@ -1505,4 +1511,10 @@ build/cFileFormatUpdater.o : source/cFileFormatUpdater.cpp build/cItem.o : source/cItem.cpp $(CC) $(CC_OPTIONS) source/cItem.cpp -c $(INCLUDE) -o build/cItem.o +build/cPlugin_NewLua.o : source/cPlugin_NewLua.cpp + $(CC) $(CC_OPTIONS) source/cPlugin_NewLua.cpp -c $(INCLUDE) -o build/cPlugin_NewLua.o + +build/cWebPlugin_Lua.o : source/cWebPlugin_Lua.cpp + $(CC) $(CC_OPTIONS) source/cWebPlugin_Lua.cpp -c $(INCLUDE) -o build/cWebPlugin_Lua.o + ##### END RUN #### -- cgit v1.2.3