diff options
| author | Eugenio Favalli <elvenprogrammer@gmail.com> | 2007-01-14 22:29:06 +0000 |
|---|---|---|
| committer | Eugenio Favalli <elvenprogrammer@gmail.com> | 2007-01-14 22:29:06 +0000 |
| commit | 2a7e2e34e85abd33b41499420565e988c26ca062 (patch) | |
| tree | ecf0c5a741deb3cd2e4f6f2412e9a32e8eb7b37e | |
| parent | f842e0b40d8382011f0bc46b1446945d99ac0425 (diff) | |
| download | mana-2a7e2e34e85abd33b41499420565e988c26ca062.tar.gz mana-2a7e2e34e85abd33b41499420565e988c26ca062.tar.bz2 mana-2a7e2e34e85abd33b41499420565e988c26ca062.tar.xz mana-2a7e2e34e85abd33b41499420565e988c26ca062.zip | |
Fixed windows headers issues
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/gui/updatewindow.cpp | 5 | ||||
| -rw-r--r-- | src/main.cpp | 2 | ||||
| -rw-r--r-- | tmw.cbp | 31 |
4 files changed, 10 insertions, 35 deletions
@@ -1,4 +1,9 @@ -2007-01-14 Bjørn Lindeijer <bjorn@lindeijer.nl> +2006-01-14 Eugenio Favalli <elvenprogrammer@gmail.com> + + * src/gui/updatewindow.cpp, src/main.cpp, tmw.cbp: Fixed windows + headers issues. + +2007-01-14 Bjørn Lindeijer <bjorn@lindeijer.nl> * src/game.cpp, src/main.cpp, src/gui/trade.cpp, src/gui/sell.cpp, src/gui/connection.cpp, src/gui/buddywindow.cpp, src/gui/browserbox.h, diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp index 86d0a57c..628082d0 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -28,8 +28,6 @@ #include <SDL_thread.h> #include <zlib.h> -#include <curl/curl.h> - #include <guichan/widgets/label.hpp> #include "browserbox.h" @@ -37,6 +35,9 @@ #include "progressbar.h" #include "scrollarea.h" +// Curl should be included after Guichan to avoid Windows redefinitions +#include <curl/curl.h> + #include "../configuration.h" #include "../log.h" #include "../main.h" diff --git a/src/main.cpp b/src/main.cpp index 8c70d62f..08fe693a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,8 +39,6 @@ #if (defined __USE_UNIX98 || defined __FreeBSD__) #include <cerrno> #include <sys/stat.h> -#elif defined WIN32 -#define NOGDI #endif #include "configuration.h" @@ -19,6 +19,7 @@ <Compiler> <Add option="-Wall"/> <Add option="-DUSE_OPENGL"/> + <Add option="-DNOGDI"/> </Compiler> <Linker> <Add library="guichan"/> @@ -166,16 +167,6 @@ <Option link="0"/> <Option target="default"/> </Unit> - <Unit filename="src\gui\buddywindow.cpp"> - <Option compilerVar="CPP"/> - <Option target="default"/> - </Unit> - <Unit filename="src\gui\buddywindow.h"> - <Option compilerVar=""/> - <Option compile="0"/> - <Option link="0"/> - <Option target="default"/> - </Unit> <Unit filename="src\gui\button.cpp"> <Option compilerVar="CPP"/> <Option target="default"/> @@ -226,16 +217,6 @@ <Option link="0"/> <Option target="default"/> </Unit> - <Unit filename="src\gui\chargedialog.cpp"> - <Option compilerVar="CPP"/> - <Option target="default"/> - </Unit> - <Unit filename="src\gui\chargedialog.h"> - <Option compilerVar=""/> - <Option compile="0"/> - <Option link="0"/> - <Option target="default"/> - </Unit> <Unit filename="src\gui\chat.cpp"> <Option compilerVar="CPP"/> <Option target="default"/> @@ -452,16 +433,6 @@ <Option link="0"/> <Option target="default"/> </Unit> - <Unit filename="src\gui\newskill.cpp"> - <Option compilerVar="CPP"/> - <Option target="default"/> - </Unit> - <Unit filename="src\gui\newskill.h"> - <Option compilerVar=""/> - <Option compile="0"/> - <Option link="0"/> - <Option target="default"/> - </Unit> <Unit filename="src\gui\npc_text.cpp"> <Option compilerVar="CPP"/> <Option target="default"/> |