瀏覽代碼

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

legacy
Sam Hocevar sam 13 年之前
父節點
當前提交
55b8dece84
共有 7 個文件被更改,包括 18 次插入6 次删除
  1. +1
    -1
      src/video.cpp
  2. +4
    -0
      test/math/pi.cpp
  3. +5
    -1
      test/math/poly.cpp
  4. +5
    -1
      test/math/remez.cpp
  5. +1
    -1
      test/tutorial/tut01.cpp
  6. +1
    -1
      test/tutorial/tut02.cpp
  7. +1
    -1
      test/xolotl/xolotl.cpp

+ 1
- 1
src/video.cpp 查看文件

@@ -44,7 +44,7 @@ mat4 VideoData::proj_matrix;
mat4 VideoData::view_matrix;

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

/*


+ 4
- 0
test/math/pi.cpp 查看文件

@@ -14,6 +14,10 @@

#include <cstdio>

#if USE_SDL && defined __APPLE__
# include <SDL_main.h>
#endif

#include "core.h"

using namespace lol;


+ 5
- 1
test/math/poly.cpp 查看文件

@@ -14,6 +14,10 @@

#include <cstdio>

#if USE_SDL && defined __APPLE__
# include <SDL_main.h>
#endif

#include "core.h"

using namespace lol;
@@ -95,7 +99,7 @@ static float floatsin(float f)
#undef float
}

int main(void)
int main(int argc, char **argv)
{
typedef union { float f; uint32_t x; } flint;



+ 5
- 1
test/math/remez.cpp 查看文件

@@ -15,6 +15,10 @@
#include <cstring>
#include <cstdio>

#if USE_SDL && defined __APPLE__
# include <SDL_main.h>
#endif

#include "core.h"

using namespace lol;
@@ -36,7 +40,7 @@ real myerr(real const &y)
return sin(x) / (x * y);
}

int main(void)
int main(int argc, char **argv)
{
RemezSolver<6> solver;
solver.Run(real::R_1 >> 400, real::R_PI_2 * real::R_PI_2, myfun, myerr, 40);


+ 1
- 1
test/tutorial/tut01.cpp 查看文件

@@ -110,7 +110,7 @@ private:
bool m_ready;
};

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



+ 1
- 1
test/tutorial/tut02.cpp 查看文件

@@ -173,7 +173,7 @@ private:
bool m_ready;
};

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



+ 1
- 1
test/xolotl/xolotl.cpp 查看文件

@@ -63,7 +63,7 @@ private:
vec2 graph[2000];
};

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



Loading…
取消
儲存