diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-08-18 22:57:34 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-08-18 22:57:53 +0200 |
| commit | ee8f131b49bb9b1d66cac3840b3c566eb49bcf3f (patch) | |
| tree | 26c428345270d62c0bbc0045fc3f7de73aab0ba9 | |
| parent | d8d9232a67a03548b827bdb0515fe7a620a488f8 (diff) | |
| parent | 4b30182fc569f99925d6c73b9235fa728afa4ce8 (diff) | |
| download | mana-client-ee8f131b49bb9b1d66cac3840b3c566eb49bcf3f.tar.gz mana-client-ee8f131b49bb9b1d66cac3840b3c566eb49bcf3f.tar.bz2 mana-client-ee8f131b49bb9b1d66cac3840b3c566eb49bcf3f.tar.xz mana-client-ee8f131b49bb9b1d66cac3840b3c566eb49bcf3f.zip | |
Merge branch '1.0'
Conflicts:
src/log.cpp
| -rw-r--r-- | mana.cbp | 24 | ||||
| -rwxr-xr-x | packaging/make-dist.sh | 8 | ||||
| -rw-r--r-- | src/log.cpp | 13 |
3 files changed, 34 insertions, 11 deletions
@@ -16,6 +16,8 @@ <Compiler> <Add option="-O3" /> <Add option="-Wall" /> + <Add option="-Wno-switch" /> + <Add option="-Wno-unknown-pragmas" /> <Add option="-DUSE_OPENGL" /> <Add option="-DNOGDI" /> <Add option="-DENABLE_NLS" /> @@ -42,10 +44,8 @@ <Add library="physfs" /> <Add library="curl.dll" /> <Add library="intl" /> - <Add library="enet" /> <Add library="ws2_32" /> <Add library="winmm" /> - <Add directory="E:\Programme\CodeBlocks\include\SDL" /> </Linker> </Target> <Target title="Unix"> @@ -77,7 +77,6 @@ <Add library="SDL_ttf" /> <Add library="SDL_gfx" /> <Add library="png" /> - <Add library="enet" /> </Linker> </Target> </Build> @@ -89,10 +88,29 @@ <Add directory="include" /> <Add directory="include\libxml2" /> <Add directory="include\SDL" /> + <Add directory="libs\enet\include" /> </Compiler> <Linker> <Add directory="lib" /> </Linker> + <Unit filename="libs\enet\include\enet\callbacks.h" /> + <Unit filename="libs\enet\callbacks.c" /> + <Unit filename="libs\enet\compress.c" /> + <Unit filename="libs\enet\include\enet\enet.h" /> + <Unit filename="libs\enet\host.c" /> + <Unit filename="libs\enet\include\enet\list.h" /> + <Unit filename="libs\enet\list.c" /> + <Unit filename="libs\enet\packet.c" /> + <Unit filename="libs\enet\peer.c" /> + <Unit filename="libs\enet\include\enet\protocol.h" /> + <Unit filename="libs\enet\protocol.c" /> + <Unit filename="libs\enet\include\enet\time.h" /> + <Unit filename="libs\enet\include\enet\types.h" /> + <Unit filename="libs\enet\include\enet\unix.h" /> + <Unit filename="libs\enet\unix.c" /> + <Unit filename="libs\enet\include\enet\utility.h" /> + <Unit filename="libs\enet\include\enet\win32.h" /> + <Unit filename="libs\enet\win32.c" /> <Unit filename="src\SDLMain.h" /> <Unit filename="src\SDLMain.m" /> <Unit filename="src\actor.cpp" /> diff --git a/packaging/make-dist.sh b/packaging/make-dist.sh new file mode 100755 index 00000000..d3838d60 --- /dev/null +++ b/packaging/make-dist.sh @@ -0,0 +1,8 @@ +#!/bin/bash +if [ "$#" -eq "0" ]; then + echo "Usage: make-dist.sh <version>" + exit 1 +fi +name="mana-$1" +git archive -v --prefix="$name/" HEAD | gzip > "$name.tar.gz" +echo "Release ready as $name.tar.gz" diff --git a/src/log.cpp b/src/log.cpp index 0da9a272..a147c107 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -19,23 +19,20 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <iostream> -#include <sstream> - -#include <stdio.h> -#include <stdarg.h> - #include "log.h" #ifdef WIN32 #include <windows.h> #elif __APPLE__ #include <Carbon/Carbon.h> -#elif __linux__ || __linux -#include <stdlib.h> #endif #include <sys/time.h> +#include <iostream> +#include <sstream> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> Logger::Logger(): mLogToStandardOut(true) |