Menu
▾
▴
[PlaneShift-svn] SF.net SVN: planeshift:[3221] personal/kougaro
|
From: <ko...@us...> - 2009-03-16 00:47:51
|
Revision: 3221
http://planeshift.svn.sourceforge.net/planeshift/?rev=3221&view=rev
Author: kougaro
Date: 2009-03-16 00:47:38 +0000 (Mon, 16 Mar 2009)
Log Message:
-----------
merged r3116-3220 from trunk
Modified Paths:
--------------
personal/kougaro/data/gui/chardescwindow.xml
personal/kougaro/data/gui/detailwindow.xml
personal/kougaro/data/gui/gmguiwindow.xml
personal/kougaro/data/options/controls_def.xml
personal/kougaro/data/shader/lighting/lighting_character.xml
personal/kougaro/mk/autoconf/checkcommon.m4
personal/kougaro/mk/autoconf/crystal.m4
personal/kougaro/mk/jam/flags.jam
personal/kougaro/mk/jam/icons.jam
personal/kougaro/mk/jam/msvcgen.jam
personal/kougaro/mk/jam/static.jam
personal/kougaro/mk/jam/swig.jam
personal/kougaro/mk/msvc7/appeedit.vcproj
personal/kougaro/mk/msvc7/apppawseditor.vcproj
personal/kougaro/mk/msvc7/apppsclient.vcproj
personal/kougaro/mk/msvc7/apppsclient_static.vcproj
personal/kougaro/mk/msvc7/apppslaunch.vcproj
personal/kougaro/mk/msvc7/apppslaunch_static.vcproj
personal/kougaro/mk/msvc7/apppsnpcclient.vcproj
personal/kougaro/mk/msvc7/apppsnpcclient_static.vcproj
personal/kougaro/mk/msvc7/apppsserver.vcproj
personal/kougaro/mk/msvc7/apppsserver_static.vcproj
personal/kougaro/mk/msvc7/grpall_psminimal.vcproj
personal/kougaro/mk/msvc7/grpall_psminimalstatic.vcproj
personal/kougaro/mk/msvc7/grpall_psstatic.vcproj
personal/kougaro/mk/msvc7/grpall_pstypical.vcproj
personal/kougaro/mk/msvc7/grpapps_psminimal.vcproj
personal/kougaro/mk/msvc7/grpapps_psminimalstatic.vcproj
personal/kougaro/mk/msvc7/grpapps_psstatic.vcproj
personal/kougaro/mk/msvc7/grpapps_pstypical.vcproj
personal/kougaro/mk/msvc7/grpclient_psminimal.vcproj
personal/kougaro/mk/msvc7/grpclient_psminimalstatic.vcproj
personal/kougaro/mk/msvc7/grpclient_psstatic.vcproj
personal/kougaro/mk/msvc7/grpclient_pstypical.vcproj
personal/kougaro/mk/msvc7/grpclient_static_psminimal.vcproj
personal/kougaro/mk/msvc7/grpclient_static_psminimalstatic.vcproj
personal/kougaro/mk/msvc7/grpclient_static_psstatic.vcproj
personal/kougaro/mk/msvc7/grpclient_static_pstypical.vcproj
personal/kougaro/mk/msvc7/grplibs_psminimal.vcproj
personal/kougaro/mk/msvc7/grplibs_psminimalstatic.vcproj
personal/kougaro/mk/msvc7/grplibs_psstatic.vcproj
personal/kougaro/mk/msvc7/grplibs_pstypical.vcproj
personal/kougaro/mk/msvc7/grpplugins_psminimal.vcproj
personal/kougaro/mk/msvc7/grpplugins_psminimalstatic.vcproj
personal/kougaro/mk/msvc7/grpplugins_psstatic.vcproj
personal/kougaro/mk/msvc7/grpplugins_pstypical.vcproj
personal/kougaro/mk/msvc7/grpserver_psminimal.vcproj
personal/kougaro/mk/msvc7/grpserver_psminimalstatic.vcproj
personal/kougaro/mk/msvc7/grpserver_psstatic.vcproj
personal/kougaro/mk/msvc7/grpserver_pstypical.vcproj
personal/kougaro/mk/msvc7/grpserver_static_psminimal.vcproj
personal/kougaro/mk/msvc7/grpserver_static_psminimalstatic.vcproj
personal/kougaro/mk/msvc7/grpserver_static_psstatic.vcproj
personal/kougaro/mk/msvc7/grpserver_static_pstypical.vcproj
personal/kougaro/mk/msvc7/grptools_psminimal.vcproj
personal/kougaro/mk/msvc7/grptools_psminimalstatic.vcproj
personal/kougaro/mk/msvc7/grptools_psstatic.vcproj
personal/kougaro/mk/msvc7/grptools_pstypical.vcproj
personal/kougaro/mk/msvc7/libbulkobjects.vcproj
personal/kougaro/mk/msvc7/libdbmysqlstatic.vcproj
personal/kougaro/mk/msvc7/libeffects.vcproj
personal/kougaro/mk/msvc7/libfparser.vcproj
personal/kougaro/mk/msvc7/libgui.vcproj
personal/kougaro/mk/msvc7/liblibpsnpcclient.vcproj
personal/kougaro/mk/msvc7/libpaws.vcproj
personal/kougaro/mk/msvc7/libpsclient_static_plugins_CRYSTAL.vcproj
personal/kougaro/mk/msvc7/libpsengine.vcproj
personal/kougaro/mk/msvc7/libpslaunch_static_plugins_CRYSTAL.vcproj
personal/kougaro/mk/msvc7/libpsnet.vcproj
personal/kougaro/mk/msvc7/libpsnpcclient_static_plugins.vcproj
personal/kougaro/mk/msvc7/libpsnpcclient_static_plugins_CRYSTAL.vcproj
personal/kougaro/mk/msvc7/libpsrpgrules.vcproj
personal/kougaro/mk/msvc7/libpsserver_static_plugins.vcproj
personal/kougaro/mk/msvc7/libpsserver_static_plugins_CRYSTAL.vcproj
personal/kougaro/mk/msvc7/libpssound.vcproj
personal/kougaro/mk/msvc7/libpsutil.vcproj
personal/kougaro/mk/msvc7/libwordnet.vcproj
personal/kougaro/mk/msvc7/libxdelta3.vcproj
personal/kougaro/mk/msvc7/libxpnet.vcproj
personal/kougaro/mk/msvc7/plgdbmysql.vcproj
personal/kougaro/mk/msvc7/wkspsminimal.sln
personal/kougaro/mk/msvc7/wkspsminimalstatic.sln
personal/kougaro/mk/msvc7/wkspsstatic.sln
personal/kougaro/mk/msvc7/wkspstypical.sln
personal/kougaro/mk/msvc71/appeedit.vcproj
personal/kougaro/mk/msvc71/apppawseditor.vcproj
personal/kougaro/mk/msvc71/apppsclient.vcproj
personal/kougaro/mk/msvc71/apppsclient_static.vcproj
personal/kougaro/mk/msvc71/apppslaunch.vcproj
personal/kougaro/mk/msvc71/apppslaunch_static.vcproj
personal/kougaro/mk/msvc71/apppsnpcclient.vcproj
personal/kougaro/mk/msvc71/apppsnpcclient_static.vcproj
personal/kougaro/mk/msvc71/apppsserver.vcproj
personal/kougaro/mk/msvc71/apppsserver_static.vcproj
personal/kougaro/mk/msvc71/grpall_psminimal.vcproj
personal/kougaro/mk/msvc71/grpall_psminimalstatic.vcproj
personal/kougaro/mk/msvc71/grpall_psstatic.vcproj
personal/kougaro/mk/msvc71/grpall_pstypical.vcproj
personal/kougaro/mk/msvc71/grpapps_psminimal.vcproj
personal/kougaro/mk/msvc71/grpapps_psminimalstatic.vcproj
personal/kougaro/mk/msvc71/grpapps_psstatic.vcproj
personal/kougaro/mk/msvc71/grpapps_pstypical.vcproj
personal/kougaro/mk/msvc71/grpclient_psminimal.vcproj
personal/kougaro/mk/msvc71/grpclient_psminimalstatic.vcproj
personal/kougaro/mk/msvc71/grpclient_psstatic.vcproj
personal/kougaro/mk/msvc71/grpclient_pstypical.vcproj
personal/kougaro/mk/msvc71/grpclient_static_psminimal.vcproj
personal/kougaro/mk/msvc71/grpclient_static_psminimalstatic.vcproj
personal/kougaro/mk/msvc71/grpclient_static_psstatic.vcproj
personal/kougaro/mk/msvc71/grpclient_static_pstypical.vcproj
personal/kougaro/mk/msvc71/grplibs_psminimal.vcproj
personal/kougaro/mk/msvc71/grplibs_psminimalstatic.vcproj
personal/kougaro/mk/msvc71/grplibs_psstatic.vcproj
personal/kougaro/mk/msvc71/grplibs_pstypical.vcproj
personal/kougaro/mk/msvc71/grpplugins_psminimal.vcproj
personal/kougaro/mk/msvc71/grpplugins_psminimalstatic.vcproj
personal/kougaro/mk/msvc71/grpplugins_psstatic.vcproj
personal/kougaro/mk/msvc71/grpplugins_pstypical.vcproj
personal/kougaro/mk/msvc71/grpserver_psminimal.vcproj
personal/kougaro/mk/msvc71/grpserver_psminimalstatic.vcproj
personal/kougaro/mk/msvc71/grpserver_psstatic.vcproj
personal/kougaro/mk/msvc71/grpserver_pstypical.vcproj
personal/kougaro/mk/msvc71/grpserver_static_psminimal.vcproj
personal/kougaro/mk/msvc71/grpserver_static_psminimalstatic.vcproj
personal/kougaro/mk/msvc71/grpserver_static_psstatic.vcproj
personal/kougaro/mk/msvc71/grpserver_static_pstypical.vcproj
personal/kougaro/mk/msvc71/grptools_psminimal.vcproj
personal/kougaro/mk/msvc71/grptools_psminimalstatic.vcproj
personal/kougaro/mk/msvc71/grptools_psstatic.vcproj
personal/kougaro/mk/msvc71/grptools_pstypical.vcproj
personal/kougaro/mk/msvc71/libbulkobjects.vcproj
personal/kougaro/mk/msvc71/libdbmysqlstatic.vcproj
personal/kougaro/mk/msvc71/libeffects.vcproj
personal/kougaro/mk/msvc71/libfparser.vcproj
personal/kougaro/mk/msvc71/libgui.vcproj
personal/kougaro/mk/msvc71/liblibpsnpcclient.vcproj
personal/kougaro/mk/msvc71/libpaws.vcproj
personal/kougaro/mk/msvc71/libpsclient_static_plugins_CRYSTAL.vcproj
personal/kougaro/mk/msvc71/libpsengine.vcproj
personal/kougaro/mk/msvc71/libpslaunch_static_plugins_CRYSTAL.vcproj
personal/kougaro/mk/msvc71/libpsnet.vcproj
personal/kougaro/mk/msvc71/libpsnpcclient_static_plugins.vcproj
personal/kougaro/mk/msvc71/libpsnpcclient_static_plugins_CRYSTAL.vcproj
personal/kougaro/mk/msvc71/libpsrpgrules.vcproj
personal/kougaro/mk/msvc71/libpsserver_static_plugins.vcproj
personal/kougaro/mk/msvc71/libpsserver_static_plugins_CRYSTAL.vcproj
personal/kougaro/mk/msvc71/libpssound.vcproj
personal/kougaro/mk/msvc71/libpsutil.vcproj
personal/kougaro/mk/msvc71/libwordnet.vcproj
personal/kougaro/mk/msvc71/libxdelta3.vcproj
personal/kougaro/mk/msvc71/libxpnet.vcproj
personal/kougaro/mk/msvc71/plgdbmysql.vcproj
personal/kougaro/mk/msvc71/wkspsminimal.sln
personal/kougaro/mk/msvc71/wkspsminimalstatic.sln
personal/kougaro/mk/msvc71/wkspsstatic.sln
personal/kougaro/mk/msvc71/wkspstypical.sln
personal/kougaro/mk/msvc8/appeedit.vcproj
personal/kougaro/mk/msvc8/apppawseditor.vcproj
personal/kougaro/mk/msvc8/apppsclient.vcproj
personal/kougaro/mk/msvc8/apppsclient_static.vcproj
personal/kougaro/mk/msvc8/apppslaunch.vcproj
personal/kougaro/mk/msvc8/apppslaunch_static.vcproj
personal/kougaro/mk/msvc8/apppsnpcclient.vcproj
personal/kougaro/mk/msvc8/apppsnpcclient_static.vcproj
personal/kougaro/mk/msvc8/apppsserver.vcproj
personal/kougaro/mk/msvc8/apppsserver_static.vcproj
personal/kougaro/mk/msvc8/grpall_psminimal.vcproj
personal/kougaro/mk/msvc8/grpall_psminimalstatic.vcproj
personal/kougaro/mk/msvc8/grpall_psstatic.vcproj
personal/kougaro/mk/msvc8/grpall_pstypical.vcproj
personal/kougaro/mk/msvc8/grpapps_psminimal.vcproj
personal/kougaro/mk/msvc8/grpapps_psminimalstatic.vcproj
personal/kougaro/mk/msvc8/grpapps_psstatic.vcproj
personal/kougaro/mk/msvc8/grpapps_pstypical.vcproj
personal/kougaro/mk/msvc8/grpclient_psminimal.vcproj
personal/kougaro/mk/msvc8/grpclient_psminimalstatic.vcproj
personal/kougaro/mk/msvc8/grpclient_psstatic.vcproj
personal/kougaro/mk/msvc8/grpclient_pstypical.vcproj
personal/kougaro/mk/msvc8/grpclient_static_psminimal.vcproj
personal/kougaro/mk/msvc8/grpclient_static_psminimalstatic.vcproj
personal/kougaro/mk/msvc8/grpclient_static_psstatic.vcproj
personal/kougaro/mk/msvc8/grpclient_static_pstypical.vcproj
personal/kougaro/mk/msvc8/grplibs_psminimal.vcproj
personal/kougaro/mk/msvc8/grplibs_psminimalstatic.vcproj
personal/kougaro/mk/msvc8/grplibs_psstatic.vcproj
personal/kougaro/mk/msvc8/grplibs_pstypical.vcproj
personal/kougaro/mk/msvc8/grpplugins_psminimal.vcproj
personal/kougaro/mk/msvc8/grpplugins_psminimalstatic.vcproj
personal/kougaro/mk/msvc8/grpplugins_psstatic.vcproj
personal/kougaro/mk/msvc8/grpplugins_pstypical.vcproj
personal/kougaro/mk/msvc8/grpserver_psminimal.vcproj
personal/kougaro/mk/msvc8/grpserver_psminimalstatic.vcproj
personal/kougaro/mk/msvc8/grpserver_psstatic.vcproj
personal/kougaro/mk/msvc8/grpserver_pstypical.vcproj
personal/kougaro/mk/msvc8/grpserver_static_psminimal.vcproj
personal/kougaro/mk/msvc8/grpserver_static_psminimalstatic.vcproj
personal/kougaro/mk/msvc8/grpserver_static_psstatic.vcproj
personal/kougaro/mk/msvc8/grpserver_static_pstypical.vcproj
personal/kougaro/mk/msvc8/grptools_psminimal.vcproj
personal/kougaro/mk/msvc8/grptools_psminimalstatic.vcproj
personal/kougaro/mk/msvc8/grptools_psstatic.vcproj
personal/kougaro/mk/msvc8/grptools_pstypical.vcproj
personal/kougaro/mk/msvc8/libbulkobjects.vcproj
personal/kougaro/mk/msvc8/libdbmysqlstatic.vcproj
personal/kougaro/mk/msvc8/libeffects.vcproj
personal/kougaro/mk/msvc8/libfparser.vcproj
personal/kougaro/mk/msvc8/libgui.vcproj
personal/kougaro/mk/msvc8/liblibpsnpcclient.vcproj
personal/kougaro/mk/msvc8/libpaws.vcproj
personal/kougaro/mk/msvc8/libpsclient_static_plugins_CRYSTAL.vcproj
personal/kougaro/mk/msvc8/libpsengine.vcproj
personal/kougaro/mk/msvc8/libpslaunch_static_plugins_CRYSTAL.vcproj
personal/kougaro/mk/msvc8/libpsnet.vcproj
personal/kougaro/mk/msvc8/libpsnpcclient_static_plugins.vcproj
personal/kougaro/mk/msvc8/libpsnpcclient_static_plugins_CRYSTAL.vcproj
personal/kougaro/mk/msvc8/libpsrpgrules.vcproj
personal/kougaro/mk/msvc8/libpsserver_static_plugins.vcproj
personal/kougaro/mk/msvc8/libpsserver_static_plugins_CRYSTAL.vcproj
personal/kougaro/mk/msvc8/libpssound.vcproj
personal/kougaro/mk/msvc8/libpsutil.vcproj
personal/kougaro/mk/msvc8/libwordnet.vcproj
personal/kougaro/mk/msvc8/libxdelta3.vcproj
personal/kougaro/mk/msvc8/libxpnet.vcproj
personal/kougaro/mk/msvc8/plgdbmysql.vcproj
personal/kougaro/mk/msvc8/wkspsminimal.sln
personal/kougaro/mk/msvc8/wkspsminimalstatic.sln
personal/kougaro/mk/msvc8/wkspsstatic.sln
personal/kougaro/mk/msvc8/wkspstypical.sln
personal/kougaro/mk/msvc9/appeedit.vcproj
personal/kougaro/mk/msvc9/apppawseditor.vcproj
personal/kougaro/mk/msvc9/apppsclient.vcproj
personal/kougaro/mk/msvc9/apppsclient_static.vcproj
personal/kougaro/mk/msvc9/apppslaunch.vcproj
personal/kougaro/mk/msvc9/apppslaunch_static.vcproj
personal/kougaro/mk/msvc9/apppsnpcclient.vcproj
personal/kougaro/mk/msvc9/apppsnpcclient_static.vcproj
personal/kougaro/mk/msvc9/apppsserver.vcproj
personal/kougaro/mk/msvc9/apppsserver_static.vcproj
personal/kougaro/mk/msvc9/grpall_psminimal.vcproj
personal/kougaro/mk/msvc9/grpall_psminimalstatic.vcproj
personal/kougaro/mk/msvc9/grpall_psstatic.vcproj
personal/kougaro/mk/msvc9/grpall_pstypical.vcproj
personal/kougaro/mk/msvc9/grpapps_psminimal.vcproj
personal/kougaro/mk/msvc9/grpapps_psminimalstatic.vcproj
personal/kougaro/mk/msvc9/grpapps_psstatic.vcproj
personal/kougaro/mk/msvc9/grpapps_pstypical.vcproj
personal/kougaro/mk/msvc9/grpclient_psminimal.vcproj
personal/kougaro/mk/msvc9/grpclient_psminimalstatic.vcproj
personal/kougaro/mk/msvc9/grpclient_psstatic.vcproj
personal/kougaro/mk/msvc9/grpclient_pstypical.vcproj
personal/kougaro/mk/msvc9/grpclient_static_psminimal.vcproj
personal/kougaro/mk/msvc9/grpclient_static_psminimalstatic.vcproj
personal/kougaro/mk/msvc9/grpclient_static_psstatic.vcproj
personal/kougaro/mk/msvc9/grpclient_static_pstypical.vcproj
personal/kougaro/mk/msvc9/grplibs_psminimal.vcproj
personal/kougaro/mk/msvc9/grplibs_psminimalstatic.vcproj
personal/kougaro/mk/msvc9/grplibs_psstatic.vcproj
personal/kougaro/mk/msvc9/grplibs_pstypical.vcproj
personal/kougaro/mk/msvc9/grpplugins_psminimal.vcproj
personal/kougaro/mk/msvc9/grpplugins_psminimalstatic.vcproj
personal/kougaro/mk/msvc9/grpplugins_psstatic.vcproj
personal/kougaro/mk/msvc9/grpplugins_pstypical.vcproj
personal/kougaro/mk/msvc9/grpserver_psminimal.vcproj
personal/kougaro/mk/msvc9/grpserver_psminimalstatic.vcproj
personal/kougaro/mk/msvc9/grpserver_psstatic.vcproj
personal/kougaro/mk/msvc9/grpserver_pstypical.vcproj
personal/kougaro/mk/msvc9/grpserver_static_psminimal.vcproj
personal/kougaro/mk/msvc9/grpserver_static_psminimalstatic.vcproj
personal/kougaro/mk/msvc9/grpserver_static_psstatic.vcproj
personal/kougaro/mk/msvc9/grpserver_static_pstypical.vcproj
personal/kougaro/mk/msvc9/grptools_psminimal.vcproj
personal/kougaro/mk/msvc9/grptools_psminimalstatic.vcproj
personal/kougaro/mk/msvc9/grptools_psstatic.vcproj
personal/kougaro/mk/msvc9/grptools_pstypical.vcproj
personal/kougaro/mk/msvc9/libbulkobjects.vcproj
personal/kougaro/mk/msvc9/libdbmysqlstatic.vcproj
personal/kougaro/mk/msvc9/libeffects.vcproj
personal/kougaro/mk/msvc9/libfparser.vcproj
personal/kougaro/mk/msvc9/libgui.vcproj
personal/kougaro/mk/msvc9/liblibpsnpcclient.vcproj
personal/kougaro/mk/msvc9/libpaws.vcproj
personal/kougaro/mk/msvc9/libpsclient_static_plugins_CRYSTAL.vcproj
personal/kougaro/mk/msvc9/libpsengine.vcproj
personal/kougaro/mk/msvc9/libpslaunch_static_plugins_CRYSTAL.vcproj
personal/kougaro/mk/msvc9/libpsnet.vcproj
personal/kougaro/mk/msvc9/libpsnpcclient_static_plugins.vcproj
personal/kougaro/mk/msvc9/libpsnpcclient_static_plugins_CRYSTAL.vcproj
personal/kougaro/mk/msvc9/libpsrpgrules.vcproj
personal/kougaro/mk/msvc9/libpsserver_static_plugins.vcproj
personal/kougaro/mk/msvc9/libpsserver_static_plugins_CRYSTAL.vcproj
personal/kougaro/mk/msvc9/libpssound.vcproj
personal/kougaro/mk/msvc9/libpsutil.vcproj
personal/kougaro/mk/msvc9/libwordnet.vcproj
personal/kougaro/mk/msvc9/libxdelta3.vcproj
personal/kougaro/mk/msvc9/libxpnet.vcproj
personal/kougaro/mk/msvc9/plgdbmysql.vcproj
personal/kougaro/mk/msvc9/wkspsminimal.sln
personal/kougaro/mk/msvc9/wkspsminimalstatic.sln
personal/kougaro/mk/msvc9/wkspsstatic.sln
personal/kougaro/mk/msvc9/wkspstypical.sln
personal/kougaro/mk/msvcgen/control.tlib
personal/kougaro/mk/msvcgen/macros.tlib
personal/kougaro/mk/msvcgen/project7.tlib
personal/kougaro/mk/msvcgen/projectx7.tlib
personal/kougaro/src/client/chatbubbles.cpp
personal/kougaro/src/client/clientvitals.h
personal/kougaro/src/client/cmdusers.cpp
personal/kougaro/src/client/cmdusers.h
personal/kougaro/src/client/cmdutil.cpp
personal/kougaro/src/client/gui/chatwindow.cpp
personal/kougaro/src/client/gui/pawsactivemagicwindow.cpp
personal/kougaro/src/client/gui/pawsbuddy.cpp
personal/kougaro/src/client/gui/pawschardescription.cpp
personal/kougaro/src/client/gui/pawscharparents.cpp
personal/kougaro/src/client/gui/pawsconfigkeys.cpp
personal/kougaro/src/client/gui/pawsconfigwindow.cpp
personal/kougaro/src/client/gui/pawsconfigwindow.h
personal/kougaro/src/client/gui/pawsdetailwindow.cpp
personal/kougaro/src/client/gui/pawsexchangewindow.h
personal/kougaro/src/client/gui/pawsglyphwindow.cpp
personal/kougaro/src/client/gui/pawsgmaction.cpp
personal/kougaro/src/client/gui/pawsgmgui.cpp
personal/kougaro/src/client/gui/pawsgmgui.h
personal/kougaro/src/client/gui/pawsguildwindow.cpp
personal/kougaro/src/client/gui/pawsignore.cpp
personal/kougaro/src/client/gui/pawsinfowindow.cpp
personal/kougaro/src/client/gui/pawslife.cpp
personal/kougaro/src/client/gui/pawslootwindow.cpp
personal/kougaro/src/client/gui/pawsmerchantwindow.cpp
personal/kougaro/src/client/gui/pawsnpcdialog.cpp
personal/kougaro/src/client/gui/pawsnpcdialog.h
personal/kougaro/src/client/gui/pawspetitiongmwindow.cpp
personal/kougaro/src/client/gui/pawspetitionwindow.cpp
personal/kougaro/src/client/gui/pawsquestwindow.cpp
personal/kougaro/src/client/gui/pawsskillwindow.cpp
personal/kougaro/src/client/gui/pawswritingwindow.cpp
personal/kougaro/src/client/modehandler.cpp
personal/kougaro/src/client/pscamera.cpp
personal/kougaro/src/client/pscelclient.cpp
personal/kougaro/src/client/pscelclient.h
personal/kougaro/src/client/psclientchar.cpp
personal/kougaro/src/client/psengine.cpp
personal/kougaro/src/client/psengine.h
personal/kougaro/src/client/psoptions.cpp
personal/kougaro/src/client/psoptions.h
personal/kougaro/src/client/zonehandler.cpp
personal/kougaro/src/common/effects/pseffectmanager.cpp
personal/kougaro/src/common/effects/pseffectobjsimpmesh.cpp
personal/kougaro/src/common/engine/loader.cpp
personal/kougaro/src/common/engine/loader.h
personal/kougaro/src/common/engine/psregion.cpp
personal/kougaro/src/common/engine/psregion.h
personal/kougaro/src/common/net/messages.cpp
personal/kougaro/src/common/net/messages.h
personal/kougaro/src/common/net/netbase.h
personal/kougaro/src/common/paws/pawsgenericview.cpp
personal/kougaro/src/common/paws/pawslistbox.cpp
personal/kougaro/src/common/paws/pawslistbox.h
personal/kougaro/src/common/paws/pawsmanager.cpp
personal/kougaro/src/common/paws/pawsmanager.h
personal/kougaro/src/common/paws/pawsobjectview.cpp
personal/kougaro/src/common/paws/pawsscript.cpp
personal/kougaro/src/common/paws/pawsscript.h
personal/kougaro/src/common/paws/pawstextbox.cpp
personal/kougaro/src/common/paws/pawstextbox.h
personal/kougaro/src/common/paws/pawswidget.cpp
personal/kougaro/src/common/paws/pawswidget.h
personal/kougaro/src/common/rpgrules/vitals.h
personal/kougaro/src/common/util/Jamfile
personal/kougaro/src/common/util/localization.cpp
personal/kougaro/src/common/util/mathscript.cpp
personal/kougaro/src/common/util/mathscript.h
personal/kougaro/src/common/util/psconst.h
personal/kougaro/src/common/util/pspath.cpp
personal/kougaro/src/common/util/psstring.cpp
personal/kougaro/src/common/util/psstring.h
personal/kougaro/src/common/util/scriptvar.h
personal/kougaro/src/common/util/texfactory.cpp
personal/kougaro/src/eedit/eeditloadeffecttoolbox.cpp
personal/kougaro/src/eedit/eeditshortcutstoolbox.cpp
personal/kougaro/src/npcclient/gem.cpp
personal/kougaro/src/npcclient/npcmesh.cpp
personal/kougaro/src/npcclient/npcoperations.cpp
personal/kougaro/src/npcclient/tribeneed.cpp
personal/kougaro/src/npcclient/walkpoly.cpp
personal/kougaro/src/pslaunch/download.cpp
personal/kougaro/src/server/actionmanager.cpp
personal/kougaro/src/server/adminmanager.cpp
personal/kougaro/src/server/adminmanager.h
personal/kougaro/src/server/bankmanager.cpp
personal/kougaro/src/server/bulkobjects/dictionary.cpp
personal/kougaro/src/server/bulkobjects/dictionary.h
personal/kougaro/src/server/bulkobjects/psactionlocationinfo.cpp
personal/kougaro/src/server/bulkobjects/psactionlocationinfo.h
personal/kougaro/src/server/bulkobjects/pscharacter.cpp
personal/kougaro/src/server/bulkobjects/pscharacter.h
personal/kougaro/src/server/bulkobjects/pscharacterloader.cpp
personal/kougaro/src/server/bulkobjects/pscharinventory.cpp
personal/kougaro/src/server/bulkobjects/pscharinventory.h
personal/kougaro/src/server/bulkobjects/psitem.cpp
personal/kougaro/src/server/bulkobjects/psitem.h
personal/kougaro/src/server/bulkobjects/psitemstats.cpp
personal/kougaro/src/server/bulkobjects/psitemstats.h
personal/kougaro/src/server/bulkobjects/psnpcloader.cpp
personal/kougaro/src/server/bulkobjects/psquest.cpp
personal/kougaro/src/server/bulkobjects/psquestprereqops.cpp
personal/kougaro/src/server/bulkobjects/psquestprereqops.h
personal/kougaro/src/server/bulkobjects/psspell.cpp
personal/kougaro/src/server/bulkobjects/psspell.h
personal/kougaro/src/server/bulkobjects/servervitals.cpp
personal/kougaro/src/server/bulkobjects/servervitals.h
personal/kougaro/src/server/cachemanager.cpp
personal/kougaro/src/server/cachemanager.h
personal/kougaro/src/server/client.cpp
personal/kougaro/src/server/client.h
personal/kougaro/src/server/combatmanager.cpp
personal/kougaro/src/server/combatmanager.h
personal/kougaro/src/server/command.cpp
personal/kougaro/src/server/creationmanager.cpp
personal/kougaro/src/server/database/mysql/action_locations.sql
personal/kougaro/src/server/database/mysql/dal.cpp
personal/kougaro/src/server/database/mysql/item_stats.sql
personal/kougaro/src/server/database/mysql/math_scripts.sql
personal/kougaro/src/server/database/mysql/progress_events.sql
personal/kougaro/src/server/database/mysql/quest_scripts.sql
personal/kougaro/src/server/database/mysql/quests.sql
personal/kougaro/src/server/database/mysql/server_options.sql
personal/kougaro/src/server/database/mysql/spells.sql
personal/kougaro/src/server/database/mysql/upgrade_schema.sql
personal/kougaro/src/server/entitymanager.cpp
personal/kougaro/src/server/gem.cpp
personal/kougaro/src/server/gem.h
personal/kougaro/src/server/gemmesh.cpp
personal/kougaro/src/server/groupmanager.cpp
personal/kougaro/src/server/minigamemanager.cpp
personal/kougaro/src/server/npcmanager.cpp
personal/kougaro/src/server/npcmanager.h
personal/kougaro/src/server/progressionmanager.cpp
personal/kougaro/src/server/progressionmanager.h
personal/kougaro/src/server/psproxlist.cpp
personal/kougaro/src/server/psserver.cpp
personal/kougaro/src/server/psserverchar.cpp
personal/kougaro/src/server/psserverchar.h
personal/kougaro/src/server/psserverdr.cpp
personal/kougaro/src/server/psserverdr.h
personal/kougaro/src/server/questmanager.cpp
personal/kougaro/src/server/slotmanager.cpp
personal/kougaro/src/server/spawnmanager.cpp
personal/kougaro/src/server/spawnmanager.h
personal/kougaro/src/server/spellmanager.cpp
personal/kougaro/src/server/spellmanager.h
personal/kougaro/src/server/usermanager.cpp
personal/kougaro/src/server/usermanager.h
personal/kougaro/src/server/weathermanager.cpp
personal/kougaro/src/server/workmanager.cpp
personal/kougaro/src/server/workmanager.h
Removed Paths:
-------------
personal/kougaro/src/client/clientcachemanager.cpp
personal/kougaro/src/client/clientcachemanager.h
personal/kougaro/src/common/rpgrules/vitals.cpp
Modified: personal/kougaro/data/gui/chardescwindow.xml
===================================================================
--- personal/kougaro/data/gui/chardescwindow.xml 2009-03-15 14:47:34 UTC (rev 3220)
+++ personal/kougaro/data/gui/chardescwindow.xml 2009-03-16 00:47:38 UTC (rev 3221)
@@ -1,15 +1,15 @@
<widget_description>
- <widget name="DescriptionEdit" factory="pawsCharDescription"
+ <pawsCharDescription name="DescriptionEdit"
visible="yes" savepositions="no" movable="yes" keepaspect="no"
- resizable="yes" configurable="yes">
+ resizable="yes" configurable="yes" style="New Standard GUI">
<frame x="100" y="100" width="320" height="270" border="yes" />
<minframe width="250" height="250" />
- <title resource="Blue Title" text="Modify description" align="left" close_button="yes" />
- <bgimage resource="Modify Description BG" alpha="128" />
+ <title resource="Scaling Title Bar" text="Modify description" align="left" close_button="yes" />
+ <!-- <bgimage resource="Modify Description BG" alpha="128" /> -->
- <widget name="lbl" factory="pawsTextBox" >
+ <pawsTextBox name="lbl">
<frame x="34" y="8" width="200" height="20" border="no" />
<font name="/planeshift/data/ttf/scurlock.ttf" r="255" g="255" b="255" size="14" scalefont="no"/>
<text string="Character description:" />
@@ -19,8 +19,9 @@
<attach point="PROPORTIONAL_TOP" />
<attach point="PROPORTIONAL_BOTTOM" />
</attachpoints>
- </widget>
- <widget name="lblb" factory="pawsTextBox" >
+ </pawsTextBox>
+
+ <pawsTextBox name="lblb">
<frame x="35" y="9" width="200" height="20" border="no" />
<font name="/planeshift/data/ttf/scurlock.ttf" r="0" g="0" b="0" size="14" scalefont="no"/>
<text string="Character description:" />
@@ -30,20 +31,20 @@
<attach point="PROPORTIONAL_TOP" />
<attach point="PROPORTIONAL_BOTTOM" />
</attachpoints>
- </widget>
+ </pawsTextBox>
- <widget name="Description" factory="pawsMultilineEditTextBox" >
+ <pawsMultilineEditTextBox name="Description">
<frame x="25" y="30" width="270" height="185" border="no" />
- <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" scalefont="no" />
+ <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" scalefont="no" />
<attachpoints>
<attach point="PROPORTIONAL_RIGHT" />
<attach point="PROPORTIONAL_TOP" />
<attach point="PROPORTIONAL_LEFT" />
<attach point="PROPORTIONAL_BOTTOM" />
</attachpoints>
- </widget>
+ </pawsMultilineEditTextBox>
- <widget name="OK" factory="pawsButton" id="100">
+ <pawsButton name="OK" id="100">
<frame x="5" y="238" width="70" height="30" />
<bgimage resource="Modify Save" />
<attachpoints>
@@ -53,8 +54,9 @@
<attach point="ATTACH_BOTTOM" />
</attachpoints>
<label text="OK" />
- </widget>
- <widget name="Cancel" factory="pawsButton" id="101">
+ </pawsButton>
+
+ <pawsButton name="Cancel" id="101">
<frame x="80" y="238" width="70" height="30" />
<bgimage resource="Modify Cancel" />
<attachpoints>
@@ -64,20 +66,22 @@
<attach point="ATTACH_BOTTOM" />
</attachpoints>
<label text="Cancel" />
- </widget>
- <widget name="Save" factory="pawsButton" id="102">
- <frame x="170" y="238" width="65" height="30" />
+ </pawsButton>
+
+ <pawsButton name="Save" id="102">
+ <frame x="170" y="238" width="70" height="30" />
<bgimage resource="Modify Save" />
<attachpoints>
<attach point="PROPORTIONAL_RIGHT" />
- <attach point="ATTACH_LEFT" />
+ <attach point="PROPORTIONAL_LEFT" />
<attach point="PROPORTIONAL_TOP" />
<attach point="ATTACH_BOTTOM" />
</attachpoints>
<label text="Save" />
- </widget>
- <widget name="Load" factory="pawsButton" id="103">
- <frame x="240" y="238" width="75" height="30" />
+ </pawsButton>
+
+ <pawsButton name="Load" id="103">
+ <frame x="245" y="238" width="70" height="30" />
<bgimage resource="Modify Cancel" />
<attachpoints>
<attach point="PROPORTIONAL_RIGHT" />
@@ -86,7 +90,8 @@
<attach point="ATTACH_BOTTOM" />
</attachpoints>
<label text="Load" />
- </widget>
- </widget>
+ </pawsButton>
+
+ </pawsCharDescription>
</widget_description>
Modified: personal/kougaro/data/gui/detailwindow.xml
===================================================================
--- personal/kougaro/data/gui/detailwindow.xml 2009-03-15 14:47:34 UTC (rev 3220)
+++ personal/kougaro/data/gui/detailwindow.xml 2009-03-16 00:47:38 UTC (rev 3221)
@@ -15,7 +15,7 @@
</widget>
<widget name="ShowDescr" factory="pawsButton" style="tabbuttonskills" id="999" >
- <frame x="5" y="65" width="33" />
+ <frame x="5" y="65" width="33" height="20" />
<label text="Desc" />
<attachpoints>
<attach point="PROPORTIONAL_RIGHT" />
@@ -24,7 +24,7 @@
</widget>
<widget name="ShowDescrOOC" factory="pawsButton" style="tabbuttonskills" id="1006" >
- <frame x="35" y="65" width="33" />
+ <frame x="35" y="65" width="33" height="20"/>
<label text="OOC" />
<attachpoints>
<attach point="PROPORTIONAL_RIGHT" />
@@ -33,7 +33,7 @@
</widget>
<widget name="ShowCC" factory="pawsButton" style="tabbuttonskills" id="1007" >
- <frame x="65" y="65" width="33" />
+ <frame x="65" y="65" width="33" height="20"/>
<label text="CC" />
<attachpoints>
<attach point="PROPORTIONAL_RIGHT" />
@@ -42,7 +42,7 @@
</widget>
<widget name="ShowStats" factory="pawsButton" style="tabbuttonskills" id="1000" >
- <frame x="95" y="65" width="30" />
+ <frame x="95" y="65" width="30" height="20"/>
<label text="Stats" />
<attachpoints>
<attach point="PROPORTIONAL_RIGHT" />
@@ -51,7 +51,7 @@
</widget>
<widget name="ShowFaction" factory="pawsButton" style="tabbuttonskills" id="1005" >
- <frame x="125" y="65" width="40" />
+ <frame x="125" y="65" width="40" height="20"/>
<label text="Faction" />
<attachpoints>
<attach point="PROPORTIONAL_RIGHT" />
@@ -60,7 +60,7 @@
</widget>
<widget name="ShowCombat" factory="pawsButton" style="tabbuttonskills" id="1001" >
- <frame x="165" y="65" width="43" />
+ <frame x="165" y="65" width="43" height="20"/>
<label text="Combat" />
<attachpoints>
<attach point="PROPORTIONAL_RIGHT" />
@@ -69,7 +69,7 @@
</widget>
<widget name="ShowMagic" factory="pawsButton" style="tabbuttonskills" id="1002">
- <frame x="205" y="65" width="33" />
+ <frame x="205" y="65" width="33" height="20"/>
<label text="Magic" />
<attachpoints>
<attach point="PROPORTIONAL_RIGHT" />
@@ -78,7 +78,7 @@
</widget>
<widget name="ShowCraft" factory="pawsButton" style="tabbuttonskills" id="1003">
- <frame x="240" y="65" width="30" />
+ <frame x="240" y="65" width="30" height="20"/>
<label text="Jobs" />
<attachpoints>
<attach point="PROPORTIONAL_RIGHT" />
@@ -87,7 +87,7 @@
</widget>
<widget name="ShowMisc" factory="pawsButton" style="tabbuttonskills" id="1004">
- <frame x="280" y="65" width="40" />
+ <frame x="280" y="65" width="40" height="20" />
<label text="Various" />
<attachpoints>
<attach point="ATTACH_RIGHT" />
Modified: personal/kougaro/data/gui/gmguiwindow.xml
===================================================================
--- personal/kougaro/data/gui/gmguiwindow.xml 2009-03-15 14:47:34 UTC (rev 3220)
+++ personal/kougaro/data/gui/gmguiwindow.xml 2009-03-16 00:47:38 UTC (rev 3221)
@@ -59,7 +59,7 @@
</widget>
<widget name="RefreshPlayerList" factory="pawsButton" id="1298">
- <frame x="25" y="370" width="130" height="20" />
+ <frame x="25" y="372" width="130" height="20" />
<label text="Refresh List" />
</widget>
@@ -68,7 +68,7 @@
</widget>
<widget name="SectorLbl" factory="pawsTextBox" style="label" >
- <frame x="490" y="5" width="120" height="20"/>
+ <frame x="495" y="5" width="120" height="20"/>
<text string="Sector:" />
</widget>
<widget name="MoveTarget" factory="pawsTextBox" style="label" >
@@ -107,70 +107,71 @@
</widget>
<widget name="AidPet" factory="pawsButton" toggle="no" id="1210" >
- <frame x="490" y="80" width="115" height="20" />
+ <frame x="495" y="80" width="115" height="20" />
<label text="Teleport To Player" />
</widget>
<widget name="KillWarn" factory="pawsTextBox" style="label" >
- <frame x="490" y="105" width="115" height="20" />
+ <frame x="495" y="105" width="115" height="20" />
<text string="!!!WARNING!!!" horizAdjust="CENTRE" vertAdjust="CENTRE" />
+ <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="0" b="0" size="10" />
</widget>
<widget name="Kill" factory="pawsButton" toggle="no" id="1233" >
- <frame x="490" y="125" width="115" height="20" />
+ <frame x="495" y="125" width="115" height="20" />
<label text="Kill Player" />
</widget>
<widget name="Mute" factory="pawsButton" id="1231" >
- <frame x="490" y="160" width="115" height="20" />
+ <frame x="495" y="160" width="115" height="20" />
<label text="Mute Player" />
</widget>
<widget name="Unmute" factory="pawsButton" id="1232" >
- <frame x="490" y="185" width="115" height="20" />
+ <frame x="495" y="185" width="115" height="20" />
<label text="Unmute Player" />
</widget>
<widget name="ChangeName" factory="pawsButton" id="1234" >
- <frame x="490" y="220" width="115" height="20" />
+ <frame x="495" y="220" width="115" height="20" />
<label text="Change name" />
</widget>
<widget name="ChangeNameRnd" factory="pawsButton" id="1235" >
- <frame x="490" y="245" width="115" height="20" />
+ <frame x="495" y="245" width="115" height="20" />
<label text="Random name" />
</widget>
<widget name="Kick" factory="pawsButton" id="1230" >
- <frame x="490" y="280" width="115" height="20" />
+ <frame x="495" y="280" width="115" height="20" />
<label text="Kick Player" />
</widget>
<widget name="BanMin" factory="pawsEditTextBox">
- <frame x="500" y="312" width="20" height="20" border="no"/>
+ <frame x="505" y="311" width="20" height="20" border="no"/>
<text string="30" horizAdjust="CENTRE" />
</widget>
<widget name="BanHrs" factory="pawsEditTextBox">
- <frame x="534" y="312" width="20" height="20" border="no"/>
+ <frame x="539" y="311" width="20" height="20" border="no"/>
<text string="0" horizAdjust="CENTRE" />
</widget>
<widget name="BanDays" factory="pawsEditTextBox">
- <frame x="568" y="312" width="20" height="20" border="no"/>
+ <frame x="573" y="311" width="20" height="20" border="no"/>
<text string="0" horizAdjust="CENTRE" />
</widget>
<widget name="BanMinlbl" factory="pawsTextBox" style="label">
- <frame x="490" y="314" width="20" height="20" />
+ <frame x="495" y="314" width="20" height="20" />
<text string="M:" horizAdjust="CENTRE" />
</widget>
<widget name="BanHrslbl" factory="pawsTextBox" style="label">
- <frame x="524" y="314" width="20" height="20" />
+ <frame x="529" y="314" width="20" height="20" />
<text string="H:" horizAdjust="CENTRE" />
</widget>
<widget name="BanDayslbl" factory="pawsTextBox" style="label">
- <frame x="558" y="314" width="20" height="20" />
+ <frame x="563" y="314" width="20" height="20" />
<text string="D:" horizAdjust="CENTRE" />
</widget>
<widget name="Ban" factory="pawsButton" id="1236" >
- <frame x="490" y="335" width="115" height="20" />
+ <frame x="495" y="335" width="115" height="20" />
<label text="Ban" />
</widget>
@@ -356,6 +357,15 @@
<text string="disabled" />
</widget>
+ <widget name="attackable" factory="pawsTextBox" visible="no" tooltip="set attackable">
+ <frame x="30" y="284" width="160" height="20" border="no" />
+ <text string="Attackable" />
+ </widget>
+ <widget name="toggleAttackable" factory="pawsCheckBox" id="1268" visible="no">
+ <frame x="200" y ="284" width="100" height="20" border="no"/>
+ <text string="disabled" />
+ </widget>
+
</widget>
</widget>
</widget>
Modified: personal/kougaro/data/options/controls_def.xml
===================================================================
--- personal/kougaro/data/options/controls_def.xml 2009-03-15 14:47:34 UTC (rev 3220)
+++ personal/kougaro/data/options/controls_def.xml 2009-03-16 00:47:38 UTC (rev 3221)
@@ -17,7 +17,7 @@
<bind action="Run" key="LShift" />
<bind action="ToggleRun" key="LCtrl" />
<bind action="AutoMove" key="r" />
- <bind action="MouseMove" key="LeftClick" />
+ <bind action="MouseMove" key="" />
<bind action="Sneak" key="RShift" />
<bind action="Jump" key="Space" />
<bind action="Sit" key="z" />
Modified: personal/kougaro/data/shader/lighting/lighting_character.xml
===================================================================
--- personal/kougaro/data/shader/lighting/lighting_character.xml 2009-03-15 14:47:34 UTC (rev 3220)
+++ personal/kougaro/data/shader/lighting/lighting_character.xml 2009-03-16 00:47:38 UTC (rev 3221)
@@ -22,6 +22,7 @@
<alias name="apply_alpha" file="/shader/snippets/surface/alpha-nochange.xml" />
<alias name="lighting" file="/shader/snippets/lighting/lighting-ppl.xml" />
<alias name="surface" file="/shader/snippets/surface/surface-overlay.xml" />
+ <alias name="specular" file="/shader/snippets/surface/specular-default.xml" />
<technique priority="300" minlights="3">
<tag>per_pixel_lighting</tag>
Modified: personal/kougaro/mk/autoconf/checkcommon.m4
===================================================================
--- personal/kougaro/mk/autoconf/checkcommon.m4 2009-03-15 14:47:34 UTC (rev 3220)
+++ personal/kougaro/mk/autoconf/checkcommon.m4 2009-03-16 00:47:38 UTC (rev 3221)
@@ -54,6 +54,23 @@
#------------------------------------------------------------------------------
+# CS_CHECK_COMMON_TOOLS_RELAYTOOL([PATH], [EMITTER])
+# Checks for relaytool. Prepends PATH to the search path.
+# The result of the check is recorded with CS_EMIT_BUILD_PROPERTY() via
+# the optional EMITTER. If EMITTER is omitted, then
+# CS_EMIT_BUILD_PROPERTY()'s default emitter is employed.
+#------------------------------------------------------------------------------
+AC_DEFUN([CS_CHECK_COMMON_TOOLS_RELAYTOOL],
+ [AC_ARG_ENABLE([relaytool], [AC_HELP_STRING([--enable-relaytool],
+ [enable use of relaytool for some libraries (default YES)])])
+ AS_IF([test -z "$enable_relaytool"],
+ [enable_relaytool=yes])
+ AS_IF([test "$enable_relaytool" != "no"],
+ [CS_PATH_TOOL([RELAYTOOL], [relaytool], [], [$1])
+ CS_EMIT_BUILD_PROPERTY([CMD.RELAYTOOL], [$RELAYTOOL], [], [], [$2])])])
+
+
+#------------------------------------------------------------------------------
# CS_CHECK_COMMON_TOOLS_BASIC([EMITTER])
# Checks for basic tools for building things. Results of the checks are
# recorded with CS_EMIT_BUILD_PROPERTY() via the optional EMITTER. If
Modified: personal/kougaro/mk/autoconf/crystal.m4
===================================================================
--- personal/kougaro/mk/autoconf/crystal.m4 2009-03-15 14:47:34 UTC (rev 3220)
+++ personal/kougaro/mk/autoconf/crystal.m4 2009-03-16 00:47:38 UTC (rev 3221)
@@ -185,6 +185,9 @@
["$cfg" --includedir $cs_liblist])
CRYSTAL_AVAILABLE_LIBS=`"$cfg" --available-libs`
CRYSTAL_STATICDEPS=`"$cfg" --static-deps`
+ CRYSTAL_PREFIX=CS_RUN_PATH_NORMALIZE(["$cfg" --prefix])
+ CRYSTAL_EXEC_PREFIX=CS_RUN_PATH_NORMALIZE(["$cfg" --exec-prefix])
+ CRYSTAL_TOOLS_PREFIX=CS_RUN_PATH_NORMALIZE(["$cfg" --tools-prefix])
AS_IF([test -z "$CRYSTAL_LIBS"], [cs_sdk=no])])],
[cs_sdk=no])
@@ -206,6 +209,9 @@
CRYSTAL_VERSION=''
CRYSTAL_LIBS=''
CRYSTAL_INCLUDE_DIR=''
+ CRYSTAL_PREFIX=''
+ CRYSTAL_EXEC_PREFIX=''
+ CRYSTAL_TOOLS_PREFIX=''
$3])
])
@@ -235,7 +241,10 @@
AC_SUBST([CRYSTAL_LIBS])
AC_SUBST([CRYSTAL_INCLUDE_DIR])
AC_SUBST([CRYSTAL_AVAILABLE_LIBS])
-AC_SUBST([CRYSTAL_STATICDEPS])])
+AC_SUBST([CRYSTAL_STATICDEPS])
+AC_SUBST([CRYSTAL_PREFIX])
+AC_SUBST([CRYSTAL_EXEC_PREFIX])])
+AC_SUBST([CRYSTAL_TOOLS_PREFIX])])
#------------------------------------------------------------------------------
@@ -261,6 +270,8 @@
_CS_PATH_CRYSTAL_EMIT([CRYSTAL.INCLUDE_DIR],[$CRYSTAL_INCLUDE_DIR],[$6])
_CS_PATH_CRYSTAL_EMIT([CRYSTAL.AVAILABLE_LIBS],[$CRYSTAL_AVAILABLE_LIBS],[$6])
_CS_PATH_CRYSTAL_EMIT([CRYSTAL.STATICDEPS],[$CRYSTAL_STATICDEPS],[$6])
+_CS_PATH_CRYSTAL_EMIT([CRYSTAL.EXEC_PREFIX],[$CRYSTAL_EXEC_PREFIX],[$6])
+_CS_PATH_CRYSTAL_EMIT([CRYSTAL.TOOLS_PREFIX],[$CRYSTAL_TOOLS_PREFIX],[$6])
])
AC_DEFUN([_CS_PATH_CRYSTAL_EMIT],
Modified: personal/kougaro/mk/jam/flags.jam
===================================================================
--- personal/kougaro/mk/jam/flags.jam 2009-03-15 14:47:34 UTC (rev 3220)
+++ personal/kougaro/mk/jam/flags.jam 2009-03-16 00:47:38 UTC (rev 3221)
@@ -135,7 +135,7 @@
Clean clean : $(>) ;
}
-## RelayLFlags lflags : relaylibs
+## RelayLFlags lflags : relaylibs [: minimal-objects ]
## Get LFLAGS for relay-linking libraries. See RelayLibs for
## more information.
rule RelayLFlags
@@ -147,7 +147,13 @@
else
{
local relayparamslist = "--relay $(2)" ;
- local lflags = $(1) ;
+ local lflags = $(1[1]) ;
+ # Concatenate arrays into single strings
+ local lf ;
+ for lf in $(1[2-])
+ {
+ lflags = "$(lflags) $(lf)" ;
+ }
local relayparam = $(relayparamslist[1]) ;
local r ;
for r in $(relayparamslist[2-])
@@ -160,9 +166,14 @@
{
cflags = "$(cflags) $(c)" ;
}
+ local minimalparam = "" ;
+ if "$(3)" != ""
+ {
+ minimalparam = "--minimal-list \"$(3)\"" ;
+ }
local extlib result_lflags ;
result_lflags +=
- "`CFLAGS=\"$(cflags)\" $(CMD.RELAYTOOL) --out-dir $(LOCATE_TARGET) $(relayparam) $(lflags)`" ;
+ "`CFLAGS=\"$(cflags)\" $(CMD.RELAYTOOL) --out-dir $(LOCATE_TARGET) $(minimalparam) $(relayparam) $(lflags)`" ;
return $(result_lflags) ;
}
}
@@ -208,11 +219,19 @@
local extlib ;
for extlib in $(>)
{
+ # Construct list of object files for target.
+ # Used by relaytool to compute a minimal set of symbols that need relaying.
+ local minimal_list = "" ;
+ local o ;
+ for o in $($(<)_OBJECTS)
+ {
+ minimal_list = "$(minimal_list) $(LOCATE_TARGET)/$(o:G=)" ;
+ }
+
ExtraObjects $(<) : [ RelayObjs $(<) : $(3) : $(2) ] ;
CFlags $(<) : $($(extlib).CFLAGS) ;
- LFlags $(<) : [ RelayLFlags $($(extlib).LFLAGS) : $(3) ] ;
+ LFlags $(<) : [ RelayLFlags $($(extlib).LFLAGS) : $(3) : $(minimal_list) ] : noexternal ;
- $(<).EXTERNALLIBS += $(extlib) ;
$(<).RELAYDEPS += $(extlib) ;
$(<).RELAYLIBS.$(extlib) = $(3) ;
}
@@ -222,8 +241,13 @@
{
echo "" > $(<)
whatever=`echo "$(WHATEVER)" | tr '-' '_' | tr '.' '_' `
- echo "int lib${whatever}_is_present = 1;" >> $(<)
- echo "int lib${whatever}_symbol_is_present (char* s) { return 1; }" >> $(<)
+ my_IFS=$IFS; IFS=" "
+ for w in ${whatever}
+ do
+ echo "int lib${w}_is_present = 1;" >> $(<)
+ echo "int lib${w}_symbol_is_present (char* s) { return 1; }" >> $(<)
+ done
+ IFS=$my_IFS
}
## MergeLFlags flags1 : flags2
Modified: personal/kougaro/mk/jam/icons.jam
===================================================================
--- personal/kougaro/mk/jam/icons.jam 2009-03-15 14:47:34 UTC (rev 3220)
+++ personal/kougaro/mk/jam/icons.jam 2009-03-16 00:47:38 UTC (rev 3221)
@@ -1,3 +1,21 @@
+#============================================================================
+# Copyright (C)2006-2009 by Frank Richter
+#
+# This library is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Library General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your
+# option) any later version.
+#
+# This library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with this library; if not, write to the Free Software Foundation,
+# Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+#============================================================================
if $(CMD.RSVG) != ""
{
## IconsFromSVG iconname
@@ -15,9 +33,8 @@
{
local icon = $(1) ;
local iconfile = $(icon).svg ;
- local svgscalabledir = [ ConcatDirs $(TOP) $(SUBDIR) icons-src scalable ] ;
+ local svgscalabledir = [ ConcatDirs $(SUBDIR) icons-src scalable ] ;
local svgsource = $(iconfile:G=$(svgscalabledir)) ;
- LOCATE on $(svgsource) = $(svgscalabledir) ;
SEARCH on $(svgsource) = $(svgscalabledir) ;
NotFile generateicons ;
@@ -36,7 +53,7 @@
# ** - Cause icon files to be really large. Vista supports PNG compression
# in icons and uses it for the 256x256 versions. Problem: resource
# compilers don't support that yet.
- for size in 16 22 32 48
+ for size in 16 22 32 48 128 256
{
local pngdir = [ ConcatDirs $(SUBDIR) icons $(size) ] ;
local pngfile = $(icon:G=$(pngdir)).png ;
@@ -155,7 +172,7 @@
if [ -e $ICONSSRC/\${ICONBASE}_8.png ] ; then
$(CP) $ICONSSRC/\${ICONBASE}_8.png $(<)
else
- # Makes transparency binary and reduces colors to 256-
+ # Makes transparency binary and reduces colors to 256
$(CMD.CONVERT) $(>) \( +clone -fx a +matte -monochrome \) -compose CopyOpacity -composite -colors 256 -dither $(<)
fi
}
Modified: personal/kougaro/mk/jam/msvcgen.jam
===================================================================
--- personal/kougaro/mk/jam/msvcgen.jam 2009-03-15 14:47:34 UTC (rev 3220)
+++ personal/kougaro/mk/jam/msvcgen.jam 2009-03-16 00:47:38 UTC (rev 3221)
@@ -849,7 +849,7 @@
MANIFEST_NAME on $(manifestrc) = $(manifest) ;
GenerateWin32ManifestRc $(manifestrc) ;
Depends $(manifestrc) : $(manifest) ;
- if $(MSVC_VERSION) = 8
+ if $(MSVC_VERSION) >= 8
{
# VC8: Manifest appears in project along other files, a special build
# tool cares about the embedding into a resource. (The resource goop
Modified: personal/kougaro/mk/jam/static.jam
===================================================================
--- personal/kougaro/mk/jam/static.jam 2009-03-15 14:47:34 UTC (rev 3220)
+++ personal/kougaro/mk/jam/static.jam 2009-03-16 00:47:38 UTC (rev 3221)
@@ -268,6 +268,8 @@
lflags = [ MergeRemovingDups $(lflags) :
[ RelayLFlags $(STATICPLUGIN.$(p).RELAYLFLAGS.$(relaydep)) :
$(STATICPLUGIN.$(p).RELAYLIBS.$(relaydep)) ] ] ;
+ # @@@ If we can get the .a file name for the static plugin lib
+ # we could pass that for the minimal-objects
relayobjs += [ RelayObjs $(lflags_target) :
$(STATICPLUGIN.$(p).RELAYLIBS.$(relaydep)) : $(relaydep) ] ;
}
@@ -290,8 +292,23 @@
# Grab flags
for p in $(plugins)
{
- lflags += [ Filter $($(p).LFLAGS) : $(LINKLIBS) $(PLUGIN.LFLAGS) ] ;
+ lflags += [ Filter $($(p).LFLAGS.EXTERNAL) : $(LINKLIBS) $(PLUGIN.LFLAGS) ] ;
libs += $($(p).NEEDLIBS) ;
+
+ local relaydeps = $($(p).RELAYDEPS) ;
+ for relaydep in $(relaydeps)
+ {
+ local libpath ;
+ libpath = [ ConcatDirs
+ [ on $($(STATICPLUGINS.LIBRARY)_TARGET) GetVar SEARCH ]
+ $($(STATICPLUGINS.LIBRARY)_TARGET)
+ ] ;
+ lflags = [ MergeRemovingDups $(lflags) :
+ [ RelayLFlags $($(relaydep).LFLAGS) :
+ $($(p).RELAYLIBS.$(relaydep)) : $(libpath) ] ] ;
+ relayobjs += [ RelayObjs $(target) :
+ $($(p).RELAYLIBS.$(relaydep)) : $(relaydep) ] ;
+ }
}
target_link_with = [ RemoveDupFlags $(libs) ] ;
target_lflags = [ RemoveDups $(lflags) ] ;
Modified: personal/kougaro/mk/jam/swig.jam
===================================================================
--- personal/kougaro/mk/jam/swig.jam 2009-03-15 14:47:34 UTC (rev 3220)
+++ personal/kougaro/mk/jam/swig.jam 2009-03-16 00:47:38 UTC (rev 3221)
@@ -69,7 +69,7 @@
#ifdef _MSC_VER\\
#include <io.h>\\
#include <stdarg.h>\\
- #ifndef DEBUG_PYTHON\\
+ #if defined(_DEBUG) \\\&\\\& !defined(DEBUG_PYTHON)\\
#undef _DEBUG\\
#define RESTORE__DEBUG\\
#endif\\
Modified: personal/kougaro/mk/msvc7/appeedit.vcproj
===================================================================
--- personal/kougaro/mk/msvc7/appeedit.vcproj 2009-03-15 14:47:34 UTC (rev 3220)
+++ personal/kougaro/mk/msvc7/appeedit.vcproj 2009-03-16 00:47:38 UTC (rev 3221)
@@ -7,11 +7,10 @@
SccProjectName=""
SccLocalPath="">
<Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
+ <Platform Name="Win32"/>
+ </Platforms>
<Configurations>
- <Configuration
+ <Configuration
Name="Release (with static libs)|Win32"
OutputDirectory="..\..\out\release7\build\appeedit\"
IntermediateDirectory="..\..\out\release7\build\appeedit\"
@@ -26,9 +25,8 @@
StringPooling="TRUE"
EnableFunctionLevelLinking="TRUE"
RuntimeLibrary="2"
- DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDataBaseFileName="..\..\out\release7\build\appeedit\eedit.pdb"
+ ProgramDataBaseFileName="..\..\out\release7\build\appeedit\Win32\eedit.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;WIN32"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -38,9 +36,10 @@
ObjectFile="..\..\out\release7\build\appeedit\"
WarningLevel="3"
SuppressStartupBanner="TRUE"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="false"
TreatWChar_tAsBuiltInType="false"
ForceConformanceInForLoopScope="true"
+ DebugInformationFormat="3"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
@@ -52,7 +51,7 @@
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
OutputFile="..\..\eedit.exe"
- ProgramDatabaseFile="..\..\out\release7\build\appeedit\eedit.pdb"
+ ProgramDatabaseFile="..\..\out\release7\build\appeedit\Win32\eedit.pdb"
SubSystem="2"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace.lib ws2_32.lib zlib.lib"
@@ -87,7 +86,7 @@
<Tool
Name="VCWebDeploymentTool"/>
</Configuration>
- <Configuration
+ <Configuration
Name="Release (with DLLs)|Win32"
OutputDirectory="..\..\out\release7\build\appeedit\"
IntermediateDirectory="..\..\out\release7\build\appeedit\"
@@ -102,9 +101,8 @@
StringPooling="TRUE"
EnableFunctionLevelLinking="TRUE"
RuntimeLibrary="2"
- DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDataBaseFileName="..\..\out\release7\build\appeedit\eedit.pdb"
+ ProgramDataBaseFileName="..\..\out\release7\build\appeedit\Win32\eedit.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -114,9 +112,10 @@
ObjectFile="..\..\out\release7\build\appeedit\"
WarningLevel="3"
SuppressStartupBanner="TRUE"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="false"
TreatWChar_tAsBuiltInType="false"
ForceConformanceInForLoopScope="true"
+ DebugInformationFormat="3"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
@@ -128,7 +127,7 @@
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
OutputFile="..\..\eedit.exe"
- ProgramDatabaseFile="..\..\out\release7\build\appeedit\eedit.pdb"
+ ProgramDatabaseFile="..\..\out\release7\build\appeedit\Win32\eedit.pdb"
SubSystem="2"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace.lib ws2_32.lib zlib.lib"
@@ -163,7 +162,7 @@
<Tool
Name="VCWebDeploymentTool"/>
</Configuration>
- <Configuration
+ <Configuration
Name="Debug (with static libs)|Win32"
OutputDirectory="..\..\out\debug7\build\appeedit\"
IntermediateDirectory="..\..\out\debug7\build\appeedit\"
@@ -175,11 +174,10 @@
Name="VCCLCompilerTool"
Optimization="0"
MinimalRebuild="TRUE"
- DebugInformationFormat="4"
RuntimeTypeInfo="TRUE"
RuntimeLibrary="3"
- ProgramDataBaseFileName="..\..\out\debug7\build\appeedit\eedit.pdb"
+ ProgramDataBaseFileName="..\..\out\debug7\build\appeedit\Win32\eedit.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;WIN32"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -189,9 +187,10 @@
ObjectFile="..\..\out\debug7\build\appeedit\"
WarningLevel="3"
SuppressStartupBanner="TRUE"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="false"
TreatWChar_tAsBuiltInType="false"
ForceConformanceInForLoopScope="true"
+ DebugInformationFormat="4"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
@@ -201,7 +200,7 @@
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
OutputFile="..\..\eedit.exe"
- ProgramDatabaseFile="..\..\out\debug7\build\appeedit\eedit.pdb"
+ ProgramDatabaseFile="..\..\out\debug7\build\appeedit\Win32\eedit.pdb"
SubSystem="1"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace_d.lib ws2_32.lib zlib.lib"
@@ -236,7 +235,7 @@
<Tool
Name="VCWebDeploymentTool"/>
</Configuration>
- <Configuration
+ <Configuration
Name="Debug (with DLLs)|Win32"
OutputDirectory="..\..\out\debug7\build\appeedit\"
IntermediateDirectory="..\..\out\debug7\build\appeedit\"
@@ -248,11 +247,10 @@
Name="VCCLCompilerTool"
Optimization="0"
MinimalRebuild="TRUE"
- DebugInformationFormat="4"
RuntimeTypeInfo="TRUE"
RuntimeLibrary="3"
- ProgramDataBaseFileName="..\..\out\debug7\build\appeedit\eedit.pdb"
+ ProgramDataBaseFileName="..\..\out\debug7\build\appeedit\Win32\eedit.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -262,9 +260,10 @@
ObjectFile="..\..\out\debug7\build\appeedit\"
WarningLevel="3"
SuppressStartupBanner="TRUE"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="false"
TreatWChar_tAsBuiltInType="false"
ForceConformanceInForLoopScope="true"
+ DebugInformationFormat="4"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
@@ -274,7 +273,7 @@
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
OutputFile="..\..\eedit.exe"
- ProgramDatabaseFile="..\..\out\debug7\build\appeedit\eedit.pdb"
+ ProgramDatabaseFile="..\..\out\debug7\build\appeedit\Win32\eedit.pdb"
SubSystem="1"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace_d.lib ws2_32.lib zlib.lib"
@@ -309,7 +308,7 @@
<Tool
Name="VCWebDeploymentTool"/>
</Configuration>
- <Configuration
+ <Configuration
Name="MemoryTracker (with static libs)|Win32"
OutputDirectory="..\..\out\debug7\build\appeedit\"
IntermediateDirectory="..\..\out\debug7\build\appeedit\"
@@ -321,11 +320,10 @@
Name="VCCLCompilerTool"
Optimization="0"
MinimalRebuild="TRUE"
- DebugInformationFormat="4"
RuntimeTypeInfo="TRUE"
RuntimeLibrary="3"
- ProgramDataBaseFileName="..\..\out\debug7\build\appeedit\eedit.pdb"
+ ProgramDataBaseFileName="..\..\out\debug7\build\appeedit\Win32\eedit.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;CS_MEMORY_TRACKER;_WINDOWS;WIN32"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -335,9 +333,10 @@
ObjectFile="..\..\out\debug7\build\appeedit\"
WarningLevel="3"
SuppressStartupBanner=...
[truncated message content] |