From: <bug...@us...> - 2010-05-16 01:36:28
|
Revision: 10813 http://warzone2100.svn.sourceforge.net/warzone2100/?rev=10813&view=rev Author: buginator Date: 2010-05-16 01:36:21 +0000 (Sun, 16 May 2010) Log Message: ----------- Stage two merge. Add new files for Qt. Remove old files Update build system (linux). Remove SDL. Remove QuesoGLC. Remove Fontconfig & other all dependencies it had. CC & mingw (windows) & MSVC build systems are *NOT* updated / working yet. **NOTE** MSVC people check types.h, "bool" != "BOOL" ! "bool" is a byte, "BOOL" is a int. r8503 - r10787 (from Qt branch) Modified Paths: -------------- branches/qt-trunk/configure.ac branches/qt-trunk/lib/framework/Makefile.am branches/qt-trunk/lib/framework/SDL_framerate.c branches/qt-trunk/lib/framework/SDL_framerate.h branches/qt-trunk/lib/framework/cursors.c branches/qt-trunk/lib/framework/cursors.h branches/qt-trunk/lib/framework/cursors16.c branches/qt-trunk/lib/framework/cursors32.c branches/qt-trunk/lib/framework/frame.c branches/qt-trunk/lib/framework/frame.h branches/qt-trunk/lib/framework/frameint.h branches/qt-trunk/lib/framework/input.h branches/qt-trunk/lib/framework/types.h branches/qt-trunk/lib/gamelib/gtime.c branches/qt-trunk/lib/ivis_common/Makefile.am branches/qt-trunk/lib/ivis_opengl/Makefile.am branches/qt-trunk/lib/ivis_opengl/pieblitfunc.c branches/qt-trunk/lib/ivis_opengl/piemode.c branches/qt-trunk/lib/ivis_opengl/piestate.c branches/qt-trunk/lib/ivis_opengl/screen.c branches/qt-trunk/lib/ivis_opengl/textdraw.c branches/qt-trunk/lib/netplay/netplay.c branches/qt-trunk/lib/netplay/netsocket.cpp branches/qt-trunk/lib/netplay/nettypes.c branches/qt-trunk/lib/sequence/sequence.c branches/qt-trunk/lib/widget/Makefile.am branches/qt-trunk/lib/widget/editbox.c branches/qt-trunk/lib/widget/tip.c branches/qt-trunk/po/POTFILES.in branches/qt-trunk/src/Makefile.am branches/qt-trunk/src/data.c branches/qt-trunk/src/display.c branches/qt-trunk/src/fpath.c branches/qt-trunk/src/frontend.c branches/qt-trunk/src/keybind.c branches/qt-trunk/src/keyedit.c branches/qt-trunk/src/loop.c branches/qt-trunk/src/main.h branches/qt-trunk/src/makefile.win32 branches/qt-trunk/src/mission.c branches/qt-trunk/src/multiint.c branches/qt-trunk/src/multijoin.c branches/qt-trunk/src/multiopt.c branches/qt-trunk/src/scriptfuncs.c branches/qt-trunk/src/terrain.c branches/qt-trunk/src/wrappers.c branches/qt-trunk/tests/astartest.c branches/qt-trunk/win32/libs/Makefile Added Paths: ----------- branches/qt-trunk/lib/framework/wzapp.cpp branches/qt-trunk/lib/framework/wzapp_c.h branches/qt-trunk/src/main.cpp Removed Paths: ------------- branches/qt-trunk/lib/framework/input.c branches/qt-trunk/src/main.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |