Changeset 1050Tweet

Timestamp:

Nov 6, 2011, 2:07:47 AM (11 years ago)

Author:

sam

Message:

test: fix OS X compilation; we still need SDLmain.a on that platform.

Location:

trunk

Files:

• src/video.cpp (modified) (1 diff)
• test/math/pi.cpp (modified) (1 diff)
• test/math/poly.cpp (modified) (2 diffs)
• test/math/remez.cpp (modified) (2 diffs)
• test/tutorial/tut01.cpp (modified) (1 diff)
• test/tutorial/tut02.cpp (modified) (1 diff)
• test/xolotl/xolotl.cpp (modified) (1 diff)

trunk/src/video.cpp

@@ -45 +45 @@
 
 #if defined __ANDROID__ || defined __CELLOS_LV2__ || defined __APPLE__
-ivec2 VideoData::saved_viewport = 0;
+ivec2 VideoData::saved_viewport(0, 0);
 #endif
 

trunk/test/math/pi.cpp

@@ -14 +14 @@
 
 #include <cstdio>
+
+#if USE_SDL && defined __APPLE__
+#   include <SDL_main.h>
+#endif
 
 #include "core.h"

trunk/test/math/poly.cpp

@@ -14 +14 @@
 
 #include <cstdio>
+
+#if USE_SDL && defined __APPLE__
+#   include <SDL_main.h>
+#endif
 
 #include "core.h"
@@ -96 +100 @@
 }
 
-int main(void)
+int main(int argc, char **argv)
 {
     typedef union { float f; uint32_t x; } flint;

trunk/test/math/remez.cpp

@@ -15 +15 @@
 #include <cstring>
 #include <cstdio>
+
+#if USE_SDL && defined __APPLE__
+#   include <SDL_main.h>
+#endif
 
 #include "core.h"
@@ -37 +41 @@
 }
 
-int main(void)
+int main(int argc, char **argv)
 {
     RemezSolver<6> solver;

trunk/test/tutorial/tut01.cpp

@@ -111 +111 @@
 };
 
-int main()
+int main(int argc, char **argv)
 {
     Application app("Tutorial 1: Triangle", ivec2(640, 480), 60.0f);

trunk/test/tutorial/tut02.cpp

@@ -174 +174 @@
 };
 
-int main()
+int main(int argc, char **argv)
 {
     Application app("Tutorial 2: Cube", ivec2(640, 480), 60.0f);

trunk/test/xolotl/xolotl.cpp

@@ -64 +64 @@
 };
 
-int main()
+int main(int argc, char **argv)
 {
     Application app("Xolotl", ivec2(640, 480), 60.0f);