summaryrefslogtreecommitdiff
path: root/mana.cbp
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2010-11-01 20:04:43 +0100
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2010-11-01 20:04:43 +0100
commit38f7cd9a9a49dc91b1c2e69b48308bd16d4b5aad (patch)
tree81d0e898790264114683cca9cfd3355bea114415 /mana.cbp
parentc5e341f7b5f5e4efcabd09e00e177bb873db8097 (diff)
parent1f69108501c4bf51f3adac9ffbf7a7631fb12b9a (diff)
downloadmana-38f7cd9a9a49dc91b1c2e69b48308bd16d4b5aad.tar.gz
mana-38f7cd9a9a49dc91b1c2e69b48308bd16d4b5aad.tar.bz2
mana-38f7cd9a9a49dc91b1c2e69b48308bd16d4b5aad.tar.xz
mana-38f7cd9a9a49dc91b1c2e69b48308bd16d4b5aad.zip
Merge branch '0.5' of gitorious.org:mana/mana
Conflicts: src/being.cpp src/client.cpp src/commandhandler.cpp src/gui/setup_video.cpp src/gui/socialwindow.cpp src/gui/viewport.cpp src/gui/widgets/browserbox.cpp src/gui/widgets/itemcontainer.cpp src/imageparticle.cpp src/localplayer.cpp src/localplayer.h src/map.cpp src/net/tmwa/beinghandler.cpp src/particle.cpp src/particle.h src/player.cpp src/player.h
Diffstat (limited to 'mana.cbp')
-rw-r--r--mana.cbp6
1 files changed, 1 insertions, 5 deletions
diff --git a/mana.cbp b/mana.cbp
index ec633c9d..5bffc289 100644
--- a/mana.cbp
+++ b/mana.cbp
@@ -14,14 +14,13 @@
<Option parameters="-u -d C:\mana\data" />
<Option projectResourceIncludeDirsRelation="0" />
<Compiler>
+ <Add option="-g" />
<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" />
- <Add option="-DEATHENA_SUPPORT" />
</Compiler>
<Linker>
<Add option="-enable-auto-import" />
@@ -383,9 +382,6 @@
<Unit filename="src\log.h" />
<Unit filename="src\main.cpp" />
<Unit filename="src\main.h" />
- <Unit filename="src\mana-ea.rc">
- <Option compilerVar="WINDRES" />
- </Unit>
<Unit filename="src\mana.rc">
<Option compilerVar="WINDRES" />
</Unit>