diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-03-22 18:19:53 +0100 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-03-22 19:17:08 +0100 |
commit | 4a30800cf16d403a7c25d78388e2822aa396ac86 (patch) | |
tree | 772753228bab7b0b4ba47e89580ed86de0ca098f /src/app | |
parent | 1406464f0ce0b804298e2ee034bdd8bc7856e0dc (diff) | |
download | colobot-4a30800cf16d403a7c25d78388e2822aa396ac86.tar.gz colobot-4a30800cf16d403a7c25d78388e2822aa396ac86.tar.bz2 colobot-4a30800cf16d403a7c25d78388e2822aa396ac86.zip |
Fixes for compiling on MSYS
* fixed SDL_main() and putenv() issues
* disabled desktop subdir for MSYS
* disabled building CBot_console for now
Diffstat (limited to 'src/app')
-rw-r--r-- | src/app/app.cpp | 4 | ||||
-rw-r--r-- | src/app/main.cpp | 7 | ||||
-rw-r--r-- | src/app/system_other.h | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/app/app.cpp b/src/app/app.cpp index cb1ac34..e84091b 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -33,8 +33,8 @@ #include <boost/filesystem.hpp> -#include <SDL/SDL.h> -#include <SDL/SDL_image.h> +#include <SDL.h> +#include <SDL_image.h> #include <stdlib.h> #include <libintl.h> diff --git a/src/app/main.cpp b/src/app/main.cpp index e621065..0622370 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -23,6 +23,7 @@ #include "app/app.h" #include "app/system.h" +#include "common/config.h" #include "common/logger.h" #include "common/misc.h" #include "common/restext.h" @@ -70,7 +71,10 @@ The current layout is the following: //! Entry point to the program -int main(int argc, char *argv[]) +extern "C" +{ + +int SDL_MAIN_FUNC(int argc, char *argv[]) { CLogger logger; // Create the logger @@ -111,3 +115,4 @@ int main(int argc, char *argv[]) return code; } +} // extern "C" diff --git a/src/app/system_other.h b/src/app/system_other.h index 6fb4b86..aee3536 100644 --- a/src/app/system_other.h +++ b/src/app/system_other.h @@ -22,7 +22,7 @@ #include "app/system.h" -#include <SDL/SDL.h> +#include <SDL.h> #include <iostream> |