diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-10-17 22:07:24 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-10-17 22:07:24 +0300 |
commit | d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a (patch) | |
tree | 5f128768c66436eefd70632f02889607596609d4 /manaplus.cbp | |
parent | f1e92aca00a4859047e83fab76220767b9a2f814 (diff) | |
parent | e93e6beb456d105987da3190c2a80847b6900081 (diff) | |
download | plus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.gz plus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.bz2 plus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.xz plus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.zip |
Merge branch 'master' into strippedstripped1.1.10.16
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
Diffstat (limited to 'manaplus.cbp')
-rw-r--r-- | manaplus.cbp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/manaplus.cbp b/manaplus.cbp index 1f7308935..3d9ddb4be 100644 --- a/manaplus.cbp +++ b/manaplus.cbp @@ -53,7 +53,7 @@ </Target>
<Target title="Unix">
<Option platforms="Unix;" />
- <Option output="mana" prefix_auto="1" extension_auto="1" />
+ <Option output="manaplus" prefix_auto="1" extension_auto="1" />
<Option type="0" />
<Option compiler="gcc" />
<Option parameters='-u -d "../manadata"' />
@@ -63,7 +63,7 @@ <Add option="`sdl-config --cflags`" />
<Add option="-DMANASERV_SUPPORT" />
<Add option="-DUSE_OPENGL" />
- <Add directory="\usr\local\include\libxml2" />
+ <Add directory="\usr\include\libxml2" />
</Compiler>
<Linker>
<Add option="`sdl-config --libs`" />
@@ -272,8 +272,8 @@ <Unit filename="src\gui\textpopup.h" />
<Unit filename="src\gui\theme.cpp" />
<Unit filename="src\gui\theme.h" />
- <Unit filename="src\gui\trade.cpp" />
- <Unit filename="src\gui\trade.h" />
+ <Unit filename="src\gui\tradewindow.cpp" />
+ <Unit filename="src\gui\tradewindow.h" />
<Unit filename="src\gui\sdlfont.cpp" />
<Unit filename="src\gui\sdlfont.h" />
<Unit filename="src\gui\unregisterdialog.cpp" />
|