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 /test/envs/opengl/model_test.cpp | |
| 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 'test/envs/opengl/model_test.cpp')
| -rw-r--r-- | test/envs/opengl/model_test.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/test/envs/opengl/model_test.cpp b/test/envs/opengl/model_test.cpp index 882b785..168eb32 100644 --- a/test/envs/opengl/model_test.cpp +++ b/test/envs/opengl/model_test.cpp @@ -1,5 +1,6 @@ #include "app/system.h" +#include "common/config.h" #include "common/logger.h" #include "common/image.h" @@ -8,8 +9,8 @@ #include "math/geometry.h" -#include <SDL/SDL.h> -#include <SDL/SDL_image.h> +#include <SDL.h> +#include <SDL_image.h> #include <unistd.h> #include <iostream> @@ -257,7 +258,10 @@ void KeyboardUp(SDLKey key) } } -int main(int argc, char *argv[]) +extern "C" +{ + +int SDL_MAIN_FUNC(int argc, char *argv[]) { CLogger logger; @@ -378,3 +382,5 @@ int main(int argc, char *argv[]) return 0; } + +} // extern "C" |