diff options
Diffstat (limited to 'test/envs/opengl')
-rw-r--r-- | test/envs/opengl/light_test.cpp | 12 | ||||
-rw-r--r-- | test/envs/opengl/model_test.cpp | 12 | ||||
-rw-r--r-- | test/envs/opengl/texture_test.cpp | 12 | ||||
-rw-r--r-- | test/envs/opengl/transform_test.cpp | 12 |
4 files changed, 36 insertions, 12 deletions
diff --git a/test/envs/opengl/light_test.cpp b/test/envs/opengl/light_test.cpp index b1e0151..d4635cc 100644 --- a/test/envs/opengl/light_test.cpp +++ b/test/envs/opengl/light_test.cpp @@ -1,5 +1,6 @@ #include "app/system.h" +#include "common/config.h" #include "common/logger.h" #include "common/image.h" @@ -7,8 +8,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> @@ -357,7 +358,10 @@ void MouseMove(int x, int y) ROTATION.x = ROTATION_BASE.x + (static_cast<float> (y - MOUSE_POS_BASE.y) / 600.0f) * Math::PI; } -int main(int argc, char *argv[]) +extern "C" +{ + +int SDL_MAIN_FUNC(int argc, char *argv[]) { CLogger logger; @@ -460,3 +464,5 @@ int main(int argc, char *argv[]) return 0; } + +} // extern "C" 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" diff --git a/test/envs/opengl/texture_test.cpp b/test/envs/opengl/texture_test.cpp index b1f352c..5c27b43 100644 --- a/test/envs/opengl/texture_test.cpp +++ b/test/envs/opengl/texture_test.cpp @@ -1,3 +1,4 @@ +#include "common/config.h" #include "common/logger.h" #include "common/image.h" @@ -5,8 +6,8 @@ #include "math/geometry.h" -#include <SDL/SDL.h> -#include <SDL/SDL_image.h> +#include <SDL.h> +#include <SDL_image.h> #include <unistd.h> @@ -124,7 +125,10 @@ void Render(Gfx::CGLDevice *device) device->EndScene(); } -int main() +extern "C" +{ + +int SDL_MAIN_FUNC(int argc, char *argv[]) { CLogger logger; @@ -192,3 +196,5 @@ int main() return 0; } + +} // extern "C" diff --git a/test/envs/opengl/transform_test.cpp b/test/envs/opengl/transform_test.cpp index 04c73f7..02f9d83 100644 --- a/test/envs/opengl/transform_test.cpp +++ b/test/envs/opengl/transform_test.cpp @@ -1,5 +1,6 @@ #include "app/system.h" +#include "common/config.h" #include "common/logger.h" #include "common/image.h" #include "common/iman.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> @@ -235,7 +236,10 @@ void MouseMove(int x, int y) ROTATION.x = ROTATION_BASE.x + (static_cast<float> (y - MOUSE_POS_BASE.y) / 600.0f) * Math::PI; } -int main(int argc, char *argv[]) +extern "C" +{ + +int SDL_MAIN_FUNC(int argc, char *argv[]) { CLogger logger; @@ -338,3 +342,5 @@ int main(int argc, char *argv[]) return 0; } + +} // extern "C" |