From: <mug...@us...> - 2010-09-17 10:34:42
|
Revision: 11679 http://warzone2100.svn.sourceforge.net/warzone2100/?rev=11679&view=rev Author: muggenhor Date: 2010-09-17 10:34:35 +0000 (Fri, 17 Sep 2010) Log Message: ----------- Merge r11677:11678 from trunk into the Qt branch: add a platform-abstraction header: `opengl.h` Add a header to allow platform-indepent inclusion of the OpenGL API, removing our dependency on SDL_opengl.h and consolidating platform-specific code in that single header. Modified Paths: -------------- branches/qt-trunk/lib/ivis_common/tex.h branches/qt-trunk/lib/ivis_opengl/piestate.c branches/qt-trunk/lib/ivis_opengl/tex.c Added Paths: ----------- branches/qt-trunk/lib/framework/opengl.h Property Changed: ---------------- branches/qt-trunk/ branches/qt-trunk/data/base/anims/ branches/qt-trunk/data/base/audio/ branches/qt-trunk/data/base/audio/memressp/console/power-transferred.ogg branches/qt-trunk/data/base/audio/proxmessages/c1prox.fodt branches/qt-trunk/data/base/components/ branches/qt-trunk/data/base/effects/ branches/qt-trunk/data/base/features/ branches/qt-trunk/data/base/gamedesc.lev branches/qt-trunk/data/base/images/ branches/qt-trunk/data/base/locale/ branches/qt-trunk/data/base/messages/ branches/qt-trunk/data/base/misc/ branches/qt-trunk/data/base/multiplay/ branches/qt-trunk/data/base/script/ branches/qt-trunk/data/base/sequenceaudio/ branches/qt-trunk/data/base/stats/ branches/qt-trunk/data/base/structs/ branches/qt-trunk/data/base/tagdefinitions/ branches/qt-trunk/data/base/texpages/ branches/qt-trunk/data/base/texpages/page-25-sky-arizona.png branches/qt-trunk/data/base/wrf/ branches/qt-trunk/data/mods/multiplay/Makefile.am branches/qt-trunk/data/mods/multiplay/makefile.win32 branches/qt-trunk/data/mods/multiplay/ntw/ branches/qt-trunk/data/mp/messages/resmessagesall.rmsg branches/qt-trunk/data/music/ branches/qt-trunk/lib/betawidget/autogen.sh branches/qt-trunk/lib/betawidget/m4/ax_compare_version.m4 branches/qt-trunk/lib/betawidget/m4/ax_with_prog.m4 branches/qt-trunk/lib/betawidget/src/betawidget.i branches/qt-trunk/lib/betawidget/src/clipboard.h branches/qt-trunk/lib/betawidget/src/font.c branches/qt-trunk/lib/betawidget/src/font.h branches/qt-trunk/lib/betawidget/src/geom.c branches/qt-trunk/lib/betawidget/src/geom.h branches/qt-trunk/lib/betawidget/src/hBox.c branches/qt-trunk/lib/betawidget/src/hBox.h branches/qt-trunk/lib/betawidget/src/internal-cairo.h branches/qt-trunk/lib/betawidget/src/keycode.h branches/qt-trunk/lib/betawidget/src/lua-wrap.h branches/qt-trunk/lib/betawidget/src/lua_memberfnptr.i branches/qt-trunk/lib/betawidget/src/lua_table_as_array.i branches/qt-trunk/lib/betawidget/src/platform/ branches/qt-trunk/lib/betawidget/src/platform/sdl/Makefile.am branches/qt-trunk/lib/betawidget/src/spacer.c branches/qt-trunk/lib/betawidget/src/spacer.h branches/qt-trunk/lib/betawidget/src/table.c branches/qt-trunk/lib/betawidget/src/table.h branches/qt-trunk/lib/betawidget/src/textEntry.c branches/qt-trunk/lib/betawidget/src/textEntry.h branches/qt-trunk/lib/betawidget/src/vector.c branches/qt-trunk/lib/betawidget/src/vector.h branches/qt-trunk/lib/betawidget/src/widget.c branches/qt-trunk/lib/betawidget/src/widget.h branches/qt-trunk/lib/betawidget/src/window.c branches/qt-trunk/lib/betawidget/src/window.h branches/qt-trunk/lib/betawidget/tools/Makefile.am branches/qt-trunk/lib/framework/fixedpoint.h branches/qt-trunk/lib/framework/utf.c branches/qt-trunk/lib/framework/utf.h branches/qt-trunk/pkg/rpm/warzone2100.spec branches/qt-trunk/src/baseobject.c branches/qt-trunk/src/baseobject.h branches/qt-trunk/src/message_lexer.l branches/qt-trunk/tools/editworld/doc/todo.txt branches/qt-trunk/tools/map/map2lnd.c branches/qt-trunk/tools/map/mapconv.c branches/qt-trunk/tools/map/mapinfo.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |