From: <mg...@us...> - 2008-08-25 11:42:23
|
Revision: 2113 http://planeshift.svn.sourceforge.net/planeshift/?rev=2113&view=rev Author: mgist Date: 2008-08-25 11:42:31 +0000 (Mon, 25 Aug 2008) Log Message: ----------- - Merged r2112 from trunk. Modified Paths: -------------- stable/src/client/Jamfile stable/src/pslaunch/Jamfile stable/src/setup/Jamfile Property Changed: ---------------- stable/ Property changes on: stable ___________________________________________________________________ Modified: svn:mergeinfo - /personal/Xordan:1745,1812,1894 /trunk:1-2108,2110 + /personal/Xordan:1745,1812,1894 /trunk:1-2108,2110,2112 Modified: stable/src/client/Jamfile =================================================================== --- stable/src/client/Jamfile 2008-08-25 11:39:41 UTC (rev 2112) +++ stable/src/client/Jamfile 2008-08-25 11:42:31 UTC (rev 2113) @@ -22,7 +22,7 @@ } Application psclient_static : [ Wildcard *.cpp *.h ] $(extrafiles) : independent noinstall nohelp ; CFlags psclient_static : [ FDefines CS_STATIC_LINKED ] $(CAL3D.CFLAGS) ; -LFlags psclient_static : -lcrystalspace_staticplugins-1.3 -lcal3d ; +LFlags psclient_static : -lcrystalspace_staticplugins-$(CRYSTAL.VERSION) -lcal3d ; MsvcDefine psclient_static : CS_STATIC_LINKED ; LinkWith psclient_static : gui psnet psengine psrpgrules pssound psutil paws effects fparser ; Modified: stable/src/pslaunch/Jamfile =================================================================== --- stable/src/pslaunch/Jamfile 2008-08-25 11:39:41 UTC (rev 2112) +++ stable/src/pslaunch/Jamfile 2008-08-25 11:42:31 UTC (rev 2113) @@ -13,7 +13,7 @@ SubVariant updaterStatic ; Application psupdater_static : [ Filter [ Wildcard *.cpp *.h ] : pslaunch.cpp pawslauncherwindow.cpp pslaunch.h pawslauncherwindow.h globals.h ] : console ; CFlags psupdater_static : [ FDefines CS_STATIC_LINKED ] ; -LFlags psupdater_static : -lcrystalspace_staticplugins-1.3 ; +LFlags psupdater_static : -lcrystalspace_staticplugins-$(CRYSTAL.VERSION) ; MsvcDefine psupdater_static : CS_STATIC_LINKED ; LinkWith psupdater_static : xdelta3 psutil xpnet ; @@ -44,7 +44,7 @@ SubVariant launcherStatic ; Application pslaunch_static : [ Filter [ Wildcard *.cpp *.h ] : updater.cpp updater.h ] : ; CFlags pslaunch_static : [ FDefines CS_STATIC_LINKED ] ; -LFlags pslaunch_static : -lcrystalspace_staticplugins-1.3 ; +LFlags pslaunch_static : -lcrystalspace_staticplugins-$(CRYSTAL.VERSION) ; MsvcDefine pslaunch_static : CS_STATIC_LINKED ; LinkWith pslaunch_static : xdelta3 paws psutil fparser xpnet ; Modified: stable/src/setup/Jamfile =================================================================== --- stable/src/setup/Jamfile 2008-08-25 11:39:41 UTC (rev 2112) +++ stable/src/setup/Jamfile 2008-08-25 11:42:31 UTC (rev 2113) @@ -14,7 +14,7 @@ SubVariant static ; Application pssetup_static : [ Wildcard *.cpp *.h ] : independent noinstall nohelp ; CFlags pssetup_static : [ FDefines CS_STATIC_LINKED ] ; -LFlags pssetup_static : "-lcrystalspace_staticplugins-1.3" ; +LFlags pssetup_static : -lcrystalspace_staticplugins-$(CRYSTAL.VERSION) ; MsvcDefine pssetup_static : CS_STATIC_LINKED ; LinkWith pssetup_static : paws psutil fparser ; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |