Mercurial > fife-parpg

comparison tests/core_tests/test_gui.cpp @ 85:35f6cfea565e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed the unit tests so they will now compile and link with msvc2005. There are still a couple more changes needed to run them correctly.
author vtchill@33b003aa-7bff-0310-803a-e67f0ece8222
date Sat, 19 Jul 2008 04:56:28 +0000
parents 90005975cdbb
children 64738befdf3b
comparison
equal deleted inserted replaced
84:a19c4ca20d97 85:35f6cfea565e
110 { 110 {
111 environment env; 111 environment env;
112 RenderBackendSDL renderbackend; 112 RenderBackendSDL renderbackend;
113 renderbackend.init(); 113 renderbackend.init();
114 ImagePool pool; 114 ImagePool pool;
115 Image* screen = renderbackend.createMainScreen(800, 600, 0, false); 115 Image* screen = renderbackend.createMainScreen(800, 600, 0, false, "FIFE", "");
116 SdlGuiGraphics graphics(pool); 116 SdlGuiGraphics graphics(pool);
117 graphics.setTarget(screen->getSurface()); 117 graphics.setTarget(screen->getSurface());
118 test_gui_image(renderbackend, graphics, pool); 118 test_gui_image(renderbackend, graphics, pool);
119 } 119 }
120 120
122 { 122 {
123 environment env; 123 environment env;
124 RenderBackendOpenGL renderbackend; 124 RenderBackendOpenGL renderbackend;
125 renderbackend.init(); 125 renderbackend.init();
126 ImagePool pool; 126 ImagePool pool;
127 renderbackend.createMainScreen(800, 600, 0, false); 127 renderbackend.createMainScreen(800, 600, 0, false, "FIFE", "");
128 OpenGLGuiGraphics graphics(pool); 128 OpenGLGuiGraphics graphics(pool);
129 test_gui_image(renderbackend, graphics, pool); 129 test_gui_image(renderbackend, graphics, pool);
130 } 130 }
131 131
132 int main() { 132 // need this here because SDL redefines
133 // main to SDL_main in SDL_main.h
134 #ifdef main
135 #undef main
136 #endif
137
138 int main()
139 {
133 return UnitTest::RunAllTests(); 140 return UnitTest::RunAllTests();
134 } 141 }