summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugenio Favalli <elvenprogrammer@gmail.com>2007-11-16 14:14:00 +0000
committerEugenio Favalli <elvenprogrammer@gmail.com>2007-11-16 14:14:00 +0000
commit108c42a734dc4f0f60c9022a5142702285ffb9db (patch)
tree2954f10a93b6c8fd92eed0f5aad59f80611d74da
parent81ca76356fe367d2b9467433a9acb732d6c9becb (diff)
downloadmana-client-108c42a734dc4f0f60c9022a5142702285ffb9db.tar.gz
mana-client-108c42a734dc4f0f60c9022a5142702285ffb9db.tar.bz2
mana-client-108c42a734dc4f0f60c9022a5142702285ffb9db.tar.xz
mana-client-108c42a734dc4f0f60c9022a5142702285ffb9db.zip
Fixed minor issues.
-rw-r--r--ChangeLog1
-rw-r--r--src/log.cpp2
-rw-r--r--tmw.cbp12
3 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0a8ea89f..1490abf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
* src/log.cpp, src/utils/wingettimeofday.h: Removed useless win32
implementation of gettimeofday.
+ * src/log.cpp, tmw.cbp: Fixed minor issues.
2007-11-16 Bjørn Lindeijer <bjorn@lindeijer.nl>
diff --git a/src/log.cpp b/src/log.cpp
index 97d8e460..63a34776 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -27,7 +27,7 @@
#include <sys/time.h>
#ifdef WIN32
-#include <winuser.h>
+#include <windows.h>
#elif __APPLE__
#include <Carbon/Carbon.h>
#endif
diff --git a/tmw.cbp b/tmw.cbp
index f78ff7f0..e4a6e20a 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -35,7 +35,7 @@
<Add library="SDL.dll"/>
<Add library="xml2.dll"/>
<Add library="opengl32"/>
- <Add library="png.dll"/>
+ <Add library="png12.dll"/>
<Add library="z.dll"/>
<Add library="physfs"/>
<Add library="curl.dll"/>
@@ -1511,6 +1511,16 @@
<Option link="0"/>
<Option target="default"/>
</Unit>
+ <Unit filename="src\shopitem.cpp">
+ <Option compilerVar="CPP"/>
+ <Option target="default"/>
+ </Unit>
+ <Unit filename="src\shopitem.h">
+ <Option compilerVar=""/>
+ <Option compile="0"/>
+ <Option link="0"/>
+ <Option target="default"/>
+ </Unit>
<Unit filename="src\simpleanimation.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>